1.半成品砍单回库 字段修改,结果返回字段修改

2.人工GR入库,完成装箱并入库,清除要出库的信息

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

@@ -14,5 +14,5 @@ public class ShipCancelUpshelfRequest {
     private String TICKET_CODE;
 
     //标签码
-    private String PALLET_ID;
+    private String LABEL_ID;
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/controller/WcsController.java

@@ -65,20 +65,20 @@ public class WcsController {
         String ticketCode = paramMap.get("TICKET_CODE");
         log.info("wms砍单通知自动仓,工厂代码为:" + plantCode + ",出货单为:" + ticketCode);
 
-        String msgtx = "S";
-        String msgty = "";
+        String msgty = "S";
+        String msgtx = "";
         try {
             String resultStr = HttpHelper.postJson(LuxsanApi.cancelOdnUrl, paramMap);
             log.info("wms砍单通知自动仓,转发结果为:" + resultStr);
         } catch (ApiException e) {
             e.printStackTrace();
-            msgtx = "E";
-            msgty = e.getMessage();
+            msgty = "E";
+            msgtx = e.getMessage();
         }
 
         WcsResult wcsResult = new WcsResult();
-        wcsResult.setMSGTX(msgtx);
         wcsResult.setMSGTY(msgty);
+        wcsResult.setMSGTX(msgtx);
         return wcsResult;
     }
 }

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

@@ -42,10 +42,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @ApiOperation("手动GR入库")
 @Slf4j
@@ -363,6 +360,27 @@ public class ManualGrPutInController {
             return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
         }
 
+        //1.清理要出库的数据
+        List<Barcode> newSubCodeList = new ArrayList<>();
+
+        List<Barcode> subCodeList = boxBarcode.getSubCodeList();
+        if (subCodeList != null && !subCodeList.isEmpty()){
+            for (Barcode barcode : subCodeList) {
+                if (barcode.isOut()){
+                    barcode.setOdn("");
+                    barcode.setOrderId("");
+                    barcode.setOrderItemId("");
+                    barcode.setOut(false);
+                    barcode = barcodeManager.save(barcode);
+                }
+                newSubCodeList.add(barcode);
+            }
+        }
+
+        boxBarcode.setSubCodeList(newSubCodeList);
+        boxBarcode = barcodeManager.save(boxBarcode);
+
+
         //1.判断是否有正在入库的任务
         for (DataLog dataLog : taskService.getAllTasks()) {
             if (!dataLog.isCancel() && !dataLog.isFinished() && dataLog.getBarcode().equals(boxBarcode.getBarcode())) {