From 691271930c0c0771c1703d1e89d0f39aef8f4687 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 27 Dec 2022 20:10:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/sch/tasks/BookTwoConfirmTask.java | 2 +- .../org/nl/wms/sch/tasks/CoolCutTask.java | 4 +-- .../org/nl/wms/sch/tasks/CutConveyorTask.java | 2 +- .../org/nl/wms/sch/tasks/CutTrussTask.java | 2 +- .../nl/wms/sch/tasks/EmptyVehicleTask.java | 4 +-- .../java/org/nl/wms/sch/tasks/InTask.java | 6 ++-- .../impl/RawAssistIStorServiceImpl.java | 31 +++++++++---------- .../st/instor/task/HandMoveStorAcsTask.java | 2 +- .../src/views/wms/st/inbill/AddDtl.vue | 3 -- .../src/views/wms/st/inbill/TaskDialog.vue | 2 +- .../src/views/wms/st/outbill/DivDialog.vue | 5 +-- .../src/views/wms/st/outbill/StructIvt.vue | 5 +++ 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java index 7f2afcdae..b0b6e4ea7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java @@ -195,7 +195,7 @@ public class BookTwoConfirmTask extends AbstractAcsTask { json.put("task_id",IdUtil.getSnowflake(1,1).nextId()); json.put("task_code", CodeUtil.getNewCode("TASK_CODE")); json.put("task_type", "05"); - json.put("task_status", "01"); + json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("point_code1", form.getString("start_pint_code")); json.put("point_code2", form.getString("end_pint_code")); json.put("sort_seq", "1"); 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 5997010d1..474368c5e 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 @@ -13,8 +13,6 @@ 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.ext.mes.service.LmsToMesService; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -287,7 +285,7 @@ public class CoolCutTask extends AbstractAcsTask { 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("task_status", "01"); + json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("point_code1", point_code1); json.put("point_code2", point_code2); json.put("point_code3", point_code3); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java index ca7662677..e2e9f9313 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java @@ -176,7 +176,7 @@ public class CutConveyorTask extends AbstractAcsTask { 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("task_status", "01"); + json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("point_code1", point_code1); json.put("point_code2", point_code2); json.put("vehicle_code", form.getString("vehicle_code")); 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 ede8fb241..232cbf9bb 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 @@ -251,7 +251,7 @@ public class CutTrussTask extends AbstractAcsTask { json.put("task_type", form.getString("task_type")); json.put("vehicle_code", form.getString("vehicle_code")); json.put("vehicle_code2", form.getString("vehicle_code2")); - json.put("task_status", "01"); + json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("point_code1", form.getString("point_code1")); json.put("point_code2", form.getString("point_code2")); json.put("point_code3", form.getString("point_code3")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java index bd88505b4..91c4a801c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java @@ -51,7 +51,7 @@ public class EmptyVehicleTask extends AbstractAcsTask { continue; } - char dtl_type = json.getString("acs_task_type").charAt(json.getString("acs_task_type").length()-1); + char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) .task_code(json.getString("task_code")) @@ -154,7 +154,7 @@ public class EmptyVehicleTask extends AbstractAcsTask { json.put("task_code", CodeUtil.getNewCode("TASK_CODE")); json.put("task_type", form.getString("task_type")); json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_status", "01"); + json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("point_code1", point_code1); json.put("point_code2", point_code2); json.put("handle_class", this.getClass().getName()); 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 56c511769..afb71ab44 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 @@ -51,7 +51,7 @@ public class InTask extends AbstractAcsTask { continue; } - char dtl_type = json.getString("acs_task_type").charAt(json.getString("acs_task_type").length()-1); + char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) .task_code(json.getString("task_code")) @@ -77,7 +77,7 @@ public class InTask extends AbstractAcsTask { HashMap map = new HashMap(); //1:执行中,2:完成 ,3:acs取消 if (status.equals("1")) { - map.put("task_status", "03"); + map.put("task_status", TaskStatusEnum.EXECUTING.getCode()); //更新入库单分配任务状态 HashMap dis_map = new HashMap(); dis_map.put("work_status", "02"); @@ -138,7 +138,7 @@ public class InTask extends AbstractAcsTask { json.put("task_code", CodeUtil.getNewCode("TASK_CODE")); json.put("task_type", form.getString("task_type")); json.put("vehicle_code", form.getString("vehicle_code")); - json.put("task_status", "01"); + json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("point_code1", start_device_code); json.put("point_code2", next_device_code); json.put("handle_class", this.getClass().getName()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index 1e6799fc9..561b3ac14 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -60,6 +60,8 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { private final PointService pointService; + private final TaskService taskService; + @Override public Map pageQuery(Map whereJson, Pageable page) { @@ -111,6 +113,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { String end_time = (String) whereJson.get("end_time"); String container_name = (String) whereJson.get("container_name"); String package_box_sn = (String) whereJson.get("package_box_sn"); + String sap_pcsn = (String) whereJson.get("sap_pcsn"); map.put("flag", "2"); if (StrUtil.isNotEmpty(package_box_sn)) { map.put("package_box_sn", package_box_sn); @@ -121,6 +124,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { if (StrUtil.isNotEmpty(bill_code)) { map.put("bill_code", bill_code); } + if (StrUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn", sap_pcsn); + } if (StrUtil.isNotEmpty(material_search)) { map.put("material_search", "%" + material_search + "%"); } @@ -1073,33 +1079,26 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { @Override @Transactional(rollbackFor = Exception.class) public void reIssueTask(Map whereJson) { - //判断指令状态，只能下发生成、执行中状态的任务 - String taskdtl_id = (String) whereJson.get("taskdtl_id"); String task_id = (String) whereJson.get("task_id"); - TaskDto taskDto = new TaskDto(); - /* if (StrUtil.isNotEmpty(taskdtl_id)) { - taskDto = taskService.findByDtlId(taskdtl_id); - } else { - taskDto = taskService.findById(task_id); - }*/ - if (ObjectUtil.isEmpty(taskDto)) { + //判断指令状态，只能下发生成、执行中状态的任务 + JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_id = '"+task_id+"'").uniqueResult(0); + if (ObjectUtil.isEmpty(task_jo)) { throw new BadRequestException("请输入正确的任务号！"); } - if (!taskDto.getTask_status().equals("01")) { - throw new BadRequestException("只能修改任务状态为生成的任务！"); + if (!task_jo.getString("task_status").equals("04")) { + throw new BadRequestException("只能修改任务状态为未下发的任务！"); } AbstractAcsTask task = new InTask(); //调用ACS接受任务接口 - JSONObject result = null; + JSONObject result = task.immediateNotifyAcs(task_id); if (ObjectUtil.isNotEmpty(result)) { String status = result.getString("status"); if ("200".equals(status)) { HashMap map = new HashMap<>(); //更新任务指令为下发 - JSONObject task_jo = new JSONObject(); - task_jo.put("taskdtl_id", ""); - task_jo.put("task_id", taskDto.getTask_id()); - task.updateTaskStatus(task_jo, "1"); + JSONObject task_map = new JSONObject(); + task_map.put("task_id", task_id); + task.updateTaskStatus(task_map, "1"); } else { throw new BadRequestException("任务下发失败:" + result.getString("message")); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java index 018866ded..45a629559 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java @@ -44,7 +44,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { continue; } - char dtl_type = json.getString("acs_task_type").charAt(json.getString("acs_task_type").length()-1); + char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) .task_code(json.getString("task_code")) diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue index a911a9dc7..286185e22 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue @@ -113,9 +113,6 @@ export default { crudMethod: {}, optShow: { reset: true - }, - query: { - createTime: [start.daysAgo(7), new Date()] } }) }, diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue index d7d2231d6..2833b1168 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue @@ -291,7 +291,7 @@ export default { this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO) return } - if (this.dis_row.work_status !== '01') { + if (this.dis_row.work_status !== '04') { this.crud.notify('只能对状态为生成的任务进行下发！', CRUD.NOTIFICATION_TYPE.INFO) return } diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index c301c3b9f..04d57efae 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -529,8 +529,9 @@ export default { }) }, cellStyle({ row, column, rowIndex, columnIndex }) { - const assign_qty = parseInt(row.assign_qty) - const plan_qty = parseInt(row.plan_qty) + debugger + const assign_qty = parseFloat(row.assign_qty) + const plan_qty = parseFloat(row.plan_qty) if (column.property === 'assign_qty') { if (assign_qty > plan_qty) { diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue index 76c15a9de..133f93205 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue @@ -154,6 +154,7 @@ export default { return { dialogVisible: false, dialogVisible2: false, + goal_unassign_qty: 0, queryrow: {}, sects: [], tableDtl: [] @@ -173,6 +174,7 @@ export default { rowmst: { handler(newValue, oldValue) { this.queryrow = newValue + this.goal_unassign_qty = JSON.parse(JSON.stringify(this.queryrow.unassign_qty)) } } }, @@ -230,6 +232,9 @@ export default { this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) + parseFloat(row.canuse_qty) } else { this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(row.canuse_qty) + if (this.queryrow.unassign_qty > this.goal_unassign_qty){ + this.queryrow.unassign_qty = JSON.parse(JSON.stringify(this.goal_unassign_qty)) + } this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) - parseFloat(row.canuse_qty) } this.tableDtl.splice(index, 1, row) // 通过splice 替换数据 触发视图更新