Explorar o código

步骤描述;月台出库任务完成节点更改

Administrator %!s(int64=2) %!d(string=hai) anos
pai
achega
fff9ba7da7

BIN=BIN
DLL/PLC.Siemens.dll


+ 28 - 0
Projects/永冠/WCS.Service/Extensions/WCS_TaskExtensions.cs

@@ -40,5 +40,33 @@ namespace WCS.Service.Extensions
                 Console.WriteLine(e.Message);
             }
         }
+
+        public static void CreateStatusLog(this WCS_TASK task, DB db,string msg)
+        {
+            try
+            {
+                System.Reflection.MethodBase mb = new System.Diagnostics.StackTrace(true).GetFrame(1).GetMethod();
+                var node = $"{mb.DeclaringType.FullName}.{mb.Name}";
+                var oldStatus = task.STATUS;
+                if (task.STATUS > TaskStatus.新建) oldStatus = db.Default.Entry(task).OriginalValues.GetValue<TaskStatus>("STATUS");
+
+                WCS_StatusLog statusLog = new WCS_StatusLog()
+                {
+                    WCS_TASKID = task.ID,
+                    OldStatus = oldStatus,
+                    NewStatus = task.STATUS,
+                    UPDATETIME = DateTime.Now,
+                    upStatus = task.UPLOADED,
+                    Node = node,
+                    UPDATEUSER = msg
+                };
+                db.Default.Add(statusLog);
+                db.Default.SaveChanges();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+            }
+        }
     }
 }

+ 1 - 1
Projects/永冠/WCS.Service/Uploader.cs

@@ -41,7 +41,7 @@ namespace WCS.Service
                         {
                             WMS.UpdateTask(task.WMSTASK, (int)task.STATUS, task.ADDRNEXT);
                             task.UPLOADED = task.STATUS;
-                            task.CreateStatusLog(db);
+                            //task.CreateStatusLog(db);
                         }
                         catch (Exception ex)
                         {

+ 39 - 1
Projects/永冠/WCS.Service/Works/RGV/RGVWork.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 using WCS.Service.Helpers;
 
 namespace WCS.Service.Works
@@ -109,6 +110,8 @@ namespace WCS.Service.Works
                     dev.Data2.StartPosition = short.Parse(st.Entity.CODE);
                     dev.Data2.DestPosition = next.Code();
                     dev.Data2.Trigger = 1;
+
+                    task.CreateStatusLog(db, $"任务下发[{dev.Entity.CODE}]执行,起始地址[{st.Entity.CODE}],目标地址[{next.CODE}]");                  
                 });
             }
         }
@@ -247,12 +250,19 @@ namespace WCS.Service.Works
 
                 var next1 = dev.Entity.GetNext(validPickupPoint.Data.GOODSEND.ToString());
                 if (validPickupPoint.Entity.CODE is "2108" or "2114" or "3040" or "3034") //一工位取货点
