林豪 左 3 лет назад
Родитель
Сommit
0035133f94
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      Projects/永冠OPP/WCS.Service/Works/Station/一楼出库.cs

+ 4 - 3
Projects/永冠OPP/WCS.Service/Works/Station/一楼出库.cs

@@ -51,7 +51,7 @@ namespace WCS.Service.Works.Station
 
                         task.STATUS = TaskStatus.执行中;
                         task.CreateStatusLog(db, $"状态由[{TaskStatus.堆垛机完成}]变更为[{task.STATUS}]-{obj.Entity.Code}", this.GetType());
-                        finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station.Entity.Create<StationDevice>()));
+                        finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station));
                     }
                     db.Default.SaveChanges();
                 });
@@ -60,7 +60,7 @@ namespace WCS.Service.Works.Station
                 {
                     foreach (var finish in finishTaskList)
                     {
-                        var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finish.FinishCode);
+                        var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == finish.FinishCode);
                         if (task == null) continue;
                         finish.Station.Data.Tasknum = task.ID;
                         finish.Station.Data.Goodsstart = obj.Entity.CODE.ToShort();
@@ -120,6 +120,7 @@ namespace WCS.Service.Works.Station
                         task.ENDTIME = System.DateTime.Now;
                         task.UPDATEUSER = "WCS";
                         task.CreateStatusLog(db, $"状态由[{TaskStatus.执行中}]变更为[{task.STATUS}]-{dev.FinishCode}", this.GetType());
+                        finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station));
                     }
                     db.Default.SaveChanges();
                 });
@@ -127,7 +128,7 @@ namespace WCS.Service.Works.Station
                 {
                     foreach (var finish in finishTaskList)
                     {
-                        var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finish.FinishCode);
+                        var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == finish.FinishCode);
                         finish.Station.Data.CmdType = IstationCmdType.月台出库口任务完成;
                         finish.Station.Data.VoucherNo++;
                     }