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

bug

Browse Source
This commit is contained in:
周科达
2024-07-22 11:29:39 +08:00
parent 922a3bc391
commit 525fcb428a
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -807,19 +807,38 @@ namespace Tnb.ProductionMgr
string[] unitArr = erpBdMaterial.MEASRATE.Split("/"); string[] unitArr = erpBdMaterial.MEASRATE.Split("/");
if (erpExtendFields.All(x => x.cmaterialoid != erpBdMaterial.ID)) if (erpExtendFields.All(x => x.cmaterialoid != erpBdMaterial.ID))
{ {
BasMaterial basMaterial = new BasMaterial() BasMaterial basMaterial = null;
ErpExtendField tempExtendField = insertExtendFields.Find(x => x.cmaterialoid == erpBdMaterial.ID);
if (tempExtendField!=null)
{ {
id = SnowflakeIdHelper.NextId(), basMaterial = insertMaterial.Find(x => x.id == tempExtendField.table_id);
name = erpBdMaterial.NAME, }
code = erpBdMaterial.CODE, else
org_id = WmsWareHouseConst.AdministratorOrgId, {
material_specification = erpBdMaterial.MATERIALSPEC, basMaterial = new BasMaterial()
material_standard = erpBdMaterial.MATERIALTYPE, {
category_id = "[\"CGJCJ\"]", id = SnowflakeIdHelper.NextId(),
unit_id = unitId, name = erpBdMaterial.NAME,
create_time = DateTime.Now code = erpBdMaterial.CODE,
}; org_id = WmsWareHouseConst.AdministratorOrgId,
insertMaterial.Add(basMaterial); material_specification = erpBdMaterial.MATERIALSPEC,
material_standard = erpBdMaterial.MATERIALTYPE,
category_id = "[\"CGJCJ\"]",
unit_id = unitId,
create_time = DateTime.Now
};
insertMaterial.Add(basMaterial);
ErpExtendField erpExtendField = new ErpExtendField()
{
table_name = "bas_material",
table_id = basMaterial.id,
cmaterialoid = erpBdMaterial.ID,
cmaterialvid = erpBdMaterial.VID,
};
insertExtendFields.Add(erpExtendField);
}
if (unitId != auxiliaryUnitId) if (unitId != auxiliaryUnitId)
{ {
@@ -892,6 +911,7 @@ namespace Tnb.ProductionMgr
await _db.Insertable(insertMaterial).ExecuteCommandAsync(); await _db.Insertable(insertMaterial).ExecuteCommandAsync();
await _db.Insertable(insertMaterialUnits).ExecuteCommandAsync(); await _db.Insertable(insertMaterialUnits).ExecuteCommandAsync();
await _db.Insertable(insertExtendFields).ExecuteCommandAsync();
//物料清单开始同步 //物料清单开始同步
materials = await _db.Queryable<BasMaterial>().ToListAsync(); materials = await _db.Queryable<BasMaterial>().ToListAsync();