bug修改、出库拣选循环执行

liufu
1 parent 8227adb6
Showing 7 changed files with 43 additions and 88 deletions
HHWCS.Dao/Bll.cs
HHWCS.Model/DeviceEntity.cs
HHWCSHost/App.config
HHWCSHost/Controls/StockerInfo.xaml
HHWCSHost/Controls/StockerInfo.xaml.cs
HHWCSHost/SysData.txt
HHWCSHost/View/Frm_Main.xaml.cs
@@ -18,7 +18,7 @@ namespace HHWCS.Bll
             //string str = "";
             //for (int i = 1; i < 3; i++)
             //{
-            //    for (int j = 1; j < 17; j++)
+            //    for (int j = 1; j < 33; j++)
             //    {
             //        for (int k = 1; k < 6; k++)
             //        {
@@ -61,7 +61,7 @@ namespace HHWCS.Bll
         {
             try
             {
-                string sql = $"update task set isBoubleIn = {flag},secondDestinationLocation = '{location}' WHERE id = {taskId}";
+                string sql = $"update task set isDoubleIn = {flag},secondDestinationLocation = '{location}' WHERE id = {taskId}";
                 int i = MySqlHelper.ExecuteNonQuery(AppCommon.ConnectionString, sql);
                 if (i == 0)
                 {
@@ -104,7 +104,7 @@ namespace HHWCS.Bll
                 {
                     sql += " and created<='" + endTime.ToString() + "'";
                 }
-                sql += " ORDER BY lastUpdated desc";
+                sql += " ORDER BY lastUpdated ";
                 DataSet ds = MySqlHelper.ExecuteDataset(AppCommon.ConnectionString, sql);
                 if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
@@ -464,7 +464,7 @@ namespace HHWCS.Bll
                         Bll.SetLocationPallet(location.Code, task.ContainerCode);
                     }
                     //更新任务状态
-                    Bll.SetTaskStatus(task.Id, 40);
+                    Bll.SetTaskStatus(task.Id, 10);
                 }
                 if (task.Type == 300 || task.Type == 600)
                 {
@@ -623,7 +623,8 @@ namespace HHWCS.Bll
                     Enable = Convert.ToBoolean(t["enable"]),
                     DeviceTypeId = (int)t["deviceTypeId"],
                     Roadway = t["roadway"] is DBNull ? -1 : Convert.ToInt32(t["roadway"]),
-                    SelfAddress = t["selfAddress"] is DBNull ? -1 : Convert.ToInt32(t["selfAddress"])
+                    SelfAddress = t["selfAddress"] is DBNull ? -1 : Convert.ToInt32(t["selfAddress"]),
+                    BackAddress = t["backAddress"] is DBNull ? null: t["backAddress"].ToString()
                 }).ToList();
                 return BllResultFactory.Sucess<List<DeviceEntity>>(list, "成功");
@@ -1061,11 +1062,11 @@ namespace HHWCS.Bll
         /// <param name="v"></param>
         /// <param name="task"></param>
         /// <returns></returns>
