转库问题和储位移转修改

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java

@@ -676,7 +676,7 @@ public class OutLineController {
                 labelList.add(tickPick);
                 labelList.add(tickPick);
                 request.setLABEL_LIST(labelList);
                 request.setLABEL_LIST(labelList);
                 LuxsanApi.ticketPick(request);
                 LuxsanApi.ticketPick(request);
-                LuxsanApi.ticketPost(new TicketPostRequest(CommonUtil.plantCode,orderItem.getTicketCode()));
+                //LuxsanApi.ticketPost(new TicketPostRequest(CommonUtil.plantCode,orderItem.getTicketCode()));
             }
             }
 
 
             else if (liteOrder.getCheckType() == LiteorderCheckType.PICKING_CHECKOUT){
             else if (liteOrder.getCheckType() == LiteorderCheckType.PICKING_CHECKOUT){

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

@@ -322,7 +322,6 @@ public class LuxsanApi extends DefaultSmfApiListener {
             log.error("ticketPost请求失败:" + e.getMessage());
             log.error("ticketPost请求失败:" + e.getMessage());
             throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()});
             throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()});
         }
         }
-        throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{"未找到对应的单据挑料信息"});
     }
     }
 
 
 
 

src/main/java/com/neotel/smfcore/custom/luxsan/api/bean/request/BinMoveRequest.java

@@ -19,4 +19,6 @@ public class BinMoveRequest {
 
 
     
     
     private int QTY;
     private int QTY;
+
+    private String LABEL_ID;
 }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -221,12 +221,12 @@ public class CDeviceController {
 
 
                 //储位移转
                 //储位移转
                 else if (MaterialUtil.storTransfer(materialStr)){
                 else if (MaterialUtil.storTransfer(materialStr)){
-                    BinMoveResult binMoveResult = LuxsanApi.binMove(new BinMoveRequest(CommonUtil.plantCode, binCodeStr, Arrays.asList(barcode.getBarcode()), barcode.getAmount()));
+                    BinMoveResult binMoveResult = LuxsanApi.binMove(new BinMoveRequest(CommonUtil.plantCode, binCodeStr, Arrays.asList(barcode.getBarcode()), barcode.getAmount(),barcode.getLabelId()));
                     if (StringUtils.isNotEmpty(binMoveResult.getGR_DATE())){
                     if (StringUtils.isNotEmpty(binMoveResult.getGR_DATE())){
                         Date grDate = DateUtil.getNoTimeDate(binMoveResult.getGR_DATE());
                         Date grDate = DateUtil.getNoTimeDate(binMoveResult.getGR_DATE());
                         barcode.setProduceDate(grDate);
                         barcode.setProduceDate(grDate);
                     }
                     }
-                    barcode.setLabelId(binMoveResult.getLABEL_ID());
+                    //barcode.setLabelId(binMoveResult.getLABEL_ID());
                 }
                 }
 
 
                 //311单据转库
                 //311单据转库
@@ -246,7 +246,7 @@ public class CDeviceController {
                     labelList.add(tickPick);
                     labelList.add(tickPick);
                     request.setLABEL_LIST(labelList);
                     request.setLABEL_LIST(labelList);
                     LuxsanApi.ticketPick(request);
                     LuxsanApi.ticketPick(request);
-                    LuxsanApi.ticketPost(new TicketPostRequest(CommonUtil.plantCode,transfer.getTicket()));
+                    //LuxsanApi.ticketPost(new TicketPostRequest(CommonUtil.plantCode,transfer.getTicket()));
                 }
                 }
 
 
                 //单据退库上架
                 //单据退库上架

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/TicketController.java

@@ -231,7 +231,7 @@ public class TicketController {
         String srcWarehouseCode = paramMap.get("srcWarehouseCode"); //来源库别
         String srcWarehouseCode = paramMap.get("srcWarehouseCode"); //来源库别
         String codeStr = paramMap.get("codeStr"); //料盘信息
         String codeStr = paramMap.get("codeStr"); //料盘信息
 
 
-        log.info("单据退料绑定信息为:" + JSON.toJSONString(paramMap));
+        log.info("单据转库绑定信息为:" + JSON.toJSONString(paramMap));
 
 
         //判断料串信息是否正确
         //判断料串信息是否正确
         if (StringUtils.isEmpty(materialStr) || !materialStr.startsWith("B00")) {
         if (StringUtils.isEmpty(materialStr) || !materialStr.startsWith("B00")) {