取消入库任务增加参数

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -737,7 +737,7 @@ namespace OnlineStore.DeviceLibrary
                                 LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，不拦截托盘，更新此托盘为NG，从waitInStoreList中删除，取消入库任务");
                                 LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，不拦截托盘，更新此托盘为NG，从waitInStoreList中删除，取消入库任务");
                                 TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败");
                                 TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败");
                                 waitInStoreList.RemoveAt(reIndex);
                                 waitInStoreList.RemoveAt(reIndex);
-                                SServerManager.cancelPutInTask(Name, currCode.WareCode);
+                                SServerManager.cancelPutInTask(Name, currCode.WareCode,true);
                                 return false;
                                 return false;
                             }
                             }
 
 
@@ -772,7 +772,7 @@ namespace OnlineStore.DeviceLibrary
                         LogInfo("*******" + logName + "，清理入库任务：【" + param.ToStr() + "】");
                         LogInfo("*******" + logName + "，清理入库任务：【" + param.ToStr() + "】");
                         if (IsCancel)
                         if (IsCancel)
                         {
                         {
-                            SServerManager.cancelPutInTask(Name, param.WareCode);
+                            SServerManager.cancelPutInTask(Name, param.WareCode,false );
                         }
                         }
                         return true;
                         return true;
                     }
                     }

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -153,7 +153,7 @@ namespace OnlineStore.DeviceLibrary
                 //如果分配了库位，需要调用取消
                 //如果分配了库位，需要调用取消
                 if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "")
                 if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "")
                 {
                 {
-                    SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode);
+                    SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode,false );
                 }
                 }
                 //入料失败料
                 //入料失败料
                 return inoup;
                 return inoup;

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -88,7 +88,7 @@ namespace OnlineStore.DeviceLibrary
                 if (serverResult == null)
                 if (serverResult == null)
                 {
                 {
                     msg = deviceName + "  【" + codeStr + "】结果：没有收到服务器反馈，调用 cancelPutInTask ";
                     msg = deviceName + "  【" + codeStr + "】结果：没有收到服务器反馈，调用 cancelPutInTask ";
-                    cancelPutInTask(deviceName, codeStr);
+                    cancelPutInTask(deviceName, codeStr,false);
                     return msg;
                     return msg;
                 }
                 }
                 else if ((!string.IsNullOrEmpty(serverResult.msg)) || serverResult.result.Equals(0).Equals(false))
                 else if ((!string.IsNullOrEmpty(serverResult.msg)) || serverResult.result.Equals(0).Equals(false))
@@ -431,7 +431,7 @@ namespace OnlineStore.DeviceLibrary
 
 
         //        取消任务地址:   /cancelPutInTask      //参数: barcode
         //        取消任务地址:   /cancelPutInTask      //参数: barcode
         private static string Addr_cancelPutInTask = "/rest/api/qisda/device/cancelPutInTask";
         private static string Addr_cancelPutInTask = "/rest/api/qisda/device/cancelPutInTask";
-        public static string cancelPutInTask(string deviceName, string barcode)
+        public static string cancelPutInTask(string deviceName, string barcode, bool disablePos)
         {
         {
             string msg = "";
             string msg = "";
             try
             try
@@ -439,6 +439,7 @@ namespace OnlineStore.DeviceLibrary
 
 
                 Dictionary<string, string> paramMap = new Dictionary<string, string>();
                 Dictionary<string, string> paramMap = new Dictionary<string, string>();
                 paramMap.Add("barcode", barcode);
                 paramMap.Add("barcode", barcode);
+                paramMap.Add("disablePos", disablePos.ToString());
 
 
                 string server = GetAddr(Addr_cancelPutInTask, paramMap);
                 string server = GetAddr(Addr_cancelPutInTask, paramMap);
                 DateTime startTime = DateTime.Now;
                 DateTime startTime = DateTime.Now;
@@ -449,11 +450,11 @@ namespace OnlineStore.DeviceLibrary
 
 
                 if (data == null)
                 if (data == null)
                 {
                 {
-                    return msg = deviceName + " cancelPutInTask【 " + barcode + "】 没有收到服务器反馈";
+                    return msg = deviceName + " cancelPutInTask【 " + barcode + ","+ disablePos + "】 没有收到服务器反馈";
                 }
                 }
                 else if (data.code.Equals(0).Equals(false))
                 else if (data.code.Equals(0).Equals(false))
                 {
                 {
-                    return msg = deviceName + " cancelPutInTask【 " + barcode + "】   ：" + data.msg;
+                    return msg = deviceName + " cancelPutInTask【 " + barcode + "," + disablePos + "】   ：" + data.msg;
                 }
                 }
 
 
                 return "";
                 return "";
@@ -508,7 +509,7 @@ namespace OnlineStore.DeviceLibrary
                 if (serverResult == null)
                 if (serverResult == null)
                 {
                 {
                     result.Msg = deviceName + "  【" + codeStr + "】结果：没有收到服务器反馈，调用 cancelPutInTask ";
                     result.Msg = deviceName + "  【" + codeStr + "】结果：没有收到服务器反馈，调用 cancelPutInTask ";
-                    cancelPutInTask(deviceName, codeStr);
+                    cancelPutInTask(deviceName, codeStr,false );
                     result.Param = new InOutParam(0, codeStr, "", height, width, true);
                     result.Param = new InOutParam(0, codeStr, "", height, width, true);
                     result.Param.rfid = rfid;
                     result.Param.rfid = rfid;
                     result.Param.InStoreNg = true;
                     result.Param.InStoreNg = true;