-                {
+                {                                      
                     dev.Data2.TaskID_1 = validPickupPoint.Data.TASKNUM;//dev.Data.TaskID_1;
                     dev.Data2.TaskType_1 = Convert.ToInt16(DRGVTaskType.取货);
                     dev.Data2.StartPosition_1 = Convert.ToInt16(next1.CODE);
                     dev.Data2.DestPosition_1 = Convert.ToInt16(validPickupPoint.Entity.CODE);
                     dev.Data2.Trigger_1 = 1;
+
+                    DB.Do(db =>
+                    {
+                        var task = db.Default.Set<WCS_TASK>().Find(validPickupPoint.Data.TASKNUM);
+                        if (task != null)
+                            task.CreateStatusLog(db,$"任务下发给[{dev.Entity.CODE}]执行,起始地址[{validPickupPoint.Entity.CODE}],目标地址[{next1.CODE}]");
+                    });
                 }
                 else if (validPickupPoint.Entity.CODE is "3046" or "3041" or "3033") //二工位取货点
                 {
@@ -261,6 +271,13 @@ namespace WCS.Service.Works
                     dev.Data2.StartPosition_2 = Convert.ToInt16(next1.CODE);
                     dev.Data2.DestPosition_2 = Convert.ToInt16(validPickupPoint.Entity.CODE);
                     dev.Data2.Trigger_2 = 1;
+
+                    DB.Do(db =>
+                    {
+                        var task = db.Default.Set<WCS_TASK>().Find(validPickupPoint.Data.TASKNUM);
+                        if (task != null)
+                            task.CreateStatusLog(db, $"任务下发给[{dev.Entity.CODE}]执行,起始地址[{validPickupPoint.Entity.CODE}],目标地址[{next1.CODE}]");                  
+                    });
                 }
 
                 #endregion 取货任务
@@ -419,6 +436,13 @@ namespace WCS.Service.Works
                         dev.Data2.StartPosition_1 = Convert.ToInt16(next1.CODE);
                         dev.Data2.DestPosition_1 = Convert.ToInt16(validPickupPoint.Entity.CODE);
                         dev.Data2.Trigger_1 = 1;
+
+                        DB.Do(db =>
+                        {
+                            var task = db.Default.Set<WCS_TASK>().Find(validPickupPoint.Data.TASKNUM);
+                            if (task != null)
+                                task.CreateStatusLog(db, $"任务下发给[{dev.Entity.CODE}]执行,起始地址[{validPickupPoint.Entity.CODE}],目标地址[{next1.CODE}]");
+                        });
                     }
                     else if (validPickupPoint.Entity.CODE is  "3041" or "3033") //二工位取货点
                     {
@@ -427,6 +451,13 @@ namespace WCS.Service.Works
                         dev.Data2.StartPosition_2 = Convert.ToInt16(next1.CODE);
                         dev.Data2.DestPosition_2 = Convert.ToInt16(validPickupPoint.Entity.CODE);
                         dev.Data2.Trigger_2 = 1;
+
+                        DB.Do(db =>
+                        {
+                            var task = db.Default.Set<WCS_TASK>().Find(validPickupPoint.Data.TASKNUM);
+                            if (task != null)
+                                task.CreateStatusLog(db, $"任务下发给[{dev.Entity.CODE}]执行,起始地址[{validPickupPoint.Entity.CODE}],目标地址[{next1.CODE}]");
+                        });
                     }
 
                     #endregion 取货任务
@@ -838,6 +869,13 @@ namespace WCS.Service.Works
                     dev.Data2.StartPosition = Convert.ToInt16(validPickupPoint.Entity.CODE);
                     dev.Data2.DestPosition = validPickupPoint.Data.GOODSEND;
                     dev.Data2.Trigger = 1;
+
+                    DB.Do(db =>
+                    {
+                        var task = db.Default.Set<WCS_TASK>().Find(validPickupPoint.Data.TASKNUM);
+                        if (task != null)
+                            task.CreateStatusLog(db, $"任务下发给[{dev.Entity.CODE}]执行,起始地址[{validPickupPoint.Entity.CODE}],目标地址[{validPickupPoint.Data.GOODSEND}]");
+                    });
                 }
                 
             }

+ 3 - 0
Projects/永冠/WCS.Service/Works/Robots/RobotWork.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 using WCS.Service.Helpers;
 
 namespace WCS.Service.Works.Robots
@@ -60,6 +61,8 @@ namespace WCS.Service.Works.Robots
                     task.UPDATETIME = DateTime.Now;
                     task.UPDATEUSER = "WCS";
                     task.GROUPTASK = taskPallet.ID;
+
+                    task.CreateStatusLog(db, $"任务完成");
                     //task.ADDRCURRENT = fTarget.Entity.CODE;
                     db.Default.SaveChanges();
 

+ 23 - 7
Projects/永冠/WCS.Service/Works/SC/SCWork.cs

