From e668124a965d710d578c338654693391f83464ef Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Fri, 4 Nov 2022 17:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 256000 -> 256000 bytes
 .../mes/service/impl/MesToLmsServiceImpl.java |   2 +
 .../pda/mps/service/impl/OutServiceImpl.java  |   9 +-
 .../org/nl/wms/sch/tasks/CoolCutTask.java     |  16 ++-
 .../org/nl/wms/sch/tasks/CutTrussTask.java    | 133 ++++++++++--------
 .../java/org/nl/wms/sch/tasks/InTask.java     |  35 ++---
 .../st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql  |   3 +
 7 files changed, 105 insertions(+), 93 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
index 2d2769e96ffad3a9a9f0fa71e08a3ef6f9a9ad81..95c69edcd9db4967b60e3f34cf7328554f9fbdc4 100644
GIT binary patch
delta 7080
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

delta 7000
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

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 9da5eaa35..be560eb81 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -486,6 +486,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     jo.put("point_code1", cool_ivt.getString("full_point_code"));
                     jo.put("point_code2", cut_jo.getString("full_point_code"));
                     jo.put("vehicle_code", parent_container_name);
+                    jo.put("product_area", cool_ivt.getString("product_area"));
                     jo.put("task_type", "010302");
                 } else {
                     jo.put("point_code1", cool_ivt.getString("full_point_code"));
@@ -494,6 +495,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     jo.put("point_code4", cool_ivt.getString("full_point_code"));
                     jo.put("vehicle_code", parent_container_name);
                     jo.put("vehicle_code2", cut_jo.getString("empty_vehicle_code"));
+                    jo.put("product_area", cool_ivt.getString("product_area"));
                     jo.put("task_type", "010301");
                 }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
index 1a241f230..433ca8e2b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
@@ -117,12 +117,9 @@ public class OutServiceImpl implements OutService {
             }
 
             JSONObject jo = new JSONObject();
