Merge branch 'master' of http://120.77.11.229:3000/zuolinhao/ZT-CP-WCS

成品库/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -112,7 +112,7 @@ namespace WCS.WorkEngineering.Systems
                                                     break;
                                             }
                                         }
-                                        else if (task.AddrTo == "8088" || task.AddrTo == "8094")
+                                        else if (task.AddrTo == "8088" || task.AddrTo == "8094" || task.AddrTo == "8313")
                                         {
                                             putStation = "8045";
                                         }

成品库/WCS.WorkEngineering/Systems/库尾贴标.cs

@@ -99,12 +99,13 @@ namespace WCS.WorkEngineering.Systems
                     obj.Data.TaskNumber = taskInfo.ID;
                     obj.Data.GoodsEnd = obj.Entity.Code.ToShort();
                     obj.Data.VoucherNo++;
+                    World.Log($"id{taskInfo.ID},end{obj.Entity.Code.ToShort()},voucherno{obj.Data.VoucherNo}");
                     //是否启用贴标机
                     var isUse = db.Default.Ado.SqlQuery<string>("SELECT  scontent FROM [WMS_ZT_01CP].[dbo].[sys_config]  where  code = 'LabellerEnabled'").First();
 
                     if (!string.IsNullOrEmpty(isUse) && isUse == "0")
                     {
-                       
+                        World.Log("贴标机已禁用");
                     }
                     //跟贴标机交互
                     else{
@@ -129,6 +130,7 @@ namespace WCS.WorkEngineering.Systems
                         }
                         Send(data);
                     }
+                    World.Log($"贴标机是否禁用{isUse}");
                 }
                 taskInfo.Status = Entity.TaskStatus.Finish;
                 taskInfo.EditTime = DateTime.Now;

成品库/WCS.WorkEngineering/Systems/装箱区呼叫空托盘组及隔板.cs

@@ -35,11 +35,15 @@ namespace WCS.WorkEngineering.Systems
 
         public override void Do(Device<IStation520, IStation521, IStation523> obj)
         {
+
+            
+            World.Log($"设备号{obj.Entity.Code}PH_Status{obj.Data3.Status.HasFlag(StationStatus.PH_Status)}-Run{obj.Data3.Status.HasFlag(StationStatus.Run)}-OT_Status{obj.Data3.Status.HasFlag(StationStatus.OT_Status)}-UnassignedTask{obj.Data3.Status.HasFlag(StationStatus.UnassignedTask)}-Auto{obj.Data3.Status.HasFlag(StationStatus.Auto)}");
+         
             if (!obj.Data3.Status.HasFlag(StationStatus.PH_Status) //无光电
                                                 && !obj.Data3.Status.HasFlag(StationStatus.Run) //未运行
                                                 && !obj.Data3.Status.HasFlag(StationStatus.OT_Status) //无任务
-                                                && !obj.Data3.Status.HasFlag(StationStatus.UnassignedTask) //未分配任务
-                                                && obj.Data3.Status.HasFlag(StationStatus.Auto))//自动
+                                                && !obj.Data3.Status.HasFlag(StationStatus.UnassignedTask)) //未分配任务
+                                                //&& obj.Data3.Status.HasFlag(StationStatus.Auto))//自动
             {
                 SqlSugarHelper.Do(_db =>
                 {

成品库/WCS.WorkEngineering/Systems/装箱区码垛工位任务处理.cs

@@ -34,6 +34,11 @@ namespace WCS.WorkEngineering.Systems
             {
                 //找到对应任务
                 var taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber);
+                if (obj.Entity.Code == "8307")
+                {
+                    World.Log($"{obj.Entity.Code}id{obj.Data2.TaskNumber}");
+                }
+                
                 if (taskInfo != null && taskInfo.AddrTo == obj.Entity.Code && taskInfo.Status != Entity.TaskStatus.Finish)
                 {
                     taskInfo.Status = Entity.TaskStatus.Finish;

成品库/WCS.WorkEngineering/WorkStart.cs

@@ -40,8 +40,9 @@ namespace WCS.WorkEngineering
                 new StationSegmentInfo(8161, 8270, "10.30.43.93"),
                 new StationSegmentInfo(8001, 8160, "10.30.43.73"),
                 new StationSegmentInfo(8300, 8325, "10.30.43.73"),
+                //new StationSegmentInfo(8301, 8325, "10.30.43.73"),
             };
-
+            
             foreach (var item in segmentInfo)
             {
                 if (item.Start == 8300)
@@ -54,7 +55,7 @@ namespace WCS.WorkEngineering
                         conv.AddProtocol<IStation521>((i - 8001) * 16, 521, item.IP);
                         conv.AddProtocol<IStation523>((i - 8001) * 12, 523, item.IP);
                     }
-                }
+                }               
                 else
                 {
                     for (int i = item.Start; i <= item.End; i++)