执行步骤添加

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -800,7 +800,15 @@ namespace WCS.Service.Extensions
                             throw new Exception($"[{Entity.CODE}]任务类型错误,{task.ID}");
                     }
 
-                    task.CreateStatusLog(db, $"堆垛机完成任务", this.GetType());
+                    if (task.TYPE == TaskType.出库)
+                    {
+                        task.CreateStatusLog(db, $"任务堆垛机完成", this.GetType());
+                    }
+                    else
+                    {
+                        task.CreateStatusLog(db, $"任务完成", this.GetType());
+                    }
+                    
                 }
                 db.Default.SaveChanges();
             });

Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

@@ -77,7 +77,7 @@ namespace WCS.Service.Works.RGV
 
                     foreach (var task in tasks)
                     {
-                        task.CreateStatusLog(db, "RGV开始执行", this.GetType());
+                        task.CreateStatusLog(db, $"任务下发给[RGV8],起始地址[{rgv.Data.StartPosition_1}],目标地址[{rgv.Data.DestPosition_1}]", this.GetType());
                     }
                     db.Default.SaveChanges();
                 });
@@ -174,7 +174,7 @@ namespace WCS.Service.Works.RGV
                             {
                                 foreach (var task in tasks)
                                 {
-                                    task.CreateStatusLog(db, $"取货任务下达至{rgvDevice.Entity.CODE}", this.GetType());
+                                    task.CreateStatusLog(db, $"任务下发给[{rgvDevice.Entity.CODE}],起始地址[{pickStation.Entity.CODE}],目标地址[{task.ADDRNEXT}]", this.GetType());
                                 }
                                 db.Default.SaveChanges();
                             });
@@ -370,8 +370,9 @@ namespace WCS.Service.Works.RGV
 
                                 foreach (var task in tasks)
                                 {
-                                    task.CreateStatusLog(db, $"取货任务下达至{obj.Entity.CODE}", this.GetType());
+                                    task.CreateStatusLog(db, $"任务下发给[{obj.Entity.CODE}],起点地址[{pickStation.Entity.CODE}],目标地址[G12]", this.GetType());                                 
                                 }
+                                db.Default.SaveChanges();
                             });
                             return;
                         }
@@ -519,7 +520,8 @@ namespace WCS.Service.Works.RGV
                                         task1.TaskGroupKey = res.WMSTaskGroupKey;
                                         task1.ADDRTO = task1.DEVICE;
 
-                                        var msg = $"下达从G12移动至{tunnelInfo.taskIN.CODE}的PLC指令。同时将任务分配至[{task1.TUNNEL}]-[{task1.DEVICE}]";
+                                        //var msg = $"下达从G12移动至{tunnelInfo.taskIN.CODE}的PLC指令。同时将任务分配至[{task1.TUNNEL}]-[{task1.DEVICE}]";
+                                        var msg = $"任务下发给[{obj.Entity.CODE}],起始地址[G12],目标地址[{tunnelInfo.taskIN.CODE}],分配巷道[{task1.TUNNEL}]";
                                         task1.CreateStatusLog(db, msg, this.GetType());
                                     }
                                     db.Default.SaveChanges();

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

@@ -381,7 +381,7 @@ namespace WCS.Service.Works.SRM
                             var fork = srmDevice.GetFork(item, i);
                             var msg = "";
                             msg = fork == SrmFork.货叉1 ? $"状态由[{oldTaskStatus}]变更为[{task.STATUS}]" : $"状态由[{oldTaskStatus}]变更为[{task.STATUS}]";
-                            task.CreateStatusLog(db, msg, this.GetType());
+                            task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRTO}]", this.GetType());
                             finishTaskList.Add(new FinishTaskList<SrmFork, Task>(fork, item));
                         }
 
@@ -510,7 +510,7 @@ namespace WCS.Service.Works.SRM
                             task.ADDRTO = $"{loc.Row}-{loc.Colomn}-{loc.Layer}";
                             task.DEVICE = deviceCode;
                             task.TUNNEL = tunnel;
-                            task.CreateStatusLog(db, $"堆垛机开始执行入库任务", this.GetType());
+                            task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{dev.Entity.CODE}],目标地址[{task.ADDRTO}]", this.GetType());
                             finishTaskList.Add(new FinishTaskList<int>(task.ID, dev));
                         }
                         db.Default.SaveChanges();
@@ -694,7 +694,7 @@ namespace WCS.Service.Works.SRM
                                         //获取站台及下一个地址
                                         task.GetSrmStationAndaddNext(fork);
 
