diff --git a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs index 9b3770c..71bbe22 100644 --- a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs +++ b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs @@ -288,12 +288,13 @@ namespace MyCode.Project.Services.Implementation int yu = (int)Math.Ceiling(zongQty % act.CuseQty); int baoShu = 0; baoShu = (int)(zongQty / act.CuseQty); - + // 条码 :物料编码,数量,收料通知单号,供应商批号,key + // 条码 :物料编码,数量,收料通知单号,供应商批号,美塞斯批号,key for (int i = 0; i < baoShu; i++) { - string FBarCode = $@"{orderItem.MaterialCode}*{act.CuseQty.ToString("F2")}*{order.FBillNo}*{orderItem.FSupplierLot}"; + string FBarCode = $@"{orderItem.MaterialCode}*{act.CuseQty.ToString("F2")}*{order.FBillNo}*{orderItem.FSupplierLot}*{orderItem.MSSSupplierLot}"; TiaoMaList tiaoMa = new TiaoMaList(); tiaoMa = AutoMapperHelper.AutoMappToSingle(orderItem); tiaoMa.Id = Guid.NewGuid(); @@ -309,7 +310,7 @@ namespace MyCode.Project.Services.Implementation } if (yu > 0) { - string FBarCode = $@"{orderItem.MaterialCode}*{decimal.Parse(yu.ToString()).ToString("F2")}*{order.FBillNo}*{orderItem.FSupplierLot}"; + string FBarCode = $@"{orderItem.MaterialCode}*{decimal.Parse(yu.ToString()).ToString("F2")}*{order.FBillNo}*{orderItem.FSupplierLot}*{orderItem.MSSSupplierLot}"; TiaoMaList tiaoMa = new TiaoMaList(); tiaoMa = AutoMapperHelper.AutoMappToSingle(orderItem); tiaoMa.Id = Guid.NewGuid(); diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs index 49ee8e7..e6a2c74 100644 --- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs +++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs @@ -1,6 +1,7 @@ using Kingdee.CDP.WebApi.SDK; using Microsoft.Practices.ObjectBuilder2; using Microsoft.SqlServer.Server; +using MyCode.Project.Domain.Config; using MyCode.Project.Domain.Message.Act.PurchaseOrder; using MyCode.Project.Domain.Message.Common; using MyCode.Project.Domain.Message.Request.KingDee; @@ -513,16 +514,16 @@ namespace MyCode.Project.Services.Implementation { end = begin.AddMonths(1); var result = QueryList(begin, end, t.SupplierId, yuyan); - if (t.SupplierId == "9999.1") - { - LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString()); - LogHelper.Info(result); - } - else - { - LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString()); - LogHelper.Info(result); - } + //if (t.SupplierId == "9999.1") + //{ + // LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString()); + // LogHelper.Info(result); + //} + //else + //{ + // LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString()); + // LogHelper.Info(result); + //} List data = JsonHelper.ToObject>(result); //List data = System.Text.Json.JsonSerializer.Deserialize>(result); if (data.Count > 0) @@ -778,6 +779,13 @@ namespace MyCode.Project.Services.Implementation { throw new BaseException("国外的供应商发票号和发票日期是必填."); } + //string ReceiveorgCode = SystemConfig.ReceiveorgCode; + //List ReceiveorgCodeList = ReceiveorgCode.Split(',').ToList(); + //if (listAll.Where(t => !ReceiveorgCodeList.Contains(t.ReceiveorgCode) && t.ReceiveorgCode != null).Count() > 0) + //{ + // throw new BaseException("勾选的明细包含了不需要在本系统操作发货单的收料组织订单."); + //} + var caiGouLeiXingList = orderHeadList.Select(t => t.FBILLTYPEID).Distinct().ToList(); List invoiceOrders = new List(); caiGouLeiXingList.ForEach(leixing =>