Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodeInput.cs

@@ -13,5 +13,9 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
         /// 条码的张数
         /// </summary>
         public int barcode_qty { get; set; }
+        /// <summary>
+        /// 条码数量
+        /// </summary>
+        //public int code_qty { get; set; }
     }
 }

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;

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;

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;