-                                        task.CreateStatusLog(db, "堆垛机开始执行出库任务", this.GetType());
+                                        task.CreateStatusLog(db, $"任务下发堆垛机执行,起点地址[{task.ADDRFROM}],目标地址[{task.SRMSTATION}]", this.GetType());
                                         item.SRMSTATION = task.SRMSTATION;
                                         finishTaskList.Add(new FinishTaskList<SrmFork, Task>(fork, item));
                                     }

Projects/永冠OPP/WCS.Service/Works/Station/BOPP入库.cs

@@ -99,7 +99,10 @@ namespace WCS.Service.Works.Station
                         finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                         finishTask.Station.Data.CmdType = IstationCmdType.扫码入库;
                         finishTask.Station.Data.VoucherNo++;
+
+                        task.CreateStatusLog(db, $"任务已下发给输送机[{task.ADDRFROM}]执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRNEXT}]", this.GetType());
                     }
+                    db.Default.SaveChanges();
                 });
             });
         }
@@ -256,8 +259,9 @@ namespace WCS.Service.Works.Station
                         task.ADDRNEXT = dev.Entity.GetPath(task.DEVICE).CODE;
                         task.TaskGroupKey = res.WMSTaskGroupKey;
                         task.ADDRTO = task.DEVICE;
-                        var msg = $"下达从{stationDeviceGroup.Entity.CODE}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
-                        msg += $"[{dev.Data.Tasknum}][{stationDeviceGroup.Entity.CODE}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
+                        //var msg = $"下达从{stationDeviceGroup.Entity.CODE}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
+                        //msg += $"[{dev.Data.Tasknum}][{stationDeviceGroup.Entity.CODE}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
+                        var msg = $"任务二次分配巷道[{task.TUNNEL}]";
                         task.CreateStatusLog(db, msg, GetType());
                         finishTaskList.Add(new FinishTaskList<int>(task.ID, item.Station));
                     }

Projects/永冠OPP/WCS.Service/Works/Station/一楼入库.cs

@@ -89,7 +89,10 @@ namespace WCS.Service.Works.Station
                             finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                             finishTask.Station.Data.CmdType = IstationCmdType.扫码入库;
                             finishTask.Station.Data.VoucherNo++;
+
+                            task.CreateStatusLog(db, $"任务已下发给输送机[{task.ADDRFROM}]执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRNEXT}]", this.GetType());
                         }
+                        db.Default.SaveChanges();
                     });
                     if (finishTaskList.Any())
                     {
@@ -186,7 +189,7 @@ namespace WCS.Service.Works.Station
                         task.ADDRNEXT = tunnelInfo.taskIN.CODE;
                         task.TaskGroupKey = res.WMSTaskGroupKey;
                         task.ADDRTO = task.DEVICE;
-                        task.CreateStatusLog(db, $"一次分配至堆垛机{task.DEVICE}", this.GetType());
+                        task.CreateStatusLog(db, $"任务一次分配巷道[{tunnelInfo.Tunnel.CODE}]", this.GetType());
                         finishTaskList.Add(new FinishTaskList<int>(task.ID, item.Entity.Create<StationDevice>()));
                     }
 
@@ -285,7 +288,7 @@ namespace WCS.Service.Works.Station
                         task.ADDRNEXT = tunnelInfo.taskIN.CODE;
                         task.TaskGroupKey = res.WMSTaskGroupKey;
                         task.ADDRTO = task.DEVICE;
-                        task.CreateStatusLog(db, $"二次分配至堆垛机{task.TUNNEL}", this.GetType());
+                        task.CreateStatusLog(db, $"任务二次分配巷道[{tunnelInfo.Tunnel.CODE}]", this.GetType());
                         finishTaskList.Add(new FinishTaskList<int>(task.ID, dev));
                     }
                     db.Default.SaveChanges();

Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -323,14 +323,17 @@ namespace WCS.Service.Works.Station
                     foreach (var finishTask in finishTaskList)
                     {
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finishTask.FinishCode);
-                        if (task == null) continue;
+                        if (task == null) continue;                       
                         finishTask.Station.Data.Tasknum = task.ID;
                         finishTask.Station.Data.Goodsstart = task.ADDRFROM.ToShort();
                         finishTask.Station.Data.Goodsend = task.ADDRNEXT.ToShort();
                         finishTask.Station.Data.Goodsnum = (short)finishTaskList.Count;
                         finishTask.Station.Data.CmdType = IstationCmdType.扫码入库;
                         finishTask.Station.Data.VoucherNo++;
