叫料看板提示；连廊3163增加请求判断，添加日志

Projects/永冠OPP/WCS.Service/WebApi/WMS/WMS.cs

@@ -188,7 +188,16 @@ namespace WCS.Service
             });
             if (!res.ResType)
             {
-                TaskException(position, res.ResMessage);
+                var msg = "";
+                if (res.ResMessage.Contains("并发重复请求"))
+                {
+                    msg = res.ResMessage + ",请使用WMS异常处理功能处理";
+                    TaskException(position, msg);
+                }
+                else
+                {
+                    TaskException(position, res.ResMessage);
+                }          
                 throw new WarnException(res.ResMessage);
             }
 

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

@@ -22,6 +22,12 @@ namespace WCS.Service.Works.Station
             if (Ltc.Do(dev, v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException($"设备运行中");
             if (Ltc.Do(dev, v => v.Data2.Status.HasFlag(IstationStatus.光电状态) == false)) return;
             if (Ltc.Do(dev, v => v.Data2.Tasknum < 10000)) return;
+            if (Ltc.Do(dev, v => v.Data2.Request != IstationRequest.请求分配目标地址)) return;
+            if (dev.Entity.CODE == "3163")
+            {
+                InfoLog.INFO_INFO($"已扫码等待分配目标地址，[{dev.Entity.CODE}写入信息:当前任务号[{dev.Data2.Tasknum}]-凭证号[{dev.Data2.VoucherNo}]");
+            }
+
 
             var bcr = dev.Entity.BCR();
             var barcode = bcr.Content.Trim('\r');

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

@@ -491,7 +491,8 @@ namespace WCS.Service.Works.Station
                              }
                              catch (WarnException ex)
                              {
-                                 InfoLog.INFO_WarnDb($"目标位置{tasking.Position.Replace("_OUT", "")}获取出库任务失败，原因：【{ex.Message}】", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
+                                 
+                                 InfoLog.INFO_WarnDb($"目标位置{tasking.Position.Replace("_OUT", "")}获取出库任务失败，原因：【{ex.Message}】", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);                                                   
                                  continue;
                              };