From 0546cbd54beab5fb202e69aba9c6ddf572d9eb65 Mon Sep 17 00:00:00 2001 From: chenwenkai <1084072318@qq.com> Date: Tue, 5 Nov 2024 12:31:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9C=80=E5=B0=8F=E5=8C=85=E8=A3=85=E6=95=B0?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=88=90=E4=BC=A0=E8=BF=9B=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs | 4 ++++ WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs | 1 + WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs | 2 +- .../Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs index ffa148e2..9ac3fbee 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs @@ -13,5 +13,9 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs /// 条码的张数 /// public int barcode_qty { get; set; } + /// + /// 条码数量 + /// + public int code_qty { get; set; } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs index 9f873e19..8890a89c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs @@ -164,6 +164,7 @@ namespace Tnb.WarehouseMgr }; int codeNum = 0; + minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 if (minPacking.HasValue && minPacking.Value > 0) { codeNum = input.barcode_qty; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs index d00201f7..cdee4a18 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs @@ -469,7 +469,7 @@ namespace Tnb.WarehouseMgr throw new AppFriendlyException($"物料{WmsPurchaseD.material_code} {WmsPurchaseD.material_id} 包装数量为空或者等于0，无法打印！", 500); }; int codeNum = 0; - + minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 if (minPacking.HasValue && minPacking.Value > 0) { codeNum = input.barcode_qty; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs index 2e67299e..9cbac22b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs @@ -244,7 +244,7 @@ namespace Tnb.WarehouseMgr throw new AppFriendlyException($"物料{WmsRawmatTransferinstockD.matcode} {WmsRawmatTransferinstockD.matcode_id} 包装数量为空或者等于0，无法打印！", 500); }; int codeNum = 0; - + minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 if (minPacking.HasValue && minPacking.Value > 0) { codeNum = input.barcode_qty; From 8e96cf51e26b875f689682072224867b6fe494bc Mon Sep 17 00:00:00 2001 From: chenwenkai <1084072318@qq.com> Date: Tue, 5 Nov 2024 13:00:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E6=95=B0=E6=9A=82=E6=97=B6=E4=B8=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs | 2 +- .../Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs index 9ac3fbee..d4d7eb5b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs @@ -16,6 +16,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs /// /// 条码数量 /// - public int code_qty { get; set; } + //public int code_qty { get; set; } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs index 8890a89c..11009c6e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs @@ -164,7 +164,7 @@ namespace Tnb.WarehouseMgr }; int codeNum = 0; - minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 + //minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 if (minPacking.HasValue && minPacking.Value > 0) { codeNum = input.barcode_qty; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs index cdee4a18..af1cb55b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs @@ -469,7 +469,7 @@ namespace Tnb.WarehouseMgr throw new AppFriendlyException($"物料{WmsPurchaseD.material_code} {WmsPurchaseD.material_id} 包装数量为空或者等于0，无法打印！", 500); }; int codeNum = 0; - minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 + //minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 if (minPacking.HasValue && minPacking.Value > 0) { codeNum = input.barcode_qty; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs index 9cbac22b..68ce2092 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs @@ -244,7 +244,7 @@ namespace Tnb.WarehouseMgr throw new AppFriendlyException($"物料{WmsRawmatTransferinstockD.matcode} {WmsRawmatTransferinstockD.matcode_id} 包装数量为空或者等于0，无法打印！", 500); }; int codeNum = 0; - minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 + //minPacking = input.code_qty;//最小包装数替换成传进来的条码数量 if (minPacking.HasValue && minPacking.Value > 0) { codeNum = input.barcode_qty;