diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
index 6bab955..1e73ff8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
@@ -275,7 +275,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
.task_id(org.nl.wms.util.IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("")
- .acs_task_type("3")
+ .acs_task_type("2")
.task_name("养生A区>叠盘架空载具")
.task_status(TaskStatusEnum.START_AND_POINT.getCode())
.point_code1(jsonStartPoint.getString("point_code"))
@@ -319,6 +319,14 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); // 生产工单表
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); //点位基础表
+ //任务表【SCH_BASE_Task】
+ //判断当前点是否有未完成的任务
+ JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + form.getString("point_code2") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+ if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + form.getString("point_code2") + "存在未完成的任务");
+
+
+
+
String point_code2 = form.getString("point_code2");
String sub_device_code = point_code2.substring(0, point_code2.indexOf("_"));
@@ -333,6 +341,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
.task_name("共挤线叫空载具")
.task_status(TaskStatusEnum.SURE_END.getCode())
.point_code2(point_code2)
+ .acs_task_type("2")
.vehicle_code(form.getString("vehicle_code"))
.vehicle_type(workOrderObj.getString("vehicle_type"))
.vehicle_qty(form.getIntValue("qty"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
index f188912..6c70069 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
@@ -283,7 +283,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
.task_id(org.nl.wms.util.IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("")
- .acs_task_type("3")
+ .acs_task_type("2")
.task_name("养生A区>叠盘架空载具")
.task_status(TaskStatusEnum.START_AND_POINT.getCode())
.point_code1(jsonStartPoint.getString("point_code"))
@@ -326,6 +326,14 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); // 生产工单表
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); //点位基础表
+ //任务表【SCH_BASE_Task】
+ //判断当前点是否有未完成的任务
+ JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + form.getString("point_code2") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+ if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + form.getString("point_code2") + "存在未完成的任务");
+
+
+
+
String point_code2 = form.getString("point_code2");
String sub_device_code = point_code2.substring(0, point_code2.indexOf("_"));
@@ -340,6 +348,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
.task_name("油漆线叫空载具")
.task_status(TaskStatusEnum.SURE_END.getCode())
.point_code2(point_code2)
+ .acs_task_type("2")
.vehicle_code(form.getString("vehicle_code"))
.vehicle_type(workOrderObj.getString("vehicle_type"))
.vehicle_qty(form.getIntValue("qty"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
index 29008ae..b9290ca 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
@@ -32,9 +32,6 @@ import java.util.List;
@RequiredArgsConstructor
@Slf4j
public class GjxSendMaterialTask extends AbstractAcsTask {
- //任务步骤描述:task_step 1-创建，2-确定起点，3-确定终点，4-起点终点确认，
- // 5-下发，6-执行，7-二次申请，8-执行，9-完成，10-取消
-
private final String THIS_CLASS = GjxSendMaterialTask.class.getName();
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index dd4bf5f..ae03f3e 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -128,8 +128,8 @@
-
-
+