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-23 13:55:33 +08:00
parent 0a8cdfddbb
commit 3b5da917f4
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ using Tnb.Common.Utils;
using Tnb.Common.Redis; using Tnb.Common.Redis;
using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Consts;
using JNPF.Extras.CollectiveOAuth.Utils; using JNPF.Extras.CollectiveOAuth.Utils;
using JNPF.Systems.Interfaces.Permission;
using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Dto.Inputs;
@@ -73,6 +74,7 @@ namespace Tnb.ProductionMgr
private readonly IBillRullService _billRuleService; private readonly IBillRullService _billRuleService;
private readonly IPrdInstockService _prdInstockService; private readonly IPrdInstockService _prdInstockService;
private readonly WmsPrdInstockHService _wmsPrdInstockHService; private readonly WmsPrdInstockHService _wmsPrdInstockHService;
private readonly IOrganizeService _organizeService;
private readonly IQcCheckPlanService _qcCheckPlanService; private readonly IQcCheckPlanService _qcCheckPlanService;
private readonly IWmsCarryService _wmsCarryService; private readonly IWmsCarryService _wmsCarryService;
private readonly ElevatorControlConfiguration _eleCtlCfg = App.Configuration.Build<ElevatorControlConfiguration>(); private readonly ElevatorControlConfiguration _eleCtlCfg = App.Configuration.Build<ElevatorControlConfiguration>();
@@ -88,6 +90,7 @@ namespace Tnb.ProductionMgr
IWmsCarryService wmsCarryService, IWmsCarryService wmsCarryService,
IBillRullService billRullService, IBillRullService billRullService,
IPrdInstockService prdInstockService, IPrdInstockService prdInstockService,
IOrganizeService organizeService,
WmsPrdInstockHService wmsPrdInstockHService, WmsPrdInstockHService wmsPrdInstockHService,
IVisualDevService visualDevService, IVisualDevService visualDevService,
IQcCheckPlanService qcCheckPlanService IQcCheckPlanService qcCheckPlanService
@@ -98,6 +101,7 @@ namespace Tnb.ProductionMgr
_dictionaryDataService = dictionaryDataService; _dictionaryDataService = dictionaryDataService;
_runService = runService; _runService = runService;
_visualDevService = visualDevService; _visualDevService = visualDevService;
_organizeService = organizeService;
_db = _repository.AsSugarClient(); _db = _repository.AsSugarClient();
OverideFuncs.DeleteAsync = Delete; OverideFuncs.DeleteAsync = Delete;
OverideFuncs.GetListAsync = GetList; OverideFuncs.GetListAsync = GetList;
@@ -3384,8 +3388,13 @@ namespace Tnb.ProductionMgr
{ {
throw Oops.Bah("工位错误"); throw Oops.Bah("工位错误");
} }
OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(station_id, DictConst.RegionCategoryWorklineCode);
if (workline==null)
{
throw Oops.Bah($"未找到该工位{station_id}的车间");
}
PrdMoTask? prdMoTask = await _db.Queryable<PrdMoTask>().Where(x => x.workstation_id == station_id && x.parent_id != null && x.mo_task_status == DictConst.InProgressEnCode).FirstAsync(); PrdMoTask? prdMoTask = await _db.Queryable<PrdMoTask>().Where(x => x.workline_id==workline.Id && x.parent_id != null && x.mo_task_status == DictConst.InProgressEnCode).FirstAsync();
if (prdMoTask != null) if (prdMoTask != null)
{ {
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == prdMoTask.material_id); BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == prdMoTask.material_id);
@@ -3552,9 +3561,8 @@ namespace Tnb.ProductionMgr
//TODO 之后要改 //TODO 之后要改
Dictionary<String, String> dic = new Dictionary<string, string>() Dictionary<String, String> dic = new Dictionary<string, string>()
{ {
["WBZ1"] = "30019971917589",//血路管自动生产线1线 ["WBZ1"] = WmsWareHouseConst.XUELUGUAN1XIAN,//血路管自动生产线1线
["WBZ2"] = "123", ["WBZ2"] = WmsWareHouseConst.XUELUGUAN2XIAN,
["WBZ3"] = "123",
}; };
if (dic.TryGetValue(input.result, out string worklineId)) if (dic.TryGetValue(input.result, out string worklineId))
{ {