取消入库任务时增加是否禁用库位的参数

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -165,7 +165,7 @@ namespace OnlineStore.DeviceLibrary
                                     LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，更新为入库NG料，从waitInStoreList中删除" + reIndex + "，取消入库任务");
                                     LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，更新为入库NG料，从waitInStoreList中删除" + reIndex + "，取消入库任务");
                                     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;
                                 }
                                 }
                             }
                             }
@@ -174,7 +174,7 @@ namespace OnlineStore.DeviceLibrary
                         {
                         {
                             LogUtil.error(Name + "托盘信息 " + tray.ToStr() + " 与入库任务 " + currCode.ToStr() + " 不一致，从waitInStoreList中删除" + reIndex + "，取消入库任务");
                             LogUtil.error(Name + "托盘信息 " + tray.ToStr() + " 与入库任务 " + currCode.ToStr() + " 不一致，从waitInStoreList中删除" + reIndex + "，取消入库任务");
                             waitInStoreList.RemoveAt(reIndex);
                             waitInStoreList.RemoveAt(reIndex);
-                            SServerManager.cancelPutInTask(Name, currCode.WareCode);
+                            SServerManager.cancelPutInTask(Name, currCode.WareCode,true);
                             return false;
                             return false;
                         }
                         }
                     }
                     }
@@ -666,7 +666,7 @@ namespace OnlineStore.DeviceLibrary
                         if (MoveInfo.MoveParam.IsNG)
                         if (MoveInfo.MoveParam.IsNG)
                         {
                         {
                             InLog(MoveInfo.SLog + "，NG料已放到出料口，发送 cancelPutInTask  " );
                             InLog(MoveInfo.SLog + "，NG料已放到出料口，发送 cancelPutInTask  " );
-                            string msg = SServerManager.cancelPutInTask(Name, code);
+                            string msg = SServerManager.cancelPutInTask(Name, code,false);
                             afterPutCutOK = true;
                             afterPutCutOK = true;
                         }
                         }
                         else
                         else

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -362,7 +362,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
@@ -375,6 +375,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;
@@ -385,11 +386,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 "";
@@ -454,7 +455,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.IsNG = true;
                     result.Param.IsNG = true;