yuyubo/MeiSaiSiXieTongApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
余宇波 2025-06-04 10:00:59 +08:00
parent 253606b808
commit 4b7920fc60
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
View File

@ -290,10 +290,11 @@ namespace MyCode.Project.Services.Implementation
baoShu = (int)(zongQty / act.CuseQty); baoShu = (int)(zongQty / act.CuseQty);
// 条码 ：物料编码，数量，收料通知单号，供应商批号，key // 条码 ：物料编码，数量，收料通知单号，供应商批号，key
// 条码 ：物料编码，数量，收料通知单号，供应商批号,美塞斯批号，key
for (int i = 0; i < baoShu; i++) 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(); TiaoMaList tiaoMa = new TiaoMaList();
tiaoMa = AutoMapperHelper.AutoMappToSingle<TiaoMaList, InvoiceOrderItem>(orderItem); tiaoMa = AutoMapperHelper.AutoMappToSingle<TiaoMaList, InvoiceOrderItem>(orderItem);
tiaoMa.Id = Guid.NewGuid(); tiaoMa.Id = Guid.NewGuid();
@ -309,7 +310,7 @@ namespace MyCode.Project.Services.Implementation
} }
if (yu > 0) 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(); TiaoMaList tiaoMa = new TiaoMaList();
tiaoMa = AutoMapperHelper.AutoMappToSingle<TiaoMaList, InvoiceOrderItem>(orderItem); tiaoMa = AutoMapperHelper.AutoMappToSingle<TiaoMaList, InvoiceOrderItem>(orderItem);
tiaoMa.Id = Guid.NewGuid(); tiaoMa.Id = Guid.NewGuid();

28
MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
View File

@ -1,6 +1,7 @@
using Kingdee.CDP.WebApi.SDK; using Kingdee.CDP.WebApi.SDK;
using Microsoft.Practices.ObjectBuilder2; using Microsoft.Practices.ObjectBuilder2;
using Microsoft.SqlServer.Server; using Microsoft.SqlServer.Server;
using MyCode.Project.Domain.Config;
using MyCode.Project.Domain.Message.Act.PurchaseOrder; using MyCode.Project.Domain.Message.Act.PurchaseOrder;
using MyCode.Project.Domain.Message.Common; using MyCode.Project.Domain.Message.Common;
using MyCode.Project.Domain.Message.Request.KingDee; using MyCode.Project.Domain.Message.Request.KingDee;
@ -513,16 +514,16 @@ namespace MyCode.Project.Services.Implementation
{ {
end = begin.AddMonths(1); end = begin.AddMonths(1);
var result = QueryList(begin, end, t.SupplierId, yuyan); var result = QueryList(begin, end, t.SupplierId, yuyan);
if (t.SupplierId == "9999.1") //if (t.SupplierId == "9999.1")
{ //{
LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString()); // LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
LogHelper.Info(result); // LogHelper.Info(result);
} //}
else //else
{ //{
LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString()); // LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
LogHelper.Info(result); // LogHelper.Info(result);
} //}
List<dynamic> data = JsonHelper.ToObject<List<dynamic>>(result); List<dynamic> data = JsonHelper.ToObject<List<dynamic>>(result);
//List<dynamic> data = System.Text.Json.JsonSerializer.Deserialize<List<dynamic>>(result); //List<dynamic> data = System.Text.Json.JsonSerializer.Deserialize<List<dynamic>>(result);
if (data.Count > 0) if (data.Count > 0)
@ -778,6 +779,13 @@ namespace MyCode.Project.Services.Implementation
{ {
throw new BaseException("国外的供应商发票号和发票日期是必填."); throw new BaseException("国外的供应商发票号和发票日期是必填.");
} }
//string ReceiveorgCode = SystemConfig.ReceiveorgCode;
//List<string> 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(); var caiGouLeiXingList = orderHeadList.Select(t => t.FBILLTYPEID).Distinct().ToList();
List<InvoiceOrder> invoiceOrders = new List<InvoiceOrder>(); List<InvoiceOrder> invoiceOrders = new List<InvoiceOrder>();
caiGouLeiXingList.ForEach(leixing => caiGouLeiXingList.ForEach(leixing =>