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-09-05 17:10:12 +08:00
parent 2a3a8aff11
commit 2c7fd13e6b
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -2482,18 +2482,18 @@ namespace Tnb.ProductionMgr
//来源erp需要调接口
if (prdMo.mo_source == "1")
{
// List<DictionaryDataEntity> unitDatas = await db.Queryable<DictionaryTypeEntity>()
// .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
// .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode==report.unit_id)
// .Select((x, y) => y)
// .ToListAsync();
List<DictionaryDataEntity> unitDatas = await db.Queryable<DictionaryTypeEntity>()
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode==report.unit_id)
.Select((x, y) => y)
.ToListAsync();
List<string> erpExtendIds = new List<string>();
erpExtendIds.Add(_userManager.UserId);
erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId);
erpExtendIds.Add(report.material_id);
erpExtendIds.Add(report.unit_id);
// erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList());
// erpExtendIds.Add(report.unit_id);
erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList());
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>erpExtendIds.Contains(x.table_id)).ToListAsync();
string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId)?.user_id ?? "";
@@ -2534,8 +2534,8 @@ namespace Tnb.ProductionMgr
["cbmoid"] = prdMo.erp_mo_pk,
// ["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "",
// ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "",
["cbunitid"] = erpExtendFields.Find(x => x.table_id == report.unit_id)?.cunitid ?? "",
["cbastunitid"] = erpExtendFields.Find(x => x.table_id == report.unit_id)?.cunitid ?? "",
["cbunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==report.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cbastunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==report.unit_id)?.Id ?? ""))?.cunitid ?? "",
["nbplanwrnum"] = report.reported_qty,
["nbwrnum"] = report.reported_qty,
["tbendtime"] = nowStr,

18
WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
View File

@@ -358,12 +358,12 @@ namespace Tnb.WarehouseMgr
List<String> materialIds = Arrays.AsList(instock.material_id);
List<String> unitIds = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
// List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
// List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
// .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
// .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
// .Select((x, y) => y)
// .ToListAsync();
List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
.Select((x, y) => y)
.ToListAsync();
List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
string userId = instock?.create_id ?? WmsWareHouseConst.AdministratorUserId;
@@ -373,8 +373,8 @@ namespace Tnb.WarehouseMgr
tableIds.Add(WmsWareHouseConst.AdministratorOrgId);
tableIds.AddRange(materialIds);
tableIds.Add(supplierId);
// tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
tableIds.AddRange(unitIds);
tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
// tableIds.AddRange(unitIds);
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync();
string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? "";
@@ -422,7 +422,7 @@ namespace Tnb.WarehouseMgr
["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10,
["csourcebillhid"] = prdReport?.erp_pk_wr ?? "",
["csourcebillbid"] = prdReport?.erp_pk_wr_product ?? "",
["cunitid"] = erpExtendFields.Find(x => x.table_id == item.unit_id)?.cunitid ?? "",
["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "",
["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "",
["dbizdate"] = instock.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),