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 64cac96..2338c0c 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
@@ -248,6 +248,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("task_type")
+ .task_name("共挤线满料")
.task_status(TaskStatusEnum.SURE_START.getCode())
.point_code1(point_code1)
.vehicle_code(vehicle_code)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java
index 44b646a..3a85d27 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java
@@ -213,6 +213,7 @@ public class HkxSendMaterialTask extends AbstractAcsTask {
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("task_type")
+ .task_name("豪凯线满料")
.task_status(TaskStatusEnum.SURE_START.getCode())
.point_code1(point_code1)
.vehicle_code(vehicle_code)
@@ -246,34 +247,4 @@ public class HkxSendMaterialTask extends AbstractAcsTask {
public void cancel(String task_id) {
}
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public String againApply(String task_id) {
- /*
- * 再次下发任务处理方法
- * 涉及业务：入空载具、出空载具、入物料、出物料
- */
-
- WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
- WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表
-
- JSONObject taskObj = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0);
- JSONObject jsonPoint2 = pointTab.query("point_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
-
- // 根据 区域、块、列找到第一个有物料的货位
- JSONObject jsonOnePoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") +
- "' and block_num = '" + jsonPoint2.getString("block_num") +
- "' and col_num = '" + jsonPoint2.getString("col_num") +
- "' and point_status = '1' order by row_num desc").uniqueResult(0);
-
- if (ObjectUtil.isEmpty(jsonOnePoint)) throw new BadRequestException("该列库存状态有误，请检查!");
-
- taskObj.put("point_code3", jsonOnePoint.getString("point_code"));
- taskObj.put("remark", "二次申请货位");
- taskObj.put("update_time", DateUtil.now());
- taskTab.update(taskObj);
-
- return jsonOnePoint.getString("point_code");
- }
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
index 4d1c278..9bf6525 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
@@ -153,6 +153,7 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("task_type")
+ .task_name("油漆线满料")
.task_status(TaskStatusEnum.SURE_START.getCode())
.point_code1(point_code1)
.vehicle_code(vehicle_code)
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 587ec72..46edee5 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -116,7 +116,7 @@
-
+
@@ -124,12 +124,11 @@
-
+
-