-            jo.put("point_code1","");
-            jo.put("point_code2","");
-            jo.put("point_code3",point_code);
-            jo.put("point_code4",empty_vehicle.getString("point_code"));
-            jo.put("vehicle_code","");
-            jo.put("vehicle_code2",cut_qzzno);
+            jo.put("point_code1",point_code);
+            jo.put("point_code2",empty_vehicle.getString("point_code"));
+            jo.put("vehicle_code",cut_qzzno);
             jo.put("task_type","010404");
             cutTrussTask.createTask(jo);
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
index 2df758caf..3387a7705 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
@@ -43,6 +43,14 @@ public class CoolCutTask extends AbstractAcsTask {
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
 
+            String product_area = json.getString("product_area");
+            String agv_system_type = "";
+            if (product_area.equals("A")||product_area.equals("B")){
+                agv_system_type = "2";
+            }
+            if (product_area.equals("C")||product_area.equals("D")){
+                agv_system_type = "3";
+            }
             AcsTaskDto dto = AcsTaskDto.builder()
                     .ext_task_id(json.getString("task_id"))
                     .task_code(json.getString("task_code"))
@@ -51,6 +59,7 @@ public class CoolCutTask extends AbstractAcsTask {
                     .next_device_code(json.getString("point_code2"))
                     .vehicle_code(json.getString("vehicle_code"))
                     .priority(json.getString("priority"))
+                    .agv_system_type(agv_system_type)
                     .remark(json.getString("remark"))
                     .build();
             resultList.add(dto);
@@ -256,7 +265,12 @@ public class CoolCutTask extends AbstractAcsTask {
         json.put("create_name", currentUsername);
         json.put("create_time", DateUtil.now());
         json.put("priority", "1");
-        json.put("acs_task_type", "5");
+        if (form.getString("task_type").equals("010301")){
+            json.put("acs_task_type", "2");
+        }else {
+            json.put("acs_task_type", "3");
+        }
+
         tab.insert(json);
 
         return json.getString("task_id");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
index d5c131e59..5e5357760 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
@@ -62,9 +62,9 @@ public class CutTrussTask extends AbstractAcsTask {
         String task_id = taskObj.getString("task_id");
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
 
-        if (StrUtil.equals(status,"0")) {
+        if (StrUtil.equals(status, "0")) {
             // 取消删除任务
-            taskTab.delete("task_id = '"+task_id+"'");
+            taskTab.delete("task_id = '" + task_id + "'");
         }
 
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
@@ -74,62 +74,62 @@ public class CutTrussTask extends AbstractAcsTask {
             taskTab.update(jsonTask);
         }
 
-        if(StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
+        if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
             // 更改任务状态为完成
-            jsonTask.put("task_status",TaskStatusEnum.FINISHED.getCode());
+            jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
             jsonTask.put("update_optid", SecurityUtils.getCurrentUserId());
             jsonTask.put("update_optname", SecurityUtils.getCurrentUsername());
             jsonTask.put("update_time", DateUtil.now());
             taskTab.update(jsonTask);
 
 
-            if (jsonTask.getString("task_type").equals("010403")){
+            if (jsonTask.getString("task_type").equals("010403")) {
                 //更新分切机对应位置的气涨轴
-                JSONObject cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("up_point_code = '"+jsonTask.getString("point_code2")+"'").uniqueResult(0);
-                if (ObjectUtil.isNotEmpty(cut_point)){
-                    cut_point.put("up_qzzno",jsonTask.getString("vehicle_code"));
-                }else {
-                    cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("down_point_code = '"+jsonTask.getString("point_code2")+"'").uniqueResult(0);
-                    if (ObjectUtil.isNotEmpty(cut_point)){
-                        cut_point.put("down_qzzno",jsonTask.getString("vehicle_code"));
-                    }else {
+                JSONObject cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("up_point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
+                if (ObjectUtil.isNotEmpty(cut_point)) {
+                    cut_point.put("up_qzzno", jsonTask.getString("vehicle_code"));
+                } else {
+                    cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("down_point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(cut_point)) {
+                        cut_point.put("down_qzzno", jsonTask.getString("vehicle_code"));
+                    } else {
                         throw new BadRequestException("未查询到对应的分切机！");
                     }
                 }
                 WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_point);
                 //更新输送线的气涨轴编码
-                JSONObject delivery_point = WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").query("point_code = '"+jsonTask.getString("point_code1")+"'").uniqueResult(0);
-                if (ObjectUtil.isEmpty(delivery_point)){
+                JSONObject delivery_point = WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").query("point_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(delivery_point)) {
                     throw new BadRequestException("未查询到对应的输送线点位！");
                 }
-                delivery_point.put("qzzno",jsonTask.getString("vehicle_code2"));
-                delivery_point.put("point_status","04");
+                delivery_point.put("qzzno", jsonTask.getString("vehicle_code2"));
+                delivery_point.put("point_status", "04");
                 WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").update(delivery_point);
                 //更新出站气涨轴的分切计划状态
-                JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '"+jsonTask.getString("vehicle_code2")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '06'").getResultJSONArray(0);
-                if (ObjectUtil.isEmpty(plan_jo)){
-                    throw new BadRequestException("未查询到气涨轴："+jsonTask.getString("vehicle_code2")+"对应的分切计划！");
+                JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code2") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '06'").getResultJSONArray(0);
+                if (ObjectUtil.isEmpty(plan_jo)) {
+                    throw new BadRequestException("未查询到气涨轴：" + jsonTask.getString("vehicle_code2") + "对应的分切计划！");
                 }
                 for (int i = 0; i < plan_jo.size(); i++) {
                     JSONObject plan_row = plan_jo.getJSONObject(i);
-                    plan_row.put("status","09");
-                    plan_row.put("end_time",DateUtil.now());
+                    plan_row.put("status", "09");
+                    plan_row.put("end_time", DateUtil.now());
                     WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);
                 }
                 //更新入站气涨轴的分切计划状态
-                JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '"+jsonTask.getString("vehicle_code")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '04'").getResultJSONArray(0);
-                if (ObjectUtil.isEmpty(plan_jo2)){
-                    throw new BadRequestException("未查询到气涨轴："+jsonTask.getString("vehicle_code")+"对应的分切计划！");
+                JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '04'").getResultJSONArray(0);
+                if (ObjectUtil.isEmpty(plan_jo2)) {
+                    throw new BadRequestException("未查询到气涨轴：" + jsonTask.getString("vehicle_code") + "对应的分切计划！");
                 }
                 for (int i = 0; i < plan_jo2.size(); i++) {
                     JSONObject plan_row = plan_jo2.getJSONObject(i);
-                    plan_row.put("status","05");
-                    plan_row.put("end_time",DateUtil.now());
+                    plan_row.put("status", "05");
+                    plan_row.put("end_time", DateUtil.now());
                     WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);
                 }
             }
         }
-     }
+    }
 
     @Override
     public void findStartPoint() {
@@ -148,24 +148,26 @@ public class CutTrussTask extends AbstractAcsTask {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String currentUsername = SecurityUtils.getCurrentUsername();
 
+        CutConveyorTask cutConveyorTask = new CutConveyorTask();
+
         String point_code1 = form.getString("point_code1");
         String point_code2 = form.getString("point_code2");
         String point_code3 = form.getString("point_code3");
         String point_code4 = form.getString("point_code4");
-        /*if (conveyorTask.isSingleTask(point_code1)){
-            throw new BadRequestException("点位："+point_code1+"存在未完成的任务！");
+        if (cutConveyorTask.isSingleTask(point_code1)) {
+            throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
         }
-        if (conveyorTask.isSingleTask(point_code2)){
-            throw new BadRequestException("点位："+point_code2+"存在未完成的任务！");
+        if (cutConveyorTask.isSingleTask(point_code2)) {
+            throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！");
         }
-        if (conveyorTask.isSingleTask(point_code3)){
-            throw new BadRequestException("点位："+point_code3+"存在未完成的任务！");
+        if (cutConveyorTask.isSingleTask(point_code3)) {
+            throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！");
+        }
+        if (cutConveyorTask.isSingleTask(point_code4)) {
+            throw new BadRequestException("点位：" + point_code4 + "存在未完成的任务！");
         }
-        if (conveyorTask.isSingleTask(point_code4)){
-            throw new BadRequestException("点位："+point_code4+"存在未完成的任务！");
-        }*/
         JSONObject json = new JSONObject();
-        json.put("task_id", IdUtil.getSnowflake(1,1).nextId());
+        json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
         json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
         json.put("task_type", form.getString("task_type"));
         json.put("vehicle_code", form.getString("vehicle_code"));
@@ -179,57 +181,65 @@ public class CutTrussTask extends AbstractAcsTask {
         json.put("create_id", currentUserId);
         json.put("create_name", currentUsername);
         json.put("create_time", DateUtil.now());
-        json.put("priority","1" );
-        json.put("acs_task_type","5" );
+        json.put("priority", "1");
+        json.put("acs_task_type", "6");
         tab.insert(json);
 
-        if (form.getString("task_type").equals("010403")){
+        if (form.getString("task_type").equals("010403")) {
             //更新入站气涨轴的分切计划状态
-            JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '"+json.getString("vehicle_code")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '03'").getResultJSONArray(0);
-            if (ObjectUtil.isEmpty(plan_jo)){
-                throw new BadRequestException("未查询到气涨轴："+json.getString("vehicle_code")+"对应的分切计划！");
+            JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '03'").getResultJSONArray(0);
+            if (ObjectUtil.isEmpty(plan_jo)) {
+                throw new BadRequestException("未查询到气涨轴：" + json.getString("vehicle_code") + "对应的分切计划！");
             }
             for (int i = 0; i < plan_jo.size(); i++) {
                 JSONObject plan_row = plan_jo.getJSONObject(i);
-                plan_row.put("status","04");
-                plan_row.put("end_time",DateUtil.now());
+                plan_row.put("status", "04");
+                plan_row.put("end_time", DateUtil.now());
                 WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);
             }
 
             //更新出站气涨轴的分切计划状态
-            JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '"+json.getString("vehicle_code2")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0);
-            if (ObjectUtil.isEmpty(plan_jo2)){
-                throw new BadRequestException("未查询到气涨轴："+json.getString("vehicle_code2")+"对应的分切计划！");
+            JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code2") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0);
+            if (ObjectUtil.isEmpty(plan_jo2)) {
+                throw new BadRequestException("未查询到气涨轴：" + json.getString("vehicle_code2") + "对应的分切计划！");
             }
             for (int i = 0; i < plan_jo2.size(); i++) {
                 JSONObject plan_row = plan_jo2.getJSONObject(i);
-                plan_row.put("status","06");
-                plan_row.put("end_time",DateUtil.now());
+                plan_row.put("status", "06");
+                plan_row.put("end_time", DateUtil.now());
                 WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);
             }
         }
 
-        if (form.getString("task_type").equals("010404")){
+        if (form.getString("task_type").equals("010404")) {
             //更新出站气涨轴的分切计划状态
-            JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '"+json.getString("vehicle_code2")+"' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0);
-            if (ObjectUtil.isEmpty(plan_jo2)){
-                throw new BadRequestException("未查询到气涨轴："+json.getString("vehicle_code2")+"对应的分切计划！");
+            JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0);
+            if (ObjectUtil.isEmpty(plan_jo2)) {
+                throw new BadRequestException("未查询到气涨轴：" + json.getString("vehicle_code") + "对应的分切计划！");
             }
             for (int i = 0; i < plan_jo2.size(); i++) {
                 JSONObject plan_row = plan_jo2.getJSONObject(i);
-                plan_row.put("status","06");
-                plan_row.put("end_time",DateUtil.now());
+                plan_row.put("status", "06");
+                plan_row.put("end_time", DateUtil.now());
                 WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);
             }
         }
 
-        if (form.getString("task_type").equals("010405")){
-
+        if (form.getString("task_type").equals("010405")) {
+            //更新入站气涨轴的分切计划状态
+            JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '03'").getResultJSONArray(0);
+            if (ObjectUtil.isEmpty(plan_jo)) {
+                throw new BadRequestException("未查询到气涨轴：" + json.getString("vehicle_code") + "对应的分切计划！");
+            }
+            for (int i = 0; i < plan_jo.size(); i++) {
+                JSONObject plan_row = plan_jo.getJSONObject(i);
+                plan_row.put("status", "04");
+                plan_row.put("end_time", DateUtil.now());
+                WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);
+            }
         }
 
 
-
-
         return json.getString("task_id");
     }
 
@@ -241,7 +251,6 @@ public class CutTrussTask extends AbstractAcsTask {
     }
 
 
-
     @Override
     public void cancel(String task_id) {
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
index 2d1252cf3..5e652a49b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
@@ -2,6 +2,7 @@ package org.nl.wms.sch.tasks;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -40,6 +41,15 @@ public class InTask extends AbstractAcsTask {
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
 
+            //判断该任务所在的块、排存在其他任务
+            String point_code2 = json.getString("point_code2");
+            JSONObject struct_jo = WQLObject.getWQLObject("ST_IVT_StructAttr").query("struct_code = '"+point_code2+"'").uniqueResult(0);
+            String row_num = struct_jo.getString("row_num");
+            String block_num = struct_jo.getString("block_num");
+            JSONObject task_jo = WQLObject.getWQLObject("ST_IVT_StructAttr").query("block_num = '"+block_num+"' AND row_num = '"+row_num+"' AND lock_type in ('3','6')").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(task_jo)){
+                continue;
+            }
             AcsTaskDto dto = AcsTaskDto.builder()
                     .ext_task_id(json.getString("task_id"))
                     .task_code(json.getString("task_code"))
@@ -124,29 +134,6 @@ public class InTask extends AbstractAcsTask {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String currentUsername = SecurityUtils.getCurrentUsername();
 
-
-        /*JSONObject jo = new JSONObject();
-        jo.put("end_point",next_device_code);
-        jo.put("vehicle_code",vehicle_code);
-        jo.put("storagevehicle_type",form.getString("storagevehicle_type"));
-        jo.put("storagevehicle_id",form.getString("storagevehicle_id"));
-        String task_code = CodeUtil.getNewCode("TASK_CODE");
-        String priority = "0";*/
-        /*TaskDto taskDto = new TaskDto();
-        taskDto.setTask_code(task_code);
-        taskDto.setTask_type(task_type);
-        taskDto.setTaskdtl_type(task_type);
-        taskDto.setStart_point_code(start_device_code);
-        taskDto.setNext_point_code(next_device_code);
-        taskDto.setVehicle_code(vehicle_code);
-        taskDto.setTaskdtl_type(taskdtl_type);
-        taskDto.setHandle_class(this.getClass().getName());
-        taskDto.setFinished_type("00");
-        taskDto.setTask_status("01");
-        taskService.create(taskDto);
-        TaskDto taskDto1 = taskService.findByCode(task_code);*/
-
-
         JSONObject json = new JSONObject();
         json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
         json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
@@ -160,7 +147,7 @@ public class InTask extends AbstractAcsTask {
         json.put("create_name", currentUsername);
         json.put("create_time", DateUtil.now());
         json.put("priority", "1");
-        json.put("acs_task_type", "5");
+        json.put("acs_task_type", "7");
         WQLObject.getWQLObject("SCH_BASE_Task").insert(json);
 
         return json.getString("task_id");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
index e04343687..4e9065fa7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -489,6 +489,9 @@
                 		b.placement_type = a.placement_type
                 	)
                  输入.sql_str
+             ENDSELECT
+         ENDQUERY
+     ENDIF