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