1.还原补箱,替换箱子不调用解绑接口

2.单据转库,可以出hold箱子

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1499,7 +1499,9 @@ public class LiteOrderCache {
         int taskReelCount = 0;
         int taskReelCount = 0;
         int taskNum = 0;
         int taskNum = 0;
 
 
-        List<String> holdPosIdList = getHoldPosIdList(cacheOrder);
+        //转库可以出hold，置为空
+        //List<String> holdPosIdList = getHoldPosIdList(cacheOrder);
+        List<String> holdPosIdList = new ArrayList<>();
 
 
         for (LiteOrderItem orderItem : cacheOrder.getOrderItems()) {
         for (LiteOrderItem orderItem : cacheOrder.getOrderItems()) {
             int remainNum = orderItem.getNeedNum() - orderItem.getTotalOutNum();
             int remainNum = orderItem.getNeedNum() - orderItem.getTotalOutNum();

src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java

@@ -1073,7 +1073,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
 
 
             LuxsanApiResult apiResult = JSONObject.parseObject(resultStr, LuxsanApiResult.class);
             LuxsanApiResult apiResult = JSONObject.parseObject(resultStr, LuxsanApiResult.class);
             if (LuxsanApiEnum.ERROR.equals(apiResult.getMSGTY())) {
             if (LuxsanApiEnum.ERROR.equals(apiResult.getMSGTY())) {
-                result = apiResult.getMSGTY();
+                result = apiResult.getMSGTX();
             }
             }
         } catch (ApiException e) {
         } catch (ApiException e) {
             e.printStackTrace();
             e.printStackTrace();

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/RestoreReplaceController.java

@@ -152,9 +152,11 @@ public class RestoreReplaceController {
 
 
 
 
         //3.先调用解绑信息
         //3.先调用解绑信息
-        String  unBindPalletResult = LuxsanApi.unBindPallet(new UnBindPalletRequest(CommonUtil.plantCode, ticketCode, "", palletId));
-        if (StringUtils.isNotEmpty(unBindPalletResult)){
-            return ResultBean.newErrorResult(-1, "", boxStr + "解绑失败,原因为:"+unBindPalletResult);
+        if (replaceBox) {
+            String unBindPalletResult = LuxsanApi.unBindPallet(new UnBindPalletRequest(CommonUtil.plantCode, ticketCode, "", palletId));
+            if (StringUtils.isNotEmpty(unBindPalletResult)) {
+                return ResultBean.newErrorResult(-1, "", boxStr + "解绑失败,原因为:" + unBindPalletResult);
+            }
         }
         }
 
 
         if (pos != null){
         if (pos != null){
@@ -164,6 +166,7 @@ public class RestoreReplaceController {
             newDataLog.setType(OP.CHECKOUT);
             newDataLog.setType(OP.CHECKOUT);
             newDataLog.setLoc(TaskLocUtil.MW);
             newDataLog.setLoc(TaskLocUtil.MW);
             newDataLog.setSourceName(dataLog.getSourceName());
             newDataLog.setSourceName(dataLog.getSourceName());
+            newDataLog.setCartonId(pos.getBarcode().getCartonId());
             taskService.addTaskToExecute(newDataLog);
             taskService.addTaskToExecute(newDataLog);
         }
         }