修改

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java

@@ -15,6 +15,7 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.nl.wms.pda.mps.service.BakingService;
+import org.nl.wms.sch.tasks.CutConveyorTask;
 import org.nl.wms.sch.tasks.InCoolIvtTask;
 import org.nl.wms.sch.tasks.InHotTask;
 import org.nl.wms.sch.tasks.OutHotTask;
@@ -143,6 +144,8 @@ public class BakingServiceImpl implements BakingService {
                 map.put("flag", "1");
                 map.put("reging_id", reging_id);
                 map.put("point_location", point_location);
+                //只找入箱点位
+                map.put("point_type", "4");
 
                 JSONArray pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().getResultJSONArray(0);
                 if (ObjectUtil.isEmpty(pointArr)) {
@@ -241,10 +244,18 @@ public class BakingServiceImpl implements BakingService {
         } else if (StrUtil.equals(option, "2")) {
             // 出箱
             String point_code1 = whereJson.getString("point_code");
-            if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("出箱点位不能为空");
+            if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("点位不能为空");
             JSONObject jsonHotIvt = hosIvtTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
-            if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("点位不存在");
+            if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("对应烘箱点位不存在");
 
+            //查询该点位是否存在未完成的任务
+            boolean have_task =new CutConveyorTask().isSingleTask(point_code1);
+            if (have_task){
+                throw new BadRequestException("该点位存在未完成的任务！");
+            }
+            if (StrUtil.isEmpty(jsonHotIvt.getString("container_name"))){
+                throw new BadRequestException("该点位不存在母卷！");
+            }
             // 1.查询暂存位有没有空位
             String product_area = jsonHotIvt.getString("product_area");
             String reging_id = "";
@@ -266,9 +277,11 @@ public class BakingServiceImpl implements BakingService {
             map.put("flag", "1");
             map.put("reging_id", reging_id);
             map.put("point_location", jsonHotIvt.getString("point_location"));
+            //只找出箱点位
+            map.put("point_type", "5");
 
             JSONArray pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().getResultJSONArray(0);
-            if (ObjectUtil.isEmpty(pointArr)) throw new BadRequestException("没有空暂存位");
+            if (ObjectUtil.isEmpty(pointArr)) throw new BadRequestException("没有可用的出箱暂存位");
 
             // 2.判断暂存位是否有任务：找到无任务的暂存位
             String point_code2 = "";
@@ -285,7 +298,7 @@ public class BakingServiceImpl implements BakingService {
                     break;
                 }
             }
-            if (ObjectUtil.isEmpty(point_code2)) throw new BadRequestException("没有空暂存位");
+            if (ObjectUtil.isEmpty(point_code2)) throw new BadRequestException("没有可用的出箱暂存位");
             // 3.创建任务
             JSONObject param = new JSONObject();
             param.put("point_code1", point_code1);

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql

@@ -17,6 +17,7 @@
 	输入.reging_id					    TYPEAS s_string
 	输入.point_location					TYPEAS s_string
 	输入.product_area					TYPEAS s_string
+	输入.point_type					    TYPEAS s_string
 
 
 [临时表]
@@ -60,6 +61,10 @@
                     point_location = 输入.point_location
                 ENDOPTION
 
+                OPTION 输入.point_type <> ""
+                    point_type = 输入.point_type
+                ENDOPTION
+
                 order by point_code ASC
 
 

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java

@@ -116,6 +116,9 @@ public class HotPointIvtServiceImpl implements HotPointIvtService {
 
         WQLObject wo = WQLObject.getWQLObject("st_ivt_hotpointivt");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
+        if (!json.containsKey("temperature")){
+            json.put("temperature",null);
+        }
         wo.update(json);
     }
 

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java

@@ -73,8 +73,10 @@ public class BookTwoConfirmTask extends AbstractAcsTask {
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
 
         if (StrUtil.equals(status,"0")) {
-            // 取消删除任务
+            // 更新删除字段
-            taskTab.delete("task_id = '"+task_id+"'");
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
         }
 
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java

@@ -72,8 +72,10 @@ public class CallEmpReelTask extends AbstractAcsTask {
         String currentUsername = SecurityUtils.getCurrentUsername();
 
         if (StrUtil.equals(status, "0")) {
-            // 取消删除任务
+            // 更新删除字段
-            taskTab.delete("task_id = '" + task_id + "'");
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
 
             // 删除冷却区出入单据
             // coolTab.delete("task_id = '"+task_id+"'");

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java

@@ -81,8 +81,10 @@ public class CoolCutTask extends AbstractAcsTask {
         String currentUsername = SecurityUtils.getCurrentUsername();
 
         if (StrUtil.equals(status, "0")) {
-            // 取消删除任务
+            // 更新删除字段
-            taskTab.delete("task_id = '" + task_id + "'");
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
 
             ivtTab.delete("task_id = '" + task_id + "'");
         }

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java

@@ -67,8 +67,10 @@ public class CutConveyorTask extends AbstractAcsTask {
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
 
         if (StrUtil.equals(status, "0")) {
-            // 取消删除任务
+            // 更新删除字段
-            taskTab.delete("task_id = '" + task_id + "'");
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
         }
 
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java

@@ -65,8 +65,10 @@ public class CutTrussTask extends AbstractAcsTask {
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
 
         if (StrUtil.equals(status, "0")) {
-            // 取消删除任务
+            // 更新删除字段
-            taskTab.delete("task_id = '" + task_id + "'");
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
         }
 
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java

@@ -72,7 +72,10 @@ public class InCoolIvtTask extends AbstractAcsTask {
 
         if (StrUtil.equals(status,"0")) {
             // 取消删除任务
-            taskTab.delete("task_id = '"+task_id+"'");
+            taskTab.delete("task_id = '"+task_id+"'");// 更新删除字段
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
 
             // 删除冷却区出入表
             coolTab.delete("task_id = '"+task_id+"'");

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java

@@ -70,8 +70,10 @@ public class InHotTask extends AbstractAcsTask {
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
 
         if (StrUtil.equals(status, "0")) {
-            // 取消删除任务
+            // 更新删除字段
-            taskTab.delete("task_id = '" + task_id + "'");
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
 
             coolIoTab.delete("task_id = '" + task_id + "'");
 

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java

@@ -68,8 +68,10 @@ public class OutHotTask extends AbstractAcsTask {
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
 
         if (StrUtil.equals(status, "0")) {
-            // 取消删除任务
+            // 更新删除字段
-            taskTab.delete("task_id = '" + task_id + "'");
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
 
             hotMstTab.delete("task_id = '" + task_id + "'");
         }

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java

@@ -72,7 +72,10 @@ public class OutTask extends AbstractAcsTask {
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
 
         if (StrUtil.equals(status, "0")) {
-            // 取消删除任务
+            // 更新删除字段
+            jsonTask.put("is_delete","1");
+            jsonTask.put("update_time", DateUtil.now());
+            taskTab.update(jsonTask);
         }
 
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {

lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue

@@ -137,7 +137,7 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" />
+        <el-table-column prop="point_code" width="100" label="点位编码" />
         <el-table-column prop="point_status" label="点位状态">
           <template slot-scope="scope">
             {{ dict.label.sch_hot_point_status[scope.row.point_status] }}