Browse Source

解析大托盘上料扫码时,按照taskstate = 1 2 ,排除3,

Ge mingyu 1 year ago
parent
commit
33c1f1e25e

+ 1 - 1
SIMDP/SIMDP.BLL/BlProductTask.cs

@@ -306,7 +306,7 @@ namespace SIMDP.BLL
         /// <returns></returns>
         public MoProductTask LargeTrayArrive(string barcode, int line)
         {
-            string sql = $"select top 1 * from product_task where line = '{line}' and large_barcode = '{barcode}' and task_state <= '3' and task_state > '0' order by id desc ";
+            string sql = $"select top 1 * from product_task where line = '{line}' and large_barcode = '{barcode}' and task_state <= '2' and task_state > '0' order by id desc ";
             var list = dalProductTask.GetList(sql);
             return list.Count > 0 ? list[0] : null;
         }

+ 7 - 1
SIMDP/SIMDP.Project/RWS/PLC1.cs

@@ -513,8 +513,12 @@ namespace SIMDP.Project
                     return;
                 }
             }
-            catch (Exception ex)
+            catch 
             {
+                Write("大托盘到位处理结果", 2);
+                Write("大托盘到位请求处理完成", true);
+                LogHelper.log.Error($"PLC1 : 扫码枪通信异常");
+
                 Write("上位机报警", 11);
                 return;
             }
@@ -536,6 +540,8 @@ namespace SIMDP.Project
                 redis.SetString(redis_largeLoading, "");
 
             //4 写入PLC
+            LogHelper.log.Info($"PLC1 :解析托盘 {sbarcode}成功,程序号 = {model.PlcProgramCode}");
+
             LargeArriveWrite(model);
             Write("大托盘到位处理结果", 1);
             //5 本地存储

+ 7 - 1
SIMDP/SIMDP.Project/RWS/PLC3.cs

@@ -332,8 +332,12 @@ namespace SIMDP.Project
                     return;
                 }
             }
-            catch (Exception)
+            catch 
             {
+                Write("大托盘到位处理结果", 2);
+                Write("大托盘到位请求处理完成", true);
+                LogHelper.log.Error($"PLC3 : 扫码枪通信异常");
+
                 Write("上位机报警", 11);
                 return;
             }
@@ -353,6 +357,8 @@ namespace SIMDP.Project
                 redis.SetString(redis_largeLoading, "");
 
             //4 写入PLC
+            LogHelper.log.Info($"PLC3 :解析托盘 {sbarcode}成功,程序号 = {model.PlcProgramCode}");
+
             LargeArriveWrite(model);
             Write("大托盘到位处理结果", 1);
             //5 本地存储

+ 7 - 1
SIMDP/SIMDP.Project/RWS/PLC4.cs

@@ -608,8 +608,12 @@ namespace SIMDP.Project
                     return;
                 }
             }
-            catch (Exception)
+            catch 
             {
+                Write("大托盘到位处理结果", 2);
+                Write("大托盘到位请求处理完成", true);
+                LogHelper.log.Error($"PLC4 : 扫码枪通信异常");
+
                 Write("上位机报警", 11);
                 return;
             }
@@ -629,6 +633,8 @@ namespace SIMDP.Project
                 redis.SetString(redis_largeLoading, "");
 
             //4 写入PLC
+            LogHelper.log.Info($"PLC4 :解析托盘 {sbarcode}成功,程序号 = {model.PlcProgramCode}");
+
             LargeArriveWrite(model);
             Write("大托盘到位处理结果", 1);
 

+ 1 - 1
SIMDP/SIMDP.View/App.config

@@ -8,7 +8,7 @@
 		<add key="ComponentDbType" value="sqlserver" />
 		<add key="ClientSettingsProvider.ServiceUri" value="" />
 		<add key="ClientSettingsProvider.ConnectionStringName" value="DefaultConnection" />
-		<add key="Version" value="1.6.2" />
+		<add key="Version" value="1.6.3" />
 		<add key="DefaultUser" value="10017" />
 		<!--读取曲线csv文件的延迟时间-->
 		<add key="ReadCsvDelay" value="1000" />

+ 2 - 2
SIMDP/SIMDP.View/FormProductTask.Designer.cs

@@ -369,7 +369,7 @@ namespace SIMDP
             this.gridColumn15.AppearanceHeader.Options.UseTextOptions = true;
             this.gridColumn15.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.gridColumn15.Caption = "任务状态";
-            this.gridColumn15.FieldName = "TaskState";
+            this.gridColumn15.FieldName = "LargeState";
             this.gridColumn15.MaxWidth = 150;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
@@ -381,7 +381,7 @@ namespace SIMDP
             this.gridColumn22.AppearanceCell.Options.UseTextOptions = true;
             this.gridColumn22.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.gridColumn22.Caption = "小盘托呼叫";
-            this.gridColumn22.FieldName = "PositionState";
+            this.gridColumn22.FieldName = "SmallState";
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
             this.gridColumn22.VisibleIndex = 17;