From 9e984aa6b039989b68019343b14da95d07317cce Mon Sep 17 00:00:00 2001 From: "mingliang.tang" Date: Fri, 31 Mar 2023 14:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=B0=BE=E7=AE=B1=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E6=9C=80=E5=A4=A7UID=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsnBackgroundWorker.cs | 2 +- .../Asns/AsnFactory.cs | 5 ++ .../Win_in.Sfs.Scp.WebApi.Console/Program.cs | 82 +++++++++---------- .../Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs | 3 +- .../Repositories/TbAsnRepository.cs | 2 +- 5 files changed, 50 insertions(+), 44 deletions(-) diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs index f7d2c5d..3e4dc12 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs @@ -103,7 +103,7 @@ namespace Win_in.Sfs.Scp.WebApi var noPoAsn = CreateNoPoAsn(asn, barcodes); asnX12List.Add(noPoAsn); - + asn.IsPort = 1; if (asn.AsnBillNum.StartsWith(_options.QadAsnPrefix))//ASN to QAD { diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/AsnFactory.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/AsnFactory.cs index 4413900..b0a48d6 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/AsnFactory.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/AsnFactory.cs @@ -90,6 +90,11 @@ namespace Win_in.Sfs.Scp.WebApi var accumQty = 0;//TODO 如何计算 var loadQty = b.BarcodeAndBatchs.Count; var unitQty = b.PackQty; + if (unitQty != b.Qty) + { + unitQty = b.Qty; + loadQty = 1; + } var item = CreateItem(b.PartCode, loadQty * unitQty, b.PoUnit, accumQty, b.PoBillNum, loadQty, unitQty, b.BarcodeAndBatchs); items.Add(item); diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Console/Program.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Console/Program.cs index 49d22ba..8030719 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Console/Program.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Console/Program.cs @@ -27,79 +27,79 @@ namespace Win_in.Sfs.Scp.WebApi.Console { BarCode = "BARCODE_01", PartCode = "PART_A", - Qty=20, + Qty=28, Batch="20220404", PoUnit = "EA", PoBillNum = "PO1111", - PackQty = 20, + PackQty = 28, Extend2 = "PALLET_01" }, new TS_BARCODE() { BarCode = "BARCODE_02", PartCode = "PART_A", - Qty=20, + Qty=28, Batch="20220404", PoUnit = "EA", PoBillNum = "PO1111", - PackQty = 20, + PackQty = 28, Extend2 = "PALLET_01" }, new TS_BARCODE() { BarCode = "BARCODE_03", PartCode = "PART_B", - Qty=15, + Qty=28, Batch="20220404", PoUnit = "EA", PoBillNum = "PO2222", - PackQty = 15, + PackQty = 28, Extend2 = "PALLET_01" }, new TS_BARCODE() { BarCode = "BARCODE_04", PartCode = "PART_B", - Qty=15, + Qty=16, Batch="20220404", PoUnit = "EA", PoBillNum = "PO2222", - PackQty = 15, + PackQty = 28, Extend2 = "PALLET_01" }, - new TS_BARCODE() - { - BarCode = "BARCODE_05", - PartCode = "PART_C", - Qty=40, - Batch="20220404", - PoUnit = "KG", - PoBillNum = "PO3333", - PackQty = 40, - Extend2 = "PALLET_02" - }, - new TS_BARCODE() - { - BarCode = "BARCODE_06", - PartCode = "PART_C", - Qty=40, - Batch="20220404", - PoUnit = "KG", - PoBillNum = "PO3333", - PackQty = 40, - Extend2 = "PALLET_02" - }, - new TS_BARCODE() - { - BarCode = "BARCODE_07", - PartCode = "PART_C", - Qty=40, - Batch="20220404", - PoUnit = "KG", - PoBillNum = "PO3333", - PackQty = 23, - Extend2 = "" - }, + //new TS_BARCODE() + //{ + // BarCode = "BARCODE_05", + // PartCode = "PART_C", + // Qty=40, + // Batch="20220404", + // PoUnit = "KG", + // PoBillNum = "PO3333", + // PackQty = 40, + // Extend2 = "PALLET_02" + //}, + //new TS_BARCODE() + //{ + // BarCode = "BARCODE_06", + // PartCode = "PART_C", + // Qty=40, + // Batch="20220404", + // PoUnit = "KG", + // PoBillNum = "PO3333", + // PackQty = 40, + // Extend2 = "PALLET_02" + //}, + //new TS_BARCODE() + //{ + // BarCode = "BARCODE_07", + // PartCode = "PART_C", + // Qty=40, + // Batch="20220404", + // PoUnit = "KG", + // PoBillNum = "PO3333", + // PackQty = 23, + // Extend2 = "" + //}, }; return barcodes; } diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs index 1af7f49..42eac1f 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TB_ASN.cs @@ -45,6 +45,7 @@ namespace Win_in.Sfs.Scp.v1.Domain.Asns public string SubSite { get; set; } - public Guid? TenantId { get; } + public int IsPort { get; set; }//接口是否读取 + public Guid? TenantId { get; } } } \ No newline at end of file diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Repositories/TbAsnRepository.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Repositories/TbAsnRepository.cs index 79c1399..1ea997f 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Repositories/TbAsnRepository.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Repositories/TbAsnRepository.cs @@ -21,7 +21,7 @@ namespace Win_in.Sfs.Scp.v1.EntityFrameworkCore var list = await dbSet .Where(p =>p.Site==site && p.State == 3 //已发货 - && p.Id > uid) + && p.IsPort==0) .OrderBy(p => p.Id) .Take(batchSize) .ToListAsync();