-        public static BllResult EmptyOutHandle(string v, TaskEntity task)
+        public static BllResult EmptyOutHandle(string v,string status, TaskEntity task)
         {
             try
             {
-                string sql = $"UPDATE task set isEmptyOut ={v}  where id = {task.Id}";
+                string sql = $"UPDATE task set isEmptyOut ={v} ,status = {status}  where id = {task.Id}";
                 int i = MySqlHelper.ExecuteNonQuery(AppCommon.ConnectionString, sql);
                 if (i == 0)
                 {
@@ -34,5 +34,10 @@ namespace HHWCS.Model
         {
             return this.Code+" "+this.Name;
         }
+
+        /// <summary>
+        /// 托盘回退地址
+        /// </summary>
+        public string BackAddress { get; set; }
     }
 }
@@ -4,7 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
   <connectionStrings>
-    <add name="MySql" connectionString="server=172.16.29.40;user id=root;password=hhsoftware;persistsecurityinfo=True;database=hhwcs;SslMode=none"/>
+    <add name="MySql" connectionString="server=127.0.0.1;user id=root;password=123456;persistsecurityinfo=True;database=hhwcs;SslMode=none"/>
   </connectionStrings>
   <appSettings>
     <add key="OPCServerIP" value="192.168.10.100"/>
@@ -48,7 +48,7 @@
         <TextBlock Style="{DynamicResource txtBlockStyle}"  Grid.Row="1" Grid.Column="0" TextWrapping="Wrap" Text="任务校验" />
         <TextBlock Style="{DynamicResource txtBlockStyle}"  Grid.Row="1" Grid.Column="2" TextWrapping="Wrap" Text="工作模式" />
         <TextBlock Style="{DynamicResource txtBlockStyle}"  Grid.Row="1" Grid.Column="4" TextWrapping="Wrap" Text="操作模式" />
-        <TextBlock Style="{DynamicResource txtBlockStyle}"  Grid.Row="2" Grid.Column="0" TextWrapping="Wrap" Text="工作状态" />
+        <TextBlock Style="{DynamicResource txtBlockStyle}"  Grid.Row="2" Grid.Column="0" TextWrapping="Wrap" Text="出入执行标记" />
         <TextBlock Style="{DynamicResource txtBlockStyle}"  Grid.Row="2" Grid.Column="2" TextWrapping="Wrap" Text="任务标志" />
         <TextBlock Style="{DynamicResource txtBlockStyle}"  Grid.Row="2" Grid.Column="4" TextWrapping="Wrap" Text="任务号1" />
         <TextBlock Style="{DynamicResource txtBlockStyle}"  Grid.Row="3" Grid.Column="0" TextWrapping="Wrap" Text="任务号2" />
@@ -140,13 +140,13 @@ namespace HHWCSHost.Controls
                         lab_WorkStatus.Content = "出库";
                         break;
                     case "3":
-                        lab_WorkStatus.Content = "拣选";
+                        lab_WorkStatus.Content = "转库"; //"拣选";
                         break;
                     case "4":
                         lab_WorkStatus.Content = "转库";
                         break;
                     case "5":
-                        lab_WorkStatus.Content = "双重入库";
+                        lab_WorkStatus.Content = "不可用"; //"双重入库";
                         break;
                     case "6":
                         lab_WorkStatus.Content = "回库台位(入库准备)";
@@ -253,7 +253,7 @@ namespace HHWCSHost.Controls
                 var a = (TextBlock)list_Alarm.Items[i];
                 if (a.Text.Contains(v))
                 {
-                    list_Alarm.Items.Remove(i);
+                    list_Alarm.Items.Remove(list_Alarm.Items[i]);
                 }
             }
         }
@@ -58,3 +58,5 @@ disable	禁用
 1.当条码不识别或外形检测不通过时，电气程序自动退回托盘到入库口；
 2.当请求时的条码无对应任务或任务状态不对时，wcs给出回退的回复，即将去向地址写成入库口即可；
+货架1到2层可以承重，其他不能承重，需要区别；(没有实现)
+
@@ -125,7 +125,7 @@ namespace HHWCSHost.View
             var stockers = FindDevByType("stocker").Data;
             foreach (var item in stockers)
             {
-                StockerMonitor stockerMonitor = new StockerMonitor(16, false, false, 1200, 100)
+                StockerMonitor stockerMonitor = new StockerMonitor(32, false, false, 1200, 100)
                 {
                     ControlName = item.Name,
                     Name = item.Code
@@ -138,6 +138,7 @@ namespace HHWCSHost.View
                     Name = item.Code
                 };
                 stockerInfo.DoubleInEvent += this.DoubleInHandle;
+                stockerInfo.EmptyOutEvent += this.EmptyOutHandle;
                 panel_Bottom.Children.Add(stockerInfo);
             }
