54545454

MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs

@@ -274,7 +274,8 @@ namespace MyCode.Project.Services.Implementation
 
 
             }
-            if(addList.Count==0)
+            var allBarcodeList = _tiaoMaRepository.Queryable().Where(t => t.FBillNo == order.FBillNo).Select(t => t.FBarCode).ToList().Distinct().ToList();
+            if (addList.Count==0)
             {
                 _tiaoMaRepository.Delete(t=>t.InvoceOrderItemId== orderItem.Id);
                 orderItem.CuseQty = act.CuseQty;
@@ -325,10 +326,12 @@ namespace MyCode.Project.Services.Implementation
                 }
 
                 List<AddTiaoMa> addTiaoMas = new List<AddTiaoMa>();
-                addTiaoMas = addList.Select(t => new AddTiaoMa
+               var  addList2 = addList.Where(t => !allBarcodeList.Contains(t.FBarCode)).ToList();
+
+                 addTiaoMas = addList2.Select(t => new AddTiaoMa
                 {
                     FBarCode = t.FBarCode,
-                    FBarCodeRule = "03",
+                    FBarCodeRule = "01",
                     FBillCode = t.FBillNo,
                     FSupplierLot = t.FSupplierLot == null ? "" : t.FSupplierLot,
                     FMaterialId = t.MaterialCode,
@@ -337,6 +340,8 @@ namespace MyCode.Project.Services.Implementation
                 }).ToList();
                 _workProcessService.Add<IKingDeeService>(this.MerchantId, "AddTiaoMa", "生成条码档案", JsonHelper.ToJson(addTiaoMas), 5);
             }
+
+
             TiaoMaResp result = new TiaoMaResp();
             result.Id = orderItem.Id;
             result.BarCodeList = addList;