各模块增加规格型号和箱号

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs

@@ -10,6 +10,10 @@
         /// 中储仓ID
         /// </summary>
         public const string WAREHOUSE_ZC_ID = "2";
+        /// <summary>
+        /// 成品仓库ID
+        /// </summary>
+        public const string WAREHOUSE_CP_ID = "26103372441637";
 
         /// <summary>
         /// 出入库单据状态TypeID

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs

@@ -94,4 +94,12 @@ public partial class WmsHandleCode : BaseEntity<string>
     /// </summary>
     public DateTime? modify_time { get; set; }
 
+    /// <summary>
+    /// 规格型号
+    /// </summary>
+    public string? material_specification { get; set; }
+    /// <summary>
+    /// 箱号
+    /// </summary>
+    public string? container_no { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs

@@ -177,6 +177,8 @@ namespace Tnb.WarehouseMgr
                 material_code = detail.material_code,
                 barcode = code,
                 code_batch = detail.code_batch,
+                material_specification= detail.material_specification,
+                container_no =detail.container_no,
                 codeqty = detail.pr_qty!.Value,
                 unit_id = detail.unit_id,
                 is_lock = 0,
@@ -335,12 +337,14 @@ namespace Tnb.WarehouseMgr
                     instockcode.id = SnowflakeIdHelper.NextId();
                     string materialCode = instockcode.material_code;
                     string? codeBatch = instockcode.code_batch;
-                    WmsInstockCode? b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch);
+                    string? materialSpecification = instockcode.material_specification;
+                    string? containerNo = instockcode.container_no;
+                    WmsInstockCode? b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch && x.material_specification == materialSpecification && x.container_no == containerNo);
                     if (b != null)
                     {
                         WmsInstockCode c = DeepCopyHelper<WmsInstockCode>.DeepCopy(b);
                         c.id = SnowflakeIdHelper.NextId();
-                        c.bill_d_id = instockds?.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id ?? "";
+                        c.bill_d_id = instockds?.Find(x => x.material_code == materialCode && x.code_batch == codeBatch && x.material_specification == materialSpecification && x.container_no == containerNo)?.id ?? "";
                         c.barcode = instockcode.barcode;
                         c.codeqty = instockcode.codeqty;
                         c.is_end = 0;// 未结束
@@ -411,6 +415,8 @@ namespace Tnb.WarehouseMgr
                                     ptc.codeqty = jo.codeqty;
                                     ptc.unit_id = jo.unit_id!;
                                     ptc.code_batch = jo.code_batch;
+                                    ptc.material_specification = jo.material_specification;
+                                    ptc.container_no = jo.container_no;
                                     pretaskCodes.Add(ptc);
                                 }
                             }

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs

@@ -160,6 +160,8 @@ namespace Tnb.WarehouseMgr
                                     ptc.codeqty = jo.Value<int>(nameof(WmsPretaskCode.codeqty));
                                     ptc.unit_id = jo.Value<string>(nameof(WmsPretaskCode.unit_id))!;
                                     ptc.code_batch = jo.Value<string>(nameof(WmsPretaskCode.code_batch));
+                                    ptc.material_specification = jo.Value<string>(nameof(WmsPretaskCode.material_specification))!;
+                                    ptc.container_no = jo.Value<string>(nameof(WmsPretaskCode.container_no));
                                     pretaskCodes.Add(ptc);
                                 }
                             }
@@ -208,6 +210,8 @@ namespace Tnb.WarehouseMgr
                                             material_code = jo.Value<string>(nameof(WmsHandleCode.material_code))!,
                                             barcode = jo.Value<string>(nameof(WmsHandleCode.barcode))!,
                                             code_batch = jo.Value<string>(nameof(WmsHandleCode.code_batch)),
+                                            material_specification = jo.Value<string>(nameof(WmsPretaskCode.material_specification))!,
+                                            container_no = jo.Value<string>(nameof(WmsPretaskCode.container_no)),
                                             codeqty = jo.Value<int>(nameof(WmsHandleCode.codeqty)),
                                             unit_id = _db.Queryable<BasMaterial>().Single(it => it.id == materialId).unit_id,
                                             create_id = _userManager.UserId,

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs

@@ -105,7 +105,7 @@ namespace Tnb.WarehouseMgr
                     bill_type = WmsWareHouseConst.BILLTYPE_MATERIALINSTOCK_ID,
                     biz_type = WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID,
                     bill_date = DateTime.Today,
-                    warehouse_id = whId?.ToString() ?? "26103372441637",
+                    warehouse_id = whId?.ToString() ?? WmsWareHouseConst.WAREHOUSE_CP_ID,
                     status = WmsWareHouseConst.BILLSTATUS_ADD_ID,
                     generate_type = "0",
                     sync_status = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC,
@@ -130,7 +130,9 @@ namespace Tnb.WarehouseMgr
                         pr_qty = item.codeqty,
                         qty = 0,
                         code_batch = item.code_batch,
-                        warehouse_id = "26103372441637",
+                        material_specification = item.material_specification,
+                        container_no = item.container_no,  
+                        warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID,
                         print_qty = item.codeqty,
                         scan_qty = item.codeqty,
                         print_id = "",
@@ -163,6 +165,8 @@ namespace Tnb.WarehouseMgr
                         unit_id = mat.unit_id,
                         barcode = carryCode,
                         code_batch = item.code_batch,
+                        material_specification = item.material_specification,
+                        container_no = item.container_no,
                         codeqty = item.codeqty,
                         is_lock = 0,
                         is_end = 0,
@@ -179,7 +183,7 @@ namespace Tnb.WarehouseMgr
                 }
 
 
-                InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = "26103372441637", Size = 1 };
+                InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID, Size = 1 };
                 List<BasLocation> endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
                 WmsPointH sPoint = new();
                 WmsPointH ePoint = new();
@@ -250,6 +254,8 @@ namespace Tnb.WarehouseMgr
                             ptc.material_code = instockCode.material_code;
                             ptc.barcode = instockCode.barcode;
                             ptc.codeqty = instockCode.codeqty;
+                            ptc.material_specification = instockCode.material_specification;
+                            ptc.container_no = instockCode.container_no;
                             ptc.unit_id = instockCode.unit_id;
                             ptc.code_batch = instockCode.code_batch;
                             pretaskCodes.Add(ptc);