@@ -115,7 +115,15 @@ namespace WCS.Service.Works
                     else throw new Exception($"[SRM{deviceCode.Substring(2)}]任务类型错误");
 
                     dev.Data2.FinishedACK = 1;
-                    task.CreateStatusLog(db);
+                    //task.CreateStatusLog(db);
+                    if (task.TYPE == TaskType.出库 && !(dev.Data.ELine >= 2275 && dev.Data.ELine <= 2280))
+                    {
+                        task.CreateStatusLog(db, "任务堆垛机完成");
+                    }
+                    else
+                    {
+                        task.CreateStatusLog(db, "任务完成");
+                    }
                 });
                 return;
             }
@@ -180,7 +188,7 @@ namespace WCS.Service.Works
 
                     task.TUNNEL = task.TUNNEL;
                     db.Default.SaveChanges();
-                    task.CreateStatusLog(db);
+                    task.CreateStatusLog(db,$"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRTO}]");
 
                     Uploader.Upload(db);
 
@@ -236,7 +244,7 @@ namespace WCS.Service.Works
                     db.Default.SaveChanges();
 
                     Uploader.Upload(db);
-                    task.CreateStatusLog(db);
+                    task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{st.Entity.CODE}],目标地址[{task.ADDRTO}]");
 
                     dev.Data2.TaskID = task.ID;
 
@@ -345,7 +353,7 @@ namespace WCS.Service.Works
                     task.UPDATETIME = DateTime.Now;
                     db.Default.SaveChanges();
                     Uploader.Upload(db);
-                    task.CreateStatusLog(db);
+                    task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.SCSTATION}]");
 
                     if (task.ADDRFROM.Split('-').Length != 3) throw new Exception($"[SRM{deviceCode.Substring(2)}]出库任务起始位置错误:{task.ADDRFROM}");
 
@@ -466,7 +474,14 @@ namespace WCS.Service.Works
                     else throw new Exception($"[SRM{deviceCode.Substring(2)}]任务类型错误");
 
                     dev.Data2.FinishedACK = 1;
-                    task.CreateStatusLog(db);
+                    if (task.TYPE == TaskType.出库 && !(dev.Data.ELine >= 2275 && dev.Data.ELine <= 2280))
+                    {
+                        task.CreateStatusLog(db, "任务堆垛机完成");
+                    }
+                    else
+                    {
+                        task.CreateStatusLog(db, "任务完成");
+                    }
                 });
                 LogHelper.AddWCS_EXCEPTION($"WCS变更[SRM{deviceCode.Substring(2)}]任务[{task.ID}]状态为[{task.STATUS}]");
                 return;
@@ -520,7 +535,7 @@ namespace WCS.Service.Works
 
                     task.TUNNEL = task.TUNNEL;
                     db.Default.SaveChanges();
-                    task.CreateStatusLog(db);
+                    task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRTO}]");
 
                     Uploader.Upload(db);
 
@@ -582,7 +597,7 @@ namespace WCS.Service.Works
                     db.Default.SaveChanges();
 
                     Uploader.Upload(db);
-                    task.CreateStatusLog(db);
+                    task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{st.Entity.CODE}],目标地址[{task.ADDRTO}]");
 
                     dev.Data2.TaskID = task.ID;
 
@@ -681,6 +696,7 @@ namespace WCS.Service.Works
                     task.UPDATETIME = DateTime.Now;
                     db.Default.SaveChanges();
                     Uploader.Upload(db);
+                    task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.SCSTATION}]");
 
                     if (task.ADDRFROM.Split('-').Length != 3) throw new Exception($"[SRM{deviceCode.Substring(2)}]出库任务起始位置错误:" + task.ADDRFROM);
 

+ 6 - 3
Projects/永冠/WCS.Service/Works/Stations/22车间.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 using WCS.Service.Helpers;
 
 namespace WCS.Service.Works.Stations
