生产入库单汇报记录id

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -2396,6 +2396,7 @@ namespace Tnb.ProductionMgr
                 wmsPrdInstockInput.rqty = input.rqty;
                 wmsPrdInstockInput.type = prdMo.mo_type;
                 wmsPrdInstockInput.create_id = report.create_id;
+                wmsPrdInstockInput.prd_report_id = report.id;
                 wmsPrdInstockInput.prdInstockDs = new List<WmsPrdInstockDInput>();
                 wmsPrdInstockInput.prdInstockCodes = new List<WmsPrdInstockCodeInput>();
                 wmsPrdInstockInput.prdInstockDs.Add(new WmsPrdInstockDInput()

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

@@ -108,6 +108,10 @@
         /// 齐套出入库
         /// </summary>
         public const string MATERIALTRANSFER_QTCRK_CODE = "assortWarehouse";
+        /// <summary>
+        /// 跨层外协件出入库
+        /// </summary>
+        public const string MATERIALTRANSFER_CROSSLAYER_CODE = "crosslayer";
 
         /// <summary>
         /// 出入库单据状态TypeID

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

@@ -18,6 +18,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
         public decimal rqty { get; set; }
         public string type { get; set; }
         public string create_id { get; set; }
+        public string prd_report_id { get; set; }
         public List<WmsPrdInstockDInput> prdInstockDs { get; set; }
         public List<WmsPrdInstockCodeInput> prdInstockCodes { get; set; }
     }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMaterialTransfer.cs

@@ -130,7 +130,7 @@ public partial class WmsMaterialTransfer : BaseEntity<string>
     public string? erp_bill_code { get; set; }
 
     /// <summary>
-    /// 转库类型
+    /// 转库类型(弃用)
     /// </summary>
     public string? transfer_type { get; set; }
 

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockH.cs

@@ -89,4 +89,9 @@ public partial class WmsPrdInstockH : BaseEntity<string>
     /// </summary>
     public string? type { get; set; }
 
+    /// <summary>
+    /// 汇报记录id
+    /// </summary>
+    public string? prd_report_id { get; set; }
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockD.cs

@@ -150,7 +150,7 @@ public partial class WmsTransferOutstockD : BaseEntity<string>
     public string erp_wh_type { get; set; }
 
     /// <summary>
-    /// erp入库仓库编码
+    /// erp入库仓库id
     /// </summary>
     public string? warehouse_instock_code { get; set; }
 

WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs

@@ -743,6 +743,11 @@ namespace Tnb.WarehouseMgr
                 {
                     transfer_type = WmsWareHouseConst.MATERIALTRANSFER_JZGLRK_CODE;
                 }
+                else if (warehouse_outstock.id == WmsWareHouseConst.WAREHOUSE_YCL_ID && warehouse_instock.id == WmsWareHouseConst.WAREHOUSE_ZZXBK_ID)
+                {
+                    transfer_type = WmsWareHouseConst.MATERIALTRANSFER_CROSSLAYER_CODE;
+                }
+                
                 // 暂时其他情况都算齐套出入库类型(未定)
                 else
                 {
@@ -811,7 +816,7 @@ namespace Tnb.WarehouseMgr
                     wmsMaterialTransfer.create_time = DateTime.Now;
                     wmsMaterialTransfer.org_id = WmsWareHouseConst.AdministratorOrgId;
                     wmsMaterialTransfer.erp_bill_code = input.bill_code;
-                    wmsMaterialTransfer.transfer_type = transfer_type;
+                    wmsMaterialTransfer.type = transfer_type;
                     wmsMaterialTransfer.erp_pk = input.erp_pk;
 
                     await db.Insertable(wmsMaterialTransfer).ExecuteCommandAsync();

WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs

@@ -84,6 +84,7 @@ namespace Tnb.WarehouseMgr
                     wmsPrdInstockH.create_time = DateTime.Now;
                     wmsPrdInstockH.prd_bill_code = input.prd_bill_code;
                     wmsPrdInstockH.bill_code = bill_code;
+                    wmsPrdInstockH.prd_report_id = input.prd_report_id;
                     wmsPrdInstockH.material_id = input.material_id;
                     wmsPrdInstockH.material_code = input.material_code;
                     wmsPrdInstockH.material_name = input.material_name;