merge

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -318,7 +318,8 @@ namespace WCS.Service.Works.SRM
                     {
                         var item = tasks[i];
                         var task = db.Default.Set<WCS_TASK>().Find(item.ID);
-
+                        //找到所有可用到达目的地的取货点，必定是一个设备组
+                        var a = Device.Where(v => v.ROUTES.Any(p => p.NEXT.CODE == task.ADDRTO));
                         var oldTaskSTATUS = task.STATUS;
                         task.STARTTIME = DateTime.Now;
                         task.UPDATETIME = DateTime.Now;
@@ -327,19 +328,14 @@ namespace WCS.Service.Works.SRM
                         //获取到站台的下一个地址
                         if (Device.Find(task.SRMSTATION).ROUTES.Any(v => v.NEXT == dev1.Entity)) task.ADDRNEXT = dev1.Entity.CODE;
                         else task.ADDRNEXT = dev2.Entity.CODE;
-
                         db.Default.SaveChanges();
                         Uploader.Upload(db);
+                        var msg = "";
                         if (item.Col.OddNumberOrEven())
-                        {
-                            var msg = $"状态由[{oldTaskSTATUS}]变更为[{task.STATUS}][{obj.Data.SLine_1}-{obj.Data.SCol_1}-{obj.Data.SLayer_1}][{obj.Data.ELine_1}][{obj.Data.VoucherNo_1}]";
-                            task.CreateStatusLog(db, msg, this.GetType());
-                        }
+                            msg = $"状态由[{oldTaskSTATUS}]变更为[{task.STATUS}][{obj.Data.SLine_1}-{obj.Data.SCol_1}-{obj.Data.SLayer_1}][{obj.Data.ELine_1}][{obj.Data.VoucherNo_1}]";
                         else
-                        {
-                            var msg = $"状态由[{oldTaskSTATUS}]变更为[{task.STATUS}][{obj.Data.SLine_2}-{obj.Data.SCol_2}-{obj.Data.SLayer_2}][{obj.Data.ELine_2}][{obj.Data.VoucherNo_2}]";
-                            task.CreateStatusLog(db, msg, this.GetType());
-                        }
+                            msg = $"状态由[{oldTaskSTATUS}]变更为[{task.STATUS}][{obj.Data.SLine_2}-{obj.Data.SCol_2}-{obj.Data.SLayer_2}][{obj.Data.ELine_2}][{obj.Data.VoucherNo_2}]";
+                        task.CreateStatusLog(db, msg, this.GetType());
 
                         //判断当前任务为二工位还是一工位
                         if (item.Col.OddNumberOrEven())
@@ -349,7 +345,7 @@ namespace WCS.Service.Works.SRM
                             obj.Data.SLine_1 = item.Line;
                             obj.Data.SCol_1 = item.Col;
                             obj.Data.SLayer_1 = item.Layer;
-                            obj.Data.ELine_1 = item.SRMSTATION.ToShort();
+                            obj.Data.ELine_1 = task.SRMSTATION.ToShort();
                             obj.Data.ECol_1 = 0;
                             obj.Data.ELayer_1 = 0;
                             obj.Data.VoucherNo_1++;