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-06 16:55:58 +08:00
parent 0ae9737a8b
commit 893e2fd7e0
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs
View File

@@ -101,7 +101,9 @@ namespace Tnb.QcMgr
{ "temporarily", "暂控" }
};
PositionEntity positionEntity = await db.Queryable<PositionEntity>().Where(x=>x.Id==_userManager.User.PositionId).FirstAsync();
string positionId = _userManager.User != null && !string.IsNullOrEmpty(_userManager.User.PositionId) ? _userManager.User.PositionId : "";
PositionEntity positionEntity = await db.Queryable<PositionEntity>().Where(x=>x.Id==positionId).FirstAsync();
string positionCode = positionEntity != null ? positionEntity.EnCode : "";
Dictionary<string, string>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
string materialid = queryJson.ContainsKey("materialid") ? queryJson["materialid"].ToString() : "";
string checktype = queryJson.ContainsKey("checktype") ? queryJson["checktype"].ToString() : "";
@@ -122,7 +124,7 @@ namespace Tnb.QcMgr
.LeftJoin<EqpEquipment>((a,b,c,d,e,f,g)=>f.eqp_id==g.id)
.LeftJoin<OrganizeEntity>((a,b,c,d,e,f,g,h)=>d.OrganizeIdTree.Contains(h.Id) && h.Category == DictConst.RegionCategoryWorkshopCode)
.LeftJoin<PositionEntity>((a,b,c,d,e,f,g,h,i)=>h.Id==i.OrganizeId)
.WhereIF(_userManager.LoginType=="app" && !_userManager.IsAdministrator,(a,b,c,d,e,f,g,h,i)=>i.EnCode==positionEntity.EnCode)
.WhereIF(_userManager.LoginType=="app" && !_userManager.IsAdministrator,(a,b,c,d,e,f,g,h,i)=>i.EnCode==positionCode)
.WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == materialid)
.WhereIF(!string.IsNullOrEmpty(checktype), (a, b, c, d, e) => a.checktype == checktype)
.WhereIF(!string.IsNullOrEmpty(status), (a, b, c, d, e) => a.status == status)

8
WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs
View File

@@ -89,7 +89,13 @@ namespace Tnb.WarehouseMgr
}
if (input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)))
{
endLocationId = input.data[nameof(WmsDelivery.endlocation_id)]?.ToString()!;
BasLocation endLocation = await _db.Queryable<BasLocation>().Where(x=>x.location_code==input.data[nameof(WmsDelivery.endlocation_id)].ToString()).FirstAsync();
if (endLocation == null)
{
throw Oops.Bah("未找到目标库位");
}
endLocationId = endLocation.id;
}
string[] locIds = new[] { startLocationId, endLocationId };
List<BasLocation> locs = await _basLocationService?.GetLocationInfobyIds(locIds)!;

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

@@ -346,6 +346,7 @@ namespace Tnb.WarehouseMgr
// BasWarehouse scWarehouse = await _db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==wmsPrdInstockD.scwarehouse_id);
// BasWarehouse kcWarehouse = await _db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==wmsPrdInstockD.warehouse_id);
PrdReport prdReport = await _db.Queryable<PrdReport>().SingleAsync(x => x.id == instock.prd_report_id);
if (prdReport == null) return;
PrdMoTask prdMoTask = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdReport.mo_task_id);
PrdMo prdMo = await _db.Queryable<PrdMo>().SingleAsync(x => x.id == prdMoTask.mo_id);
//来源erp才产成品入库