@@ -384,11 +385,6 @@ namespace HHWCSHost.View
                 }
                 #endregion
-                //AddLogToUI("线程" + Thread.CurrentThread.ManagedThreadId + "进入", 1);
-                //Thread.Sleep(5000);
-                //return;
-
-                //todo:完善主控时钟
                 #region 检查是否连接正常
                 if (PLC.GetConnStatus())
@@ -428,35 +424,6 @@ namespace HHWCSHost.View
                     AddLogToUI("读取地址数据失败，请尝试关闭连接后重新连接；", 2);
                     return;
                 }
-                //todo:测试值写入
-                {
-                    //var tempds = DeviceAddressEntities.FindAll(t => t.DeviceId == 4);
-                    ////var temp23 = WriteWCSStationDataAddress(tempds, "1", "6", "1", "0", "1001", "0", tempds.Find(t=>t.DevicePropCode=="Barcode").value, "1003", "0");
-
-
-                    //var a = DeviceAddressEntities.FindAll(t => t.DeviceId == 5);
-                    //var b = a.Find(t => t.DevicePropCode == "RunningStatus");
-                    //b.value = "False";
-                    //var c = a.Find(t => t.DevicePropCode == "PalletExist");
-                    //c.value = "True";
-                    //var d = a.Find(t => t.DevicePropCode == "PalletDestinationAddress");
-                    //d.value = "1003";
-                    //var g = a.Find(t => t.DevicePropCode == "ConveyorNo");
-                    //g.value = "1001";
-                    //var f = a.Find(t => t.DevicePropCode == "PalletBarcode");
-                    //f.value = "TP001";
-                    //var rt = WriteAddress(a);
-                    //if (rt.Success)
-                    //{
-                    //    //再读出来
-                    //    var rt2 = ReadAddress(a);
-                    //    AddLogToUI(rt2.Msg, 1);
-                    //}
-                    //else
-                    //{
-                    //    AddLogToUI("写入地址错误：" + rt.Msg, 2);
-                    //}
-                }
                 //日志
                 DeviceEntities.ForEach(item => DeviceAddressEntities.FindAll(t => t.DeviceId == item.Id).Join(DevicePropEntities.FindAll(t => t.DeviceTypeId == item.DeviceTypeId && t.IsMonitor == 1), t => t.DevicePropCode, a => a.Code, (a, b) => new { a, b }).Where(t => t.a.value != t.b.MonitorCompareValue).Select(t => t.b).ToList().ForEach(t => AddLogToUI("报警：" + t.Name + " 信息：" + t.MonitorFailure, 2)));
@@ -488,27 +455,6 @@ namespace HHWCSHost.View
                         var stockerMonitor = (StockerMonitor)panel_Stocker.FindName(item.Code);
                         stockerMonitor.SetProp(addressEntities);
                     }
-                    //foreach (var item in FindDevByType("stationForStockerIn").Data)
-                    //{
-                    //    var s = this.FindName(item.Code);
-                    //    var address = DeviceAddressEntities.FindAll(t => t.DeviceId == item.Id);
-                    //    if (s is StationH stationH)
-                    //    {
-
-                    //    }
-                    //    else if (s is StationV stationV)
-                    //    {
-
-                    //    }
-                    //}
-                    //foreach (var item in FindDevByType("stationForStockerOut").Data)
-                    //{
-
-                    //}
-                    //foreach (var item in FindDevByType("station").Data)
-                    //{
-
-                    //}
                     foreach (var item in FindDevByType("conveyor").Data)
                     {
                         var cv = this.FindName(item.Code);
@@ -542,12 +488,6 @@ namespace HHWCSHost.View
                     //同巷道内的移库，当堆垛机状态为0,1,2时，均可以响应巷道内的移库
                     ExcuteTaskTransferInRoadway(stockers);
-
-                    //响应任务校验为2时，重新写入任务
-                    //响应双重入库处理
-                    //响应高度不匹配
-                    //响应空出及发送地址错的处理
-
                 }
                 #endregion
