wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加物料规格

Browse Source
This commit is contained in:
陈文凯
2024-11-14 10:45:37 +08:00
parent 5cbff329db
commit 810cb5f415
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs
View File

@@ -139,6 +139,6 @@ public partial class WmsTransferInstockD : BaseEntity<string>
/// <summary> /// <summary>
/// 物料规格 /// 物料规格
/// </summary> /// </summary>
public string material_specificatior { get; set; } public string material_specification { get; set; }
} }

4
WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
View File

@@ -1865,7 +1865,7 @@ namespace Tnb.WarehouseMgr
{ {
wmsTransferInstockD.material_id = material.id; wmsTransferInstockD.material_id = material.id;
wmsTransferInstockD.material_code = material.code; wmsTransferInstockD.material_code = material.code;
wmsTransferInstockD.material_specificatior = material.material_specification; wmsTransferInstockD.material_specification = material.material_specification;
wmsTransferInstockD.material_desc = material.material_standard; wmsTransferInstockD.material_desc = material.material_standard;
} }
wmsTransferInstockD.auxprop = detail.auxprop; wmsTransferInstockD.auxprop = detail.auxprop;
@@ -1952,7 +1952,7 @@ namespace Tnb.WarehouseMgr
{ {
wmsTransferInstockD.material_id = material.id; wmsTransferInstockD.material_id = material.id;
wmsTransferInstockD.material_code = material.code; wmsTransferInstockD.material_code = material.code;
wmsTransferInstockD.material_specificatior = material.material_specification; wmsTransferInstockD.material_specification = material.material_specification;
wmsTransferInstockD.material_desc = material.material_standard; wmsTransferInstockD.material_desc = material.material_standard;
} }

34
WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs
View File

@@ -105,7 +105,7 @@ namespace Tnb.WarehouseMgr
auxprop_gys = a.auxprop_gys, auxprop_gys = a.auxprop_gys,
auxprop_xph = a.auxprop_xph, auxprop_xph = a.auxprop_xph,
udi_code = a.udi_code, udi_code = a.udi_code,
material_specification = b.material_specification, material_specification = a.material_specification,
material_standard = b.material_standard material_standard = b.material_standard
}); });
@@ -131,7 +131,37 @@ namespace Tnb.WarehouseMgr
JObject jobject = new JObject(); JObject jobject = new JObject();
jobject["code"] = "200"; jobject["code"] = "200";
List<WmsTransferInstockD> wmsTransferInstockDs = _db.Queryable<WmsTransferInstockD>().Where(r => r.bill_id == input.id).ToList(); List<WmsTransferInstockD> wmsTransferInstockDs = _db.Queryable<WmsTransferInstockD>().LeftJoin<BasMaterial>((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)); jobject["data"] = JArray.Parse(JsonConvert.SerializeObject(wmsTransferInstockDs));