各模块增加规格型号和箱号

This commit is contained in:
2023-11-27 14:57:10 +08:00
parent f245a134fa
commit a400c2a3d2
5 changed files with 33 additions and 5 deletions

View File

@@ -177,6 +177,8 @@ namespace Tnb.WarehouseMgr
material_code = detail.material_code,
barcode = code,
code_batch = detail.code_batch,
material_specification= detail.material_specification,
container_no =detail.container_no,
codeqty = detail.pr_qty!.Value,
unit_id = detail.unit_id,
is_lock = 0,
@@ -335,12 +337,14 @@ namespace Tnb.WarehouseMgr
instockcode.id = SnowflakeIdHelper.NextId();
string materialCode = instockcode.material_code;
string? codeBatch = instockcode.code_batch;
WmsInstockCode? b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch);
string? materialSpecification = instockcode.material_specification;
string? containerNo = instockcode.container_no;
WmsInstockCode? b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch && x.material_specification == materialSpecification && x.container_no == containerNo);
if (b != null)
{
WmsInstockCode c = DeepCopyHelper<WmsInstockCode>.DeepCopy(b);
c.id = SnowflakeIdHelper.NextId();
c.bill_d_id = instockds?.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id ?? "";
c.bill_d_id = instockds?.Find(x => x.material_code == materialCode && x.code_batch == codeBatch && x.material_specification == materialSpecification && x.container_no == containerNo)?.id ?? "";
c.barcode = instockcode.barcode;
c.codeqty = instockcode.codeqty;
c.is_end = 0;// 未结束
@@ -411,6 +415,8 @@ namespace Tnb.WarehouseMgr
ptc.codeqty = jo.codeqty;
ptc.unit_id = jo.unit_id!;
ptc.code_batch = jo.code_batch;
ptc.material_specification = jo.material_specification;
ptc.container_no = jo.container_no;
pretaskCodes.Add(ptc);
}
}