@@ -74,15 +75,15 @@ namespace WCS.Service.Works.Stations
                 task.UPDATETIME = DateTime.Now;
                 task.FLOOR = 2;
                 task.HEIGHT = dev.Data.HEIGHT;
-                task.ADDRNEXT = nextcode.ToString();
-
+                task.ADDRNEXT = nextcode.ToString();               
                 db.Default.Set<WCS_TASK>().Add(task);
                 db.Default.SaveChanges();
-
+                
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.GOODSTYPE = 1;
                 dev.Data2.GOODSEND = nextcode;
                 dev.Data2.CONFIRM = true;
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{nextcode}]");
             });
         }
 
@@ -162,6 +163,7 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.GOODSEND = next.Code();
                 dev.Data2.GOODSTYPE = 1;
                 dev.Data2.CONFIRM = true;
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{next.CODE}]");
             });
         }
 
@@ -198,6 +200,7 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.GOODSEND = 3001;
                 dev.Data2.CONFIRM = true;
                 db.Default.SaveChanges();
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{3001}]");
             });
         }
 

+ 2 - 0
Projects/永冠/WCS.Service/Works/Stations/AGV交互.cs

@@ -514,6 +514,8 @@ namespace WCS.Service.Works.Stations
                     task.UPDATETIME = DateTime.Now;
                     task.ENDTIME = DateTime.Now;
 
+                    task.CreateStatusLog(db,"任务完成");
+
                     agvtask.Status = AGVTaskStatus.执行;
                     agvtask.UpdateTime = DateTime.Now;
                     db.Default.SaveChanges();

+ 2 - 0
Projects/永冠/WCS.Service/Works/Stations/RGV放货.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 
 namespace WCS.Service.Works.Stations
 {
@@ -59,6 +60,7 @@ namespace WCS.Service.Works.Stations
                     task.STATUS = WCS.Entity.TaskStatus.已完成;
                     task.UPDATETIME = DateTime.Now;
                     task.ENDTIME = DateTime.Now;
+                    task.CreateStatusLog(db, "输送任务完成");
                     db.Default.SaveChanges();
                 }
 

+ 3 - 0
Projects/永冠/WCS.Service/Works/Stations/人工入库.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 
 namespace WCS.Service.Works.Stations
 {
@@ -58,6 +59,8 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.GOODSEND = s2187.Entity.Code();
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.CONFIRM = true;
+
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{2187}]");
             });
         }
     }

+ 2 - 0
Projects/永冠/WCS.Service/Works/Stations/原膜入库.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 
 namespace WCS.Service.Works.Stations
 {
@@ -46,6 +47,7 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.GOODSEND = dev.Entity.Code();
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.CONFIRM = true;
+                //task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{nextcode}]");
             });
         }
     }

+ 40 - 1
Projects/永冠/WCS.Service/Works/Stations/堆垛机放货.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 
 namespace WCS.Service.Works.Stations
 {
@@ -55,7 +56,8 @@ namespace WCS.Service.Works.Stations
                 }
                 if (Ltc.Do(task, task => task.WMSTASK > 0))
                 {
-                    if (task.PALLETTYPE == 0 && task.AgvTask == 0 && task.STATUS < WCS.Entity.TaskStatus.已完成 && task.ADDRTO != "3001")
+                    if (task.PALLETTYPE == 0 && task.AgvTask == 0 && task.STATUS < WCS.Entity.TaskStatus.已完成 && !(task.ADDRTO == "3001" || task.ADDRTO == "2260"
+                    || task.ADDRTO == "2262" || task.ADDRTO == "2264"))
                     {
                         task.STATUS = WCS.Entity.TaskStatus.已完成;
                         task.UPDATETIME = DateTime.Now;
@@ -70,4 +72,41 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.CONFIRM = true;
         }
     }
