diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs index df851d59..e2c3ba78 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs @@ -139,6 +139,6 @@ public partial class WmsTransferInstockD : BaseEntity /// /// 物料规格 /// - public string material_specificatior { get; set; } + public string material_specification { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs index 3cdd6408..b090d1a1 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs @@ -1865,7 +1865,7 @@ namespace Tnb.WarehouseMgr { wmsTransferInstockD.material_id = material.id; wmsTransferInstockD.material_code = material.code; - wmsTransferInstockD.material_specificatior = material.material_specification; + wmsTransferInstockD.material_specification = material.material_specification; wmsTransferInstockD.material_desc = material.material_standard; } wmsTransferInstockD.auxprop = detail.auxprop; @@ -1952,7 +1952,7 @@ namespace Tnb.WarehouseMgr { wmsTransferInstockD.material_id = material.id; wmsTransferInstockD.material_code = material.code; - wmsTransferInstockD.material_specificatior = material.material_specification; + wmsTransferInstockD.material_specification = material.material_specification; wmsTransferInstockD.material_desc = material.material_standard; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs index b65b77eb..ddd16d80 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs @@ -105,7 +105,7 @@ namespace Tnb.WarehouseMgr auxprop_gys = a.auxprop_gys, auxprop_xph = a.auxprop_xph, udi_code = a.udi_code, - material_specification = b.material_specification, + material_specification = a.material_specification, material_standard = b.material_standard }); @@ -131,7 +131,37 @@ namespace Tnb.WarehouseMgr JObject jobject = new JObject(); jobject["code"] = "200"; - List wmsTransferInstockDs = _db.Queryable().Where(r => r.bill_id == input.id).ToList(); + List wmsTransferInstockDs = _db.Queryable().LeftJoin((a, b) => a.material_id == b.id).Where((a, b) => a.bill_id == input.id).Select((a, b) => new WmsTransferInstockD + { + id = a.id, + org_id = a.org_id, + bill_id = a.bill_id, + status = a.status, + material_id = a.material_id, + material_code = a.material_code, + unit_id = a.unit_id, + unit_code = a.unit_code, + pr_qty = a.pr_qty, + xf_qty = a.xf_qty, + qty = a.qty, + f_flowid = a.f_flowid, + f_flowtaskid = a.f_flowtaskid, + material_desc = a.material_desc, + create_id = a.create_id, + create_time = a.create_time, + modify_id = a.modify_id, + modify_time = a.modify_time, + pi_code = a.pi_code, + stock_location = a.stock_location, + erp_line_pk = a.erp_line_pk, + lineno = a.lineno, + material_name = a.material_name, + auxprop = a.auxprop, + auxprop_gys = a.auxprop_gys, + auxprop_xph = a.auxprop_xph, + udi_code = a.udi_code, + material_specification = a.material_specification, + }).ToList(); jobject["data"] = JArray.Parse(JsonConvert.SerializeObject(wmsTransferInstockDs));