+
+                        task.CreateStatusLog(db, $"任务已下发给输送机[{task.ADDRFROM}]执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRNEXT}]", this.GetType());
                     }
+                    db.Default.SaveChanges();
                 });
             });
         }
@@ -436,7 +439,7 @@ namespace WCS.Service.Works.Station
                             task.ADDRNEXT = tunnelInfo.taskIN.CODE;
                             task.TaskGroupKey = res.WMSTaskGroupKey;
                             task.ADDRTO = task.DEVICE;
-                            task.CreateStatusLog(db, $"一次分配至堆垛机{task.DEVICE}", this.GetType());
+                            task.CreateStatusLog(db, $"任务一次分配巷道[{tunnelInfo.Tunnel.CODE}]", this.GetType());
                             finishTaskList.Add(new FinishTaskList<int>(task.ID, dev));
                         }
                         db.Default.SaveChanges();
@@ -558,7 +561,7 @@ namespace WCS.Service.Works.Station
                             task.TaskGroupKey = res.WMSTaskGroupKey;
                             task.ADDRTO = task.DEVICE;
 
-                            task.CreateStatusLog(db, $"二次分配至堆垛机{task.DEVICE}", this.GetType());
+                            task.CreateStatusLog(db, $"任务二次分配巷道[{tunnelInfo.Tunnel.CODE}]", this.GetType());
                             finishTaskList.Add(new FinishTaskList<int>(task.ID, dev));
                         }
                         db.Default.SaveChanges();

Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

@@ -57,7 +57,7 @@ namespace WCS.Service.Works.Station
                         if (tasks.Any(v => v.STATUS != TaskStatus.堆垛机完成 && v.STATUS != TaskStatus.执行中)) throw new WarnException("任务异常，同组任务状态不为堆垛机完成或执行中");
 
                         task.STATUS = TaskStatus.执行中;
-                        task.CreateStatusLog(db, $"堆垛机放货点分配目标地址{task.ADDRNEXT}", this.GetType());
+                        task.CreateStatusLog(db, $"堆垛机放货点分配目标地址[{task.ADDRNEXT}]", this.GetType());
                         finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station));
                     }
                     db.Default.SaveChanges();
@@ -67,12 +67,14 @@ namespace WCS.Service.Works.Station
                 {
                     foreach (var finish in finishTaskList)
                     {
-                        var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == finish.FinishCode);
+                        var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == finish.FinishCode);                        
                         if (task == null) continue;
+                        var count = db.Default.Set<WCS_TASK>().Where(v => v.TaskGroupKey == task.TaskGroupKey).Count();
+                        if (count > 2) continue;
                         finish.Station.Data.Tasknum = task.ID;
                         finish.Station.Data.Goodsstart = finish.Station.Entity.CODE.ToShort();
                         finish.Station.Data.Goodsend = task.ADDRNEXT.ToShort();
-                        finish.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
+                        finish.Station.Data.Goodsnum = count.ToShort();//finishTaskList.Count.ToShort();
                         finish.Station.Data.CmdType = IstationCmdType.堆垛机放货完成请求目标地址;
                         finish.Station.Data.VoucherNo++;
                     }
@@ -161,7 +163,7 @@ namespace WCS.Service.Works.Station
                             {
                                 task.ADDRNEXT = "G1";
                             }
-                            task.CreateStatusLog(db, $"涂布出库分配出库口{task.ADDRNEXT}", this.GetType());
+                            task.CreateStatusLog(db, $"涂布出库分配目标站台[{task.ADDRNEXT}]", this.GetType());
                             finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station));
                         }
                         db.Default.SaveChanges();
@@ -577,6 +579,8 @@ namespace WCS.Service.Works.Station
                                      task.STATUS = WCS.Entity.TaskStatus.已完成;
                                      task.UPDATETIME = DateTime.Now;
                                      task.ENDTIME = DateTime.Now;
+
+                                     task.CreateStatusLog(db, $"任务完成", this.GetType());
                                  });
 
                          agvtask.Station = stationDeviceGroup.Entity.CODE;

Projects/永冠OPP/WCS.Service/Works/Station/连廊车间入库.cs

@@ -109,7 +109,10 @@ namespace WCS.Service.Works.Station
                         finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                         finishTask.Station.Data.CmdType = IstationCmdType.扫码入库;
                         finishTask.Station.Data.VoucherNo++;
+
+                        task.CreateStatusLog(db, $"任务已下发给输送机[{task.ADDRFROM}]执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRNEXT}]", this.GetType());
                     }
+                    db.Default.SaveChanges();
                 });
                 if (finishTaskList.Any())
                 {