+
+    [WorkTitle(typeof(ProductHandler), "月台任务完成", true)]
+    class 月台任务完成 : DeviceWork<Device<IStation521, IStation520>>
+    {
+        protected override bool SelectDevice(WCS_DEVICE dev)
+        {
+            return "2260,2262,2264".Split(',').Contains(dev.CODE);
+        }
+
+        protected override void Do(Device<IStation521, IStation520> dev)
+        {          
+            if (Ltc.Do(dev, v => v.Data.PH_STATUS == false))
+                return;
+
+            if (Ltc.Do(dev, v => v.Data.TASKNUM  < 10000))
+                return;
+
+            DB.Do(db =>
+            {
+                var task = db.Default.Set<WCS_TASK>().Find(dev.Data.TASKNUM);
+                if (task == null)
+                    return;
+                if (Ltc.Do(task, task => task.TYPE != TaskType.出库))
+                    return;
+                if (Ltc.Do(task, task => task.STATUS == WCS.Entity.TaskStatus.已完成))
+                {
+                    return;
+                }
+                task.STATUS = WCS.Entity.TaskStatus.已完成;
+                task.UPDATETIME = DateTime.Now;
+                task.ENDTIME = DateTime.Now;
+                db.Default.SaveChanges();
+                Uploader.Upload(db);
+                task.CreateStatusLog(db, "任务完成");
+            });
+        }
+    }
 }

+ 9 - 3
Projects/永冠/WCS.Service/Works/Stations/成品车间.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 using WCS.Service.Helpers;
 
 namespace WCS.Service.Works.Stations
@@ -123,13 +124,14 @@ namespace WCS.Service.Works.Stations
                 task.DOCID = info.DocId;
                 //task.ADDRCURRENT = dev.Entity.CODE;
                 task.ADDRNEXT = nextcode.ToString();
-
-                db.Default.Set<WCS_TASK>().Add(task);
+                
+                db.Default.Set<WCS_TASK>().Add(task);               
                 db.Default.SaveChanges();
-
+               
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.GOODSEND = nextcode;
                 dev.Data2.CONFIRM = true;
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{nextcode}]");
             });
         }
 
@@ -238,6 +240,8 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.TASKNUM = dev.Data.TASKNUM;
                 dev.Data2.GOODSEND = next.Code();
                 dev.Data2.CONFIRM = true;
+
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{next.CODE}]");
             });
         }
 
@@ -297,6 +301,8 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.TASKNUM = dev.Data.TASKNUM;
                 dev.Data2.GOODSEND = addrto;
                 dev.Data2.CONFIRM = true;
+
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{addrto}]");
             });
         }
 

+ 5 - 1
Projects/永冠/WCS.Service/Works/Stations/拆子盘位.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 
 namespace WCS.Service.Works.Stations
 {
@@ -41,6 +42,8 @@ namespace WCS.Service.Works.Stations
                         {
                             task.STATUS = WCS.Entity.TaskStatus.已完成;
                             task.ENDTIME = DateTime.Now;
+
+                            task.CreateStatusLog(db, "任务完成");
                             //task.ADDRCURRENT = dev.Entity.CODE;
                             db.Default.SaveChanges();
                         }
@@ -163,13 +166,14 @@ namespace WCS.Service.Works.Stations
                             UPDATEUSER = "WCS",
                             DOCID = target.Data3.DocId,
                             //ADDRCURRENT = dev.Entity.CODE
-                        };
+                        };                        
                         db.Default.Set<WCS_TASK>().Add(task);
                         db.Default.SaveChanges();
 
                         dev.Data2.TASKNUM = task.ID;
                         dev.Data2.GOODSEND = target.Entity.Code();
                         dev.Data2.CONFIRM = true;
+                        task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{target.Entity.CODE}]");
                     });
                 }
             }

+ 4 - 0
Projects/永冠/WCS.Service/Works/Stations/拆母盘位.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 
 namespace WCS.Service.Works.Stations
 {
@@ -190,6 +191,7 @@ namespace WCS.Service.Works.Stations
                         dev.Data2.TASKNUM = task.ID;
                         dev.Data2.GOODSEND = target.Entity.Code();
                         dev.Data2.CONFIRM = true;
+                        task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{target.Entity.CODE}]");
                     });
                 }
             }
