diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index c40f91e8..4cbb8a90 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/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(); wmsPrdInstockInput.prdInstockCodes = new List(); wmsPrdInstockInput.prdInstockDs.Add(new WmsPrdInstockDInput() diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs index d61a7d32..6040a9a4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs @@ -108,6 +108,10 @@ /// 齐套出入库 /// public const string MATERIALTRANSFER_QTCRK_CODE = "assortWarehouse"; + /// + /// 跨层外协件出入库 + /// + public const string MATERIALTRANSFER_CROSSLAYER_CODE = "crosslayer"; /// /// 出入库单据状态TypeID diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WmsPrdInstockInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WmsPrdInstockInput.cs index f33496dc..97effc4f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WmsPrdInstockInput.cs +++ b/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 prdInstockDs { get; set; } public List prdInstockCodes { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMaterialTransfer.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMaterialTransfer.cs index 96500bdf..60346b66 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMaterialTransfer.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsMaterialTransfer.cs @@ -130,7 +130,7 @@ public partial class WmsMaterialTransfer : BaseEntity public string? erp_bill_code { get; set; } /// - /// 转库类型 + /// 转库类型(弃用) /// public string? transfer_type { get; set; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockH.cs index 9d0c6479..a47c4eb2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockH.cs @@ -89,4 +89,9 @@ public partial class WmsPrdInstockH : BaseEntity /// public string? type { get; set; } + /// + /// 汇报记录id + /// + public string? prd_report_id { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockD.cs index 5f581bee..cf88b48f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferOutstockD.cs @@ -150,7 +150,7 @@ public partial class WmsTransferOutstockD : BaseEntity public string erp_wh_type { get; set; } /// - /// erp入库仓库编码 + /// erp入库仓库id /// public string? warehouse_instock_code { get; set; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs index 3e8a2356..97f466c4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs +++ b/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(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index 03aec782..37355a59 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/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;