diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs index de9c776d..c5e31e74 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs @@ -1873,6 +1873,7 @@ namespace Tnb.WarehouseMgr wmsTransferInstockD.xf_qty = 0; wmsTransferInstockD.pr_qty = detail.qty; wmsTransferInstockD.lineno = detail.lineno; + wmsTransferInstockD.udi_code = detail.udi_code; var material = await db.Queryable().Where(p => p.code == detail.material_code).FirstAsync(); if (material != null) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs index 4af4c78d..6bef965b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs @@ -98,7 +98,7 @@ namespace Tnb.WarehouseMgr JObject jobject = new JObject(); jobject["code"] = "200"; - List wmsTransferInstockDs = _db.Queryable().Where(r => r.bill_id == input.id && r.status != WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).ToList(); + List wmsTransferInstockDs = _db.Queryable().Where(r => r.bill_id == input.id).ToList(); jobject["data"] = JArray.Parse(JsonConvert.SerializeObject(wmsTransferInstockDs)); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 243b4496..37249c9c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -1175,8 +1175,8 @@ namespace Tnb.WarehouseMgr getdic.Add("ZZ-01-02", new string[] { "外包装箱码垛线", "WBZX_x1_take_mtp", "true" }); getdic.Add("ZZ-02-02", new string[] { "外包装箱码垛线", "WBZX_x2_take_mtp", "true" }); - getdic.Add("ZZ-01-01", new string[] { "外包装箱码垛线", "WBZX_x1_put_mtp", "true" }); - getdic.Add("ZZ-02-01", new string[] { "外包装箱码垛线", "WBZX_x2_put_mtp", "true" }); + putdic.Add("ZZ-01-01", new string[] { "外包装箱码垛线", "WBZX_x1_put_mtp", "true" }); + putdic.Add("ZZ-02-01", new string[] { "外包装箱码垛线", "WBZX_x2_put_mtp", "true" }); getdic.Add("ZSSSXCTU02", new string[] { "YTCS", "右输送线上层允许出箱3", "true" });