@@ -258,6 +260,8 @@ namespace WCS.Service.Works.Stations
                     {
                         task.STATUS = WCS.Entity.TaskStatus.已完成;
                         task.UPDATETIME = DateTime.Now;
+
+                        task.CreateStatusLog(db, "任务完成");
                         db.Default.SaveChanges();
                     }
                 });

+ 2 - 0
Projects/永冠/WCS.Service/Works/Stations/月台扫码.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 
 namespace WCS.Service.Works.Stations
 {
@@ -94,6 +95,7 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.GOODSEND = target.Entity.Code();
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.CONFIRM = true;
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{target.Entity.CODE}]");
             });
         }
     }

+ 3 - 0
Projects/永冠/WCS.Service/Works/Stations/组盘位.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 using WCS.Service.Helpers;
 
 namespace WCS.Service.Works.Stations
@@ -165,6 +166,8 @@ namespace WCS.Service.Works.Stations
                         dev.Data2.GOODSEND = 2187;
                         dev.Data2.GOODSTYPE = 99;
                         dev.Data2.CONFIRM = true;
+
+                        task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{2187}]");
                     });
                 }
                 else

+ 9 - 5
Projects/永冠/WCS.Service/Works/Stations/车间出入口.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using WCS.Core;
 using WCS.Entity;
 using WCS.Entity.Protocol;
+using WCS.Service.Extensions;
 using WCS.Service.Helpers;
 
 namespace WCS.Service.Works.Stations
@@ -88,7 +89,7 @@ namespace WCS.Service.Works.Stations
 
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.GOODSEND = next.Code();
-                dev.Data2.CONFIRM = true;
+                dev.Data2.CONFIRM = true;               
             });
         }
     }
@@ -164,6 +165,8 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.GOODSEND = next.Code();
                 dev.Data2.CONFIRM = true;
+
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{next.CODE}]");
             });
         }
     }
@@ -180,7 +183,7 @@ namespace WCS.Service.Works.Stations
         {
             if (!SystemConfigHelpers.GetDeviceConfig(dev.Entity.CODE)) throw new Exception($"已禁止[{dev.Entity.CODE}]入库,请联系机修确认");
 
-            if (dev.Entity.CODE == "2012")
+            if (dev.Entity.CODE == "2012" || dev.Entity.CODE == "2008")
             {
                 if (dev.Data.HEIGHT == 4 || dev.Data.HEIGHT == 8)
                 {
@@ -229,6 +232,7 @@ namespace WCS.Service.Works.Stations
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.GOODSEND = next.Code();
                 dev.Data2.CONFIRM = true;
+                task.CreateStatusLog(db, $"任务下发输送机[{dev.Entity.CODE}]执行,起始地址[{dev.Entity.CODE}],目标地址[{next.CODE}]");
             });
         }
     }
@@ -279,8 +283,8 @@ namespace WCS.Service.Works.Stations
                         end = 2086;
                     else if (dev.Entity.CODE == "2003")
                         end = 2308;
-                    else if(dev.Entity.CODE == "2010")
-                        end = short.Parse(task.ADDRFROM);
+                    //else if(dev.Entity.CODE == "2010")
+                    //    end = short.Parse(task.ADDRFROM);
                     task.STATUS = WCS.Entity.TaskStatus.已取消;
                     task.UPDATETIME = DateTime.Now;
                     db.Default.SaveChanges();
@@ -288,7 +292,7 @@ namespace WCS.Service.Works.Stations
 
                 dev.Data2.TASKNUM = task.ID;
                 dev.Data2.GOODSEND = end;
-                dev.Data2.CONFIRM = true;
+                dev.Data2.CONFIRM = true;              
             });
         }
     }

BIN=BIN
美纹客户端Debug.zip