@@ -860,8 +800,8 @@ namespace HHWCSHost.View
                                     //表示地址请求，此时可能是分拣回库，也可能是新入库，也可能是空托入库，这里空托入库如果没有任务就自动生成任务(自动生成空托盘入库暂时不实现）
                                     //获取目标库位
                                     //hack:这里临时加个判断，如果任务状态不是31，则不响应
-                                    if (taskEntity.Status == 31)
-                                    {
+                                    //if (taskEntity.Status == 31)
+                                    //{
                                         LocationEntity location;
                                         if (taskEntity.Type == 100 || taskEntity.Type == 500)
                                         {
@@ -911,7 +851,7 @@ namespace HHWCSHost.View
                                                 AddLogToUI("写入" + station + "WCS区地址失败,任务：" + taskEntity.Id.ToString() + "消息：" + result.Msg, 2);
                                             }
                                         }
-                                    }
+                                    //}
                                 }
                                 if (addresses.Find(t => t.DevicePropCode == "Type").value == "2")
@@ -1145,7 +1085,7 @@ namespace HHWCSHost.View
         private void StationBack(List<DeviceAddressEntity> addresses,DeviceEntity device)
         {
             //获取地址
-            var result = WriteWCSStationDataAddress(addresses, "1", "06", addresses.Find(t => t.DevicePropCode == "PLCNo").value, "0", addresses.Find(t => t.DevicePropCode == "StationNo").value, addresses.Find(t => t.DevicePropCode == "TaskNo").value, addresses.Find(t => t.DevicePropCode == "Barcode").value, addresses.Find(t => t.DevicePropCode == "StationNo").value, "0");
+            var result = WriteWCSStationDataAddress(addresses, "1", "06", addresses.Find(t => t.DevicePropCode == "PLCNo").value, "0", addresses.Find(t => t.DevicePropCode == "StationNo").value, addresses.Find(t => t.DevicePropCode == "TaskNo").value, addresses.Find(t => t.DevicePropCode == "Barcode").value,device.BackAddress, "0");
             if (result.Success)
             {
                 AddLogToUI($"{device}回退成功",1);
@@ -1254,7 +1194,7 @@ namespace HHWCSHost.View
                 var task = taskResult.Data[0];
                 if (task.Status < 40)
                 {
-                    BllResult temp = Bll.EmptyOutHandle("1",task);
+                    BllResult temp = Bll.EmptyOutHandle("1","40",task);
                     if (temp.Success)
                     {
                         //清空WCS交换区
@@ -1266,7 +1206,7 @@ namespace HHWCSHost.View
                         else
                         {
                             //回滚
-                            Bll.EmptyOutHandle("0", task);
+                            Bll.EmptyOutHandle("0",task.Status.ToString(), task);
                             return BllResultFactory.Error(null, "空出处理失败：" + sendResult.Msg);
                         }                        
                     }
@@ -1552,7 +1492,7 @@ namespace HHWCSHost.View
                     case "DWORD": obj = Convert.ToUInt32(data); break;
                     case "BOOL": obj = Convert.ToBoolean(data); break;
                     case "WORD": obj = Convert.ToUInt16(data); break;
-                    case "CHAR": obj = Bll.StringToASCII(data); break;
+                    case "CHAR": obj = Bll.StringToASCII(data+"\u0003"); break;
                     default:
                         obj = data;
                         break;
@@ -1582,7 +1522,7 @@ namespace HHWCSHost.View
                     case "DWORD":
                     case "BOOL":
                     case "WORD": str = data.ToString(); break;
-                    case "CHAR": str = Bll.ASCIIToString((short[])data).Trim(); break;
+                    case "CHAR": str = Bll.ASCIIToString((short[])data).Trim().Replace("\u0003",""); break;
                     default:
                         str = data.ToString();
                         break;
@@ -1602,7 +1542,10 @@ namespace HHWCSHost.View
         /// <returns></returns>
         private bool ValidateStockerForCompleteTask(List<DeviceAddressEntity> addresses)
         {
-            if (addresses.Find(t => t.DevicePropCode == "TaskExcuteStatus").value == "3")
+            if (addresses.Find(t => t.DevicePropCode == "TaskExcuteStatus").value == "3"
+                    //这里加上WCS交换区检测，防止PLC来不及反应重复完成任务，交换区数据是会在完成任务后才会清除
+                    && addresses.First(t => t.DevicePropCode == "WCSTaskFlag").value != "0"
+                )
             {
                 return true;
             }
@@ -1621,6 +1564,7 @@ namespace HHWCSHost.View
         private void ExcuteTaskOut(List<DeviceEntity> stockers)
         {
             List<TaskEntity> taskEntities = GetAllTaskOut();
+            taskEntities = taskEntities.OrderBy(t => t.LastUpdated).ToList();
             foreach (var task in taskEntities)
             {
                 //获取任务所在巷道，即库位对应的巷道
@@ -1919,11 +1863,12 @@ namespace HHWCSHost.View
             {
                 if (deviceAddressEntities.First(t => t.DevicePropCode == "WorkModel").value == "2"
                     && deviceAddressEntities.First(t => t.DevicePropCode == "OperationModel").value == "5"
-                    && (deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "0" || deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "2")
+                    && (deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "0" || deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "2" )
                     && deviceAddressEntities.First(t => t.DevicePropCode == "TaskExcuteStatus").value == "1"
                     && deviceAddressEntities.First(t => t.DevicePropCode == "HasPallet").value == "1"
                     && deviceAddressEntities.First(t => t.DevicePropCode == "TaskNo1").value == "0"
-                    // &&
+                    //这里加上WCS交换区检测，防止PLC来不及反应重复写入任务
+                    && deviceAddressEntities.First(t => t.DevicePropCode == "WCSTaskFlag").value == "0"
                     )
                 {
                     return true;
@@ -1951,11 +1896,12 @@ namespace HHWCSHost.View
             {
                 if (deviceAddressEntities.First(t => t.DevicePropCode == "WorkModel").value == "2"
                     && deviceAddressEntities.First(t => t.DevicePropCode == "OperationModel").value == "5"
-                    && (deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "0" || deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "2" || deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "1")
+                    && (deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "0" || deviceAddressEntities.First(t => t.DevicePropCode == "WorkStatus").value == "3")
                     && deviceAddressEntities.First(t => t.DevicePropCode == "TaskExcuteStatus").value == "1"
                     && deviceAddressEntities.First(t => t.DevicePropCode == "HasPallet").value == "1"
                     && deviceAddressEntities.First(t => t.DevicePropCode == "TaskNo1").value == "0"
-                    // &&
+                    //这里加上WCS交换区检测，防止PLC来不及反应重复写入任务
+                    && deviceAddressEntities.First(t => t.DevicePropCode == "WCSTaskFlag").value == "0"
                     )
                 {
                     return true;
@@ -1987,7 +1933,8 @@ namespace HHWCSHost.View
                     && deviceAddressEntities.First(t => t.DevicePropCode == "TaskExcuteStatus").value == "1"
                     && deviceAddressEntities.First(t => t.DevicePropCode == "HasPallet").value == "1"
                     && deviceAddressEntities.First(t => t.DevicePropCode == "TaskNo1").value == "0"
-                    // &&
+                    //这里加上WCS交换区检测，防止PLC来不及反应重复写入任务
+                    && deviceAddressEntities.First(t => t.DevicePropCode == "WCSTaskFlag").value == "0"
                     )
                 {
                     return true;