作废单据不同步更新金蝶数据

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

@@ -2,6 +2,7 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -506,6 +507,13 @@ namespace WMS.Web.Domain.Services
                         var erp_data = erp_list.FirstOrDefault(a => a.ErpDetailId == det.ErpDetailId && a.BillNo == order.SourceBillNo);
                         if (erp_data != null)
                         {
+                            //如果该明细作废 则不修改了
+                            if (det.IsRepeal == true)
+                            {
+                                //操作完后剔除
+                                erp_removeList.Add(erp_data);
+                                continue;
+                            }
                             if (erp_data.MaterialNumber == det.MaterialNumber)
                             {
                                 //物料相同的，就改变数值
@@ -590,6 +598,9 @@ namespace WMS.Web.Domain.Services
                 //2.4金蝶删除的明细，要把任务单里的明细应入库数量改为0
                 data_list.SelectMany(x => x.Details).Where(c => !erp_list.Any(a => a.ErpDetailId == c.ErpDetailId)).ToList().ForEach(x => { x.AccruedQty = 0; });
 
+                //过滤掉已经作废的单据
+                data_list = data_list.Where(w => w.Status != InstockStatus.Repeal).ToList();
+
                 //2.3.提交任务单的修改
                 var isSuccess = await _inStockTaskRepositories.UpdateRange(data_list, isTransaction);
                 if (!isSuccess)

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

@@ -172,6 +172,13 @@ namespace WMS.Web.Domain.Services
                     {
                         //仓库不同 拆分成不同的
                         var detail = outStockTask.Details.FirstOrDefault(w => w.MaterialNumber == erp.MaterialNumber);
+                        //如果该明细作废 则不修改了
+                        if (detail != null && detail.IsRepeal == true)
+                        {
+                            //操作完后剔除
+                            erp_removeList.Add(erp);
+                            continue;
+                        }
                         if (detail == null)
                         {
                             //添加一条物料明细
@@ -211,7 +218,8 @@ namespace WMS.Web.Domain.Services
                     outStockTask.GenerateStatus();
                 }
             }
-            var update_date_list = data_list.Where(w => update_ids.Contains(w.Id)).ToList();
+            //过滤掉已经作废的单据
+            var update_date_list = data_list.Where(w => update_ids.Contains(w.Id) && w.Status != OutStockStatus.Repeal).ToList();
             //2.2.提交修改
             var isSuccess = await _outStockTaskRepositories.EditEntityList(update_date_list, isTransaction);
             if (!isSuccess)