林豪 左 3 anos atrás
pai
commit
6535f9935f
1 arquivos alterados com 10 adições e 6 exclusões
  1. 10 6
      Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

+ 10 - 6
Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -69,12 +69,16 @@ namespace WCS.Service.Works.SRM
                 DB.Do(db =>
                 {
                     //找到两个任务
-                    var taksLsit = db.Default.Set<WCS_TASK>().Where(v => v.ID == srmDevice.Data.TaskID_1 || v.ID == srmDevice.Data.TaskID_2 && v.STATUS == TaskStatus.堆垛机执行).ToList()
-                        .Select(v => v.Create<Task>()).OrderBy(v => v.Col).ToArray();
+                    var taksLsit = db.Default.Set<WCS_TASK>().Where(v =>
+                        v.ID == srmDevice.Data.TaskID_1 ||
+                        v.ID == srmDevice.Data.TaskID_2 && v.STATUS == TaskStatus.堆垛机执行).ToList();
+                    var itemList = taksLsit.Select(v => v.Create<Task>()).OrderBy(v => v.Col).ToArray();
+
                     if (!taksLsit.Any()) return;
-                    for (var i = 0; i < taksLsit.Length; i++)
+                    for (var i = 0; i < itemList.Length; i++)
                     {
-                        var item = taksLsit[i];
+                        var item = itemList[i];
+                        item.SRMSTATION = taksLsit.FirstOrDefault(v => v.ID==item.ID).SRMSTATION;
 
                         var fork = srmDevice.GetFork(item, i);
 
@@ -82,11 +86,11 @@ namespace WCS.Service.Works.SRM
                         {
                             // 列数较小的放一工位
                             case SrmFork.货叉1:
-                                obj.WriteTask1(item, (short)taksLsit.Length);
+                                obj.WriteTask1(item, (short)itemList.Length);
                                 break;
                             //列数较大的放二工位
                             case SrmFork.货叉2:
-                                obj.WriteTask2(item, (short)taksLsit.Length);
+                                obj.WriteTask2(item, (short)itemList.Length);
                                 break;
 
                             default: