diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
index 8e189c5b8..e37a9679c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
@@ -31,4 +31,12 @@ public class BakingController {
         bakingService.ovenInAndOut(whereJson);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @PostMapping("/inCoolIvt")
+    @Log("入冷却")
+    @ApiOperation("入冷却")
+    public ResponseEntity<Object> inCoolIvt(@RequestBody JSONObject whereJson) {
+        bakingService.inCoolIvt(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/BakingService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/BakingService.java
index cabd1aafd..2131c05e3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/BakingService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/BakingService.java
@@ -9,6 +9,14 @@ public interface BakingService {
      * @param whereJson /
      * @return JSONObject
      */
-    void ovenInAndOut(JSONObject whereJson);
+    JSONObject ovenInAndOut(JSONObject whereJson);
+
+    /**
+     * 烘箱出入
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject inCoolIvt(JSONObject whereJson);
+
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
index f5df9815a..74c8e447d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
@@ -42,7 +42,7 @@ public class BakingServiceImpl implements BakingService {
      */
     @Override
     @Transactional
-    public void ovenInAndOut(JSONObject whereJson) {
+    public JSONObject ovenInAndOut(JSONObject whereJson) {
 
         String option = whereJson.getString("option"); // 1-入箱 2-出箱
 
@@ -226,10 +226,20 @@ public class BakingServiceImpl implements BakingService {
                 jsonTask.put("task_status", "05");
                 taskTab.update(jsonTask);
             }
-
         }
+        JSONObject result = new JSONObject();
+        result.put("message","操作成功！");
+        return result;
     }
 
+    @Override
+    @Transactional
+    public JSONObject inCoolIvt(JSONObject whereJson) {
+        JSONObject result = new JSONObject();
+        result.put("message","操作成功！");
+        return result;
+    }
+    
     @Transactional
     public String createHotIoMst(JSONObject param) {
         /*
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
index 9b9a3c906..f5abcdd3e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
@@ -73,6 +73,11 @@ public class ShippingServiceImpl implements ShippingService {
     public JSONObject confirm(JSONObject whereJson) {
         JSONArray rows = whereJson.getJSONArray("cut_rows");
 
+        //对子卷任务进行校验
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject row =  rows.getJSONObject(i);
+        }
+
         //通过气涨轴对应的分切计划来判断要送到哪个机台编号附近
         String qzzno = rows.getJSONObject(0).getString("qzzno");