From 8ca94d938e9f9e8bd43fbddd9ba5981041cd3ecf Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Tue, 25 Oct 2022 20:15:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callEmpty/GjxCallEmpVehicleTask.java | 38 ++++++++++++------ .../callEmpty/YqxCallEmpVehicleTask.java | 26 +++++++----- .../tasks/callMaterial/YqxCallMaterial.java | 15 ++++++- .../tasks/sendEmpty/HtSendEmpVehicleTask.java | 18 ++++++++- .../sendEmpty/YqxSendEmpVehicleTask.java | 22 ++++++---- .../sendMaterial/GjxSendMaterialTask.java | 25 ++++++++++-- .../sendMaterial/HkxSendMaterialTask.java | 10 ++++- .../sendMaterial/YqxSendMaterialTask.java | 9 ++++- .../src/main/java/org/nl/wms/wms.xls | Bin 249344 -> 253440 bytes .../src/views/wms/sch/task/index.vue | 1 + 10 files changed, 124 insertions(+), 40 deletions(-) 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 dd1233a..a5fe607 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 @@ -1,7 +1,6 @@ package org.nl.wms.sch.tasks.callEmpty; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -20,6 +19,7 @@ import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.tasks.AcsTaskDto; import org.nl.wms.sch.tasks.RegionTypeEnum; +import org.nl.wms.util.IdUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -142,7 +142,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { pointTab.update(jsonStart); // 更新终点（叠盘架状态） - jsonEnd.put("vehicle_qty", NumberUtil.add(jsonEnd.getString("vehicle_qty"),jsonTask.getString("vehicle_qty"))); + jsonEnd.put("vehicle_qty", NumberUtil.add(jsonEnd.getString("vehicle_qty"), jsonTask.getString("vehicle_qty"))); jsonEnd.put("lock_type", "1"); jsonEnd.put("point_status", "2"); jsonEnd.put("vehicle_type", jsonTask.getString("vehicle_type")); @@ -156,9 +156,9 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { } else { // 终点在供给线线: 更新起点（叠盘架）数量 JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - jsonStart.put("vehicle_qty",NumberUtil.sub(jsonStart.getString("vehicle_qty"),"1")); + jsonStart.put("vehicle_qty", NumberUtil.sub(jsonStart.getString("vehicle_qty"), "1")); jsonStart.put("lock_type", "1"); - if (StrUtil.equals(jsonStart.getString("vehicle_qty"),"0")) { + if (StrUtil.equals(jsonStart.getString("vehicle_qty"), "0")) { jsonStart.put("point_status", "1"); jsonStart.put("vehicle_type", ""); } @@ -213,6 +213,8 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { .task_id(org.nl.wms.util.IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") + .acs_task_type("2") + .task_name("暂存位->叠盘架空载具") .task_status(TaskStatusEnum.START_AND_POINT.getCode()) .point_code1(jsonZcKtp.getString("point_code")) .point_code2(jsonDpjStart2.getString("point_code")) @@ -242,12 +244,14 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(jsonStartPoint)) continue; // 判断找到的空载具点位是否是等待点 - if (StrUtil.equals(jsonEmpWait.getString("point_code"),jsonStartPoint.getString("point_code"))) { + if (StrUtil.equals(jsonEmpWait.getString("point_code"), jsonStartPoint.getString("point_code"))) { // 创建 养生A区空载具等待点 --> 叠盘架 SchTaskDto dto = SchTaskDto.builder() - .task_id(org.nl.wms.util.IdUtil.getLongId()) + .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") + .acs_task_type("2") + .task_name("养生A区-> 叠盘架空载具") .task_status(TaskStatusEnum.START_AND_POINT.getCode()) .point_code1(jsonStartPoint.getString("point_code")) .point_code2(jsonDpjStart2.getString("point_code")) @@ -271,6 +275,8 @@ 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") + .task_name("养生A区>叠盘架空载具") .task_status(TaskStatusEnum.START_AND_POINT.getCode()) .point_code1(jsonStartPoint.getString("point_code")) .point_code2(jsonDpjStart2.getString("point_code")) @@ -287,7 +293,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { jsonStartPoint.put("lock_type", "2"); pointTab.update(jsonStartPoint); // 锁等待点 - jsonEmpWait.put("lock_type","2"); + jsonEmpWait.put("lock_type", "2"); pointTab.update(jsonEmpWait); } else { continue; @@ -323,20 +329,20 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") + .task_name("共挤线叫空载具") .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code2(point_code2) .vehicle_code(form.getString("vehicle_code")) .vehicle_type(workOrderObj.getString("vehicle_type")) .vehicle_qty(form.getIntValue("qty")) - .task_group_id(org.nl.wms.util.IdUtil.getLongId()) + .task_group_id(IdUtil.getLongId()) .handle_class(THIS_CLASS) .create_time(DateUtil.now()) .build(); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); taskTab.insert(json); - this.findStartPoint(); -// this.immediateNotifyAcs(); + this.immediateNotifyAcs(); return String.valueOf(dto.getTask_id()); } @@ -357,16 +363,24 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { /* * 下发给ACS时需要特殊处理 */ - JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '"+THIS_CLASS+"' and task_status = '"+TaskStatusEnum.START_AND_POINT.getCode()+"' and is_delete ='0'").getResultJSONArray(0); + JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); + + String point_code1 = json.getString("point_code1"); + //判断起点是否属于养生A区 + if (point_code1.startsWith("2")) { + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9); + } + AcsTaskDto dto = AcsTaskDto.builder() .task_id(json.getString("task_id")) .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) + .start_device_code(point_code1) .next_device_code(json.getString("point_code3")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) 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 91b5d58..4bdcb9d 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 @@ -1,7 +1,6 @@ package org.nl.wms.sch.tasks.callEmpty; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -15,20 +14,14 @@ import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.pdm.service.DeviceService; -import org.nl.wms.pdm.service.dto.DeviceDto; import org.nl.wms.sch.SchTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.sch.tasks.AcsTaskDto; import org.nl.wms.sch.tasks.RegionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -225,6 +218,8 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { .task_id(org.nl.wms.util.IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") + .acs_task_type("2") + .task_name("暂存位>叠盘架空载具") .task_status(TaskStatusEnum.START_AND_POINT.getCode()) .point_code1(jsonZcKtp.getString("point_code")) .point_code2(jsonDpjStart2.getString("point_code")) @@ -260,6 +255,8 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { .task_id(org.nl.wms.util.IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") + .acs_task_type("2") + .task_name("养生A区>叠盘架空载具") .task_status(TaskStatusEnum.START_AND_POINT.getCode()) .point_code1(jsonStartPoint.getString("point_code")) .point_code2(jsonDpjStart2.getString("point_code")) @@ -283,6 +280,8 @@ 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") + .task_name("养生A区>叠盘架空载具") .task_status(TaskStatusEnum.START_AND_POINT.getCode()) .point_code1(jsonStartPoint.getString("point_code")) .point_code2(jsonDpjStart2.getString("point_code")) @@ -335,6 +334,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") + .task_name("油漆线叫空载具") .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code2(point_code2) .vehicle_code(form.getString("vehicle_code")) @@ -347,8 +347,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); taskTab.insert(json); - this.findStartPoint(); -// this.immediateNotifyAcs(); + this.immediateNotifyAcs(); return String.valueOf(dto.getTask_id()); } @@ -375,11 +374,18 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); + String point_code1 = json.getString("point_code1"); + //判断起点是否属于养生A区 + if (point_code1.startsWith("2")) { + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9); + } + AcsTaskDto dto = AcsTaskDto.builder() .task_id(json.getString("task_id")) .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) + .start_device_code(point_code1) .next_device_code(json.getString("point_code3")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java index 81f92bd..33e1f60 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java @@ -195,11 +195,15 @@ public class YqxCallMaterial extends AbstractAcsTask { ArrayList acsTaskArr = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + String point_code =json.getString("point_code1"); + String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + AcsTaskDto dto = AcsTaskDto.builder() .task_id(json.getString("task_id")) .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) + .start_device_code(newPoint) .next_device_code(json.getString("point_code3")) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) @@ -231,6 +235,8 @@ public class YqxCallMaterial extends AbstractAcsTask { .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("task_type") + .task_name("油漆线叫料") + .material_qty(qty) .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code2(point_code2) .vehicle_code(vehicle_code) @@ -291,6 +297,11 @@ public class YqxCallMaterial extends AbstractAcsTask { taskObj.put("update_time", DateUtil.now()); taskTab.update(taskObj); - return taskObj.getString("point_code3"); + + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + String point_code =taskObj.getString("point_code3"); + String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + + return newPoint; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java index 412a765..a5bf266 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java @@ -129,6 +129,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask { SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") + .task_name("电梯送空载具") .task_status(TaskStatusEnum.SURE_START.getCode()) .point_code1(point_code1) .vehicle_code(form.getString("vehicle_code")) @@ -392,7 +393,11 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask { jsonEndPoint.put("lock_type", "2"); pointTab.update(jsonEndPoint); } - + //判断点位是否属于养生A区 + if (point_code.startsWith("2")) { + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + } return point_code; } @@ -406,12 +411,21 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask { ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); + + String point_code3=json.getString("point_code3"); + //判断终点是否属于养生A区 + if (point_code3.startsWith("2")) { + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9); + } + + AcsTaskDto dto = AcsTaskDto.builder() .task_id(json.getString("task_id")) .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) + .next_device_code(point_code3) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java index 2fc7fb8..4177b9b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java @@ -1,7 +1,6 @@ package org.nl.wms.sch.tasks.sendEmpty; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -11,9 +10,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.SchTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -197,7 +194,6 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { } - @Override public void cancel(String task_id) { @@ -349,7 +345,11 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { jsonEndPoint.put("lock_type", "2"); pointTab.update(jsonEndPoint); } - + //判断点位是否属于养生A区 + if (point_code.startsWith("2")) { + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + } return point_code; } @@ -358,17 +358,25 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { /* * 下发给ACS时需要特殊处理 */ - JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '"+THIS_CLASS+"' and task_status = '"+TaskStatusEnum.START_AND_POINT.getCode()+"' and is_delete ='0'").getResultJSONArray(0); + JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); + String point_code3 = json.getString("point_code3"); + //判断终点是否属于养生A区 + if (point_code3.startsWith("2")) { + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9); + } + + AcsTaskDto dto = AcsTaskDto.builder() .task_id(json.getString("task_id")) .task_code(json.getString("task_code")) .task_type(json.getString("task_type")) .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) + .next_device_code(point_code3) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) 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 b042d82..6346282 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 @@ -217,12 +217,16 @@ public class GjxSendMaterialTask extends AbstractAcsTask { ArrayList acsTaskArr = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + String point_code = json.getString("point_code3"); + String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + AcsTaskDto dto = AcsTaskDto.builder() .task_id(json.getString("task_id")) .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) + .next_device_code(newPoint) .vehicle_code(json.getString("vehicle_code")) .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) @@ -244,11 +248,20 @@ public class GjxSendMaterialTask extends AbstractAcsTask { WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); //点位基础表【SCH_BASE_Point】 WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); + + //任务表【SCH_BASE_Task】 + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + //判断当前点是否有未完成的任务 + JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务"); + String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code"); + JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); + SchTaskDto dto = SchTaskDto.builder() .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) @@ -257,6 +270,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { .task_status(TaskStatusEnum.SURE_START.getCode()) .point_code1(point_code1) .vehicle_code(vehicle_code) + .material_qty(qty) .material_info_id(workOrderObj.getLong("workorder_id")) .material_id(workOrderObj.getLong("material_id")) .vehicle_type(vehicle_type) @@ -264,8 +278,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { .create_time(DateUtil.now()) .request_param(whereJson.toJSONString()) .build(); - //任务表【SCH_BASE_Task】 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); taskTab.insert(json); @@ -315,9 +328,13 @@ public class GjxSendMaterialTask extends AbstractAcsTask { taskObj.put("update_time", DateUtil.now()); taskTab.update(taskObj); + //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) + String point_code = jsonOnePoint.getString("point_code"); + String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + // 点位上锁 jsonOnePoint.put("lock_type", "2"); pointTab.update(jsonOnePoint); - return jsonOnePoint.getString("point_code"); + return newPoint; } } 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 4e966ba..3848674 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 @@ -207,6 +207,13 @@ public class HkxSendMaterialTask extends AbstractAcsTask { String vehicle_code = whereJson.getString("vehicle_code"); String qty = whereJson.getString("qty"); + + //任务表【SCH_BASE_Task】 + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + //判断当前点是否有未完成的任务 + JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务"); + //生产工单表【PDM_BD_WorkOrder】 WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); //点位基础表【SCH_BASE_Point】 @@ -221,6 +228,7 @@ public class HkxSendMaterialTask extends AbstractAcsTask { .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("task_type") .task_name("豪凯线满料") + .material_qty(qty) .task_status(TaskStatusEnum.SURE_START.getCode()) .point_code1(point_code1) .vehicle_code(vehicle_code) @@ -231,8 +239,6 @@ public class HkxSendMaterialTask extends AbstractAcsTask { .create_time(DateUtil.now()) .request_param(whereJson.toJSONString()) .build(); - //任务表【SCH_BASE_Task】 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); taskTab.insert(json); 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 9bf6525..e71d70a 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 @@ -144,6 +144,14 @@ public class YqxSendMaterialTask extends AbstractAcsTask { WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); //点位基础表【SCH_BASE_Point】 WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); + + //任务表【SCH_BASE_Task】 + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + //判断当前点是否有未完成的任务 + JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务"); + + String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code"); JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); @@ -166,7 +174,6 @@ public class YqxSendMaterialTask extends AbstractAcsTask { .request_param(whereJson.toJSONString()) .build(); //任务表【SCH_BASE_Task】 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); taskTab.insert(json); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 68791520e7151b6674a1645c5f1ff811d60dd706..855cacce10109e67b811472a8b808c2523c5c636 100644 GIT binary patch delta 12462 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 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 73d49c2..0d37c08 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -116,6 +116,7 @@ +