youh

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -771,7 +771,7 @@
             生成单据号
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.InStock.SyncSuccess(System.Int32,System.Int32,System.String,System.String)">
+        <member name="M:WMS.Web.Domain.Entitys.InStock.SyncSuccess(System.Int32,System.Int32,System.String)">
             <summary>
             同步金蝶(成功)
             </summary>
@@ -779,7 +779,7 @@
             <param name="operateId"></param>
             <param name="erpBillNo"></param>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.InStock.SyncFail(System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.SyncStatus,System.String)">
+        <member name="M:WMS.Web.Domain.Entitys.InStock.SyncFail(System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.SyncStatus)">
             <summary>
             同步金蝶(失败)
             </summary>
@@ -947,6 +947,12 @@
             <param name="firstBillNo"></param>
             <param name="lastBillNo"></param>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.InStockErpDetails.RecodErpInStockDetailId(System.String)">
+            <summary>
+            记录金蝶的入库单明细ID
+            </summary>
+            <param name="erpInStockDetailId"></param>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.InStockTask">
             <summary>
             erp入库任务表

src/WMS.Web.Domain/Entitys/InStock.cs

@@ -149,15 +149,13 @@ namespace WMS.Web.Domain.Entitys
         /// <param name="erpDetailId"></param>
         /// <param name="operateId"></param>
         /// <param name="erpBillNo"></param>
-        public void SyncSuccess(int erpDetailId, int operateId, string erpBillNo,string erpInStockDetailId)
+        public void SyncSuccess(int erpDetailId, int operateId, string erpBillNo)
         {
             var erpd = this.ErpDetails.Where(s=>s.ErpDetailId==erpDetailId).ToList();
             erpd.ForEach(det => 
             {
                 det.SuccessSync = SyncStatus.Success;
                 det.ErpSyncBillNo = erpBillNo;
-                if (!string.IsNullOrEmpty(erpInStockDetailId))
-                    det.ErpInStockDetailId = Convert.ToInt32(erpInStockDetailId);
             });
 
             //所有erp明细同步成功才是整个单据成功
@@ -179,14 +177,12 @@ namespace WMS.Web.Domain.Entitys
         /// <param name="erpDetailId"></param>
         /// <param name="operateId"></param>
         /// <param name="syncStatus"></param>
-        public void SyncFail(string remark, int erpDetailId, int operateId, SyncStatus syncStatus, string erpInStockDetailId)
+        public void SyncFail(string remark, int erpDetailId, int operateId, SyncStatus syncStatus)
         {
             var erpd = this.ErpDetails.Where(w => w.ErpDetailId == erpDetailId).ToList();
             erpd.ForEach(det =>
             {
                 det.SuccessSync = syncStatus;
-                if (!string.IsNullOrEmpty(erpInStockDetailId))
-                    det.ErpInStockDetailId = Convert.ToInt32(erpInStockDetailId);
             });
             this.SuccessSync = SyncStatus.Fail;
             this.Remark = remark;

src/WMS.Web.Domain/Entitys/InStockErpDetails.cs

@@ -106,5 +106,16 @@ namespace WMS.Web.Domain.Entitys
             }
         }
 
+        /// <summary>
+        /// 记录金蝶的入库单明细ID
+        /// </summary>
+        /// <param name="erpInStockDetailId"></param>
+        public void RecodErpInStockDetailId(string erpInStockDetailId)
+        {
+            if(!string.IsNullOrEmpty(erpInStockDetailId))
+                    this.ErpInStockDetailId = Convert.ToInt32(erpInStockDetailId);
+        }
+
+
     }
 }

src/WMS.Web.Domain/Services/InStockService.cs

@@ -883,18 +883,22 @@ namespace WMS.Web.Domain.Services
                 {
                     var res = await this.QueryFirst(currentDet, erpDto.TargetFormId, entity.BillNo, det, sc_erpService);
                     if (res.result.IsSuccess)
-                        entity.SyncSuccess(det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo, res.instockDetailId);
+                        entity.SyncSuccess(det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo);
                     else
-                        entity.SyncFail(res.result.Message, det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus, res.instockDetailId);
+                        entity.SyncFail(res.result.Message, det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus);
+                    //记录金蝶入库单明细ID
+                    det.RecodErpInStockDetailId(res.instockDetailId);
                 }
                 else
                 {
                     //下推金蝶
                     var res = await this.Push(erpDto, det, entity.BillNo, sc_erpService, sc_inStockRepositories);
                     if (res.result.IsSuccess)
-                        entity.SyncSuccess(det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo, res.instockDetailId);
+                        entity.SyncSuccess(det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo);
                     else
-                        entity.SyncFail(res.result.Message, det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus, res.instockDetailId);
+                        entity.SyncFail(res.result.Message, det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus);
+                    //记录金蝶入库单明细ID
+                    det.RecodErpInStockDetailId(res.instockDetailId);
                 }
 
 
@@ -931,6 +935,8 @@ namespace WMS.Web.Domain.Services
                 purchaseInStock.Details[0].Qty = erpDetail.Qty;
                 string formId = dto.TargetFormId.ToString();
                 erp_instock_detId = purchaseInStock.Details[0].DetailId;
+
+                //var tt = Convert.ToInt32("abc");
                 //批号生成和同步
                 if (string.IsNullOrEmpty(erpDetail.BatchBillNo))
                 {