From a94a274cbf97a53ad82bb6be031a0b932d7a7cbd Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sun, 29 Jan 2023 10:10:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=85=BB=E7=94=9F=E5=8C=BA=E6=95=B4=E5=88=97?= =?UTF-8?q?=E9=94=81=E5=AE=9A=E3=80=81=E6=B7=BB=E5=8A=A0=E4=BE=9B=E7=BB=99?= =?UTF-8?q?=E7=BA=BF=E5=88=A4=E6=96=AD=E5=8E=BB=E8=B4=A7=E6=A2=AF=E5=8F=A3?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E5=85=BB=E7=94=9F=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HailiangSmartplcTestDeviceDriver.java | 8 - .../wms/service/impl/WmsToAcsServiceImpl.java | 2 - .../task/service/impl/TaskServiceImpl.java | 14 +- .../service/impl/MaterialbaseServiceImpl.java | 1 + .../nl/wms/pdm/service/dto/WorkorderDto.java | 3 + .../org/nl/wms/sch/rest/PointController.java | 1 - .../wms/sch/service/impl/TaskServiceImpl.java | 4 + .../java/org/nl/wms/sch/tasks/AcsTaskDto.java | 2 + .../callEmpty/GjxCallEmpVehicleTask.java | 10 +- .../callEmpty/YqxCallEmpVehicleTask.java | 7 +- .../tasks/sendEmpty/HtSendEmpVehicleTask.java | 4 +- .../sendEmpty/YqxSendEmpVehicleTask.java | 4 +- .../sendMaterial/GjxSendMaterialTask.java | 145 ++++++++++++------ .../sendMaterial/YqxSendMaterialTask.java | 7 +- .../wql/QSCH_gjxSendMaterial_01.wql | 8 +- .../wms/sch/tasks/utils/PointUpdateUtil.java | 1 + .../org/nl/wms/sch/wql/QSCH_BASE_POINT.wql | 4 +- .../java/org/nl/wms/sch/wql/QSCH_TASK_01.wql | 2 +- .../src/main/java/org/nl/wms/wms.xls | Bin 258560 -> 259584 bytes .../src/views/wms/basedata/vehicle/index.vue | 6 +- .../src/views/wms/pdm/workerorder/index.vue | 26 +++- .../src/views/wms/sch/point/ViewDialog.vue | 16 +- .../src/views/wms/sch/point/index.vue | 1 + .../src/views/wms/sch/task/index.vue | 25 +-- 24 files changed, 193 insertions(+), 108 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_smart_plc_test/HailiangSmartplcTestDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_smart_plc_test/HailiangSmartplcTestDeviceDriver.java index b5235fc..82f3bce 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_smart_plc_test/HailiangSmartplcTestDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_smart_plc_test/HailiangSmartplcTestDeviceDriver.java @@ -182,9 +182,7 @@ public class HailiangSmartplcTestDeviceDriver extends AbstractOpcDeviceDriver im break; case 4: //申请空盘 - System.out.println("执行到mode = 4了,此时move = " + move + ",requireSucess = " + requireSucess); if (move == 0 && !requireSucess) { - System.out.println("进入到申请空盘的任务了,mode = " + mode); Date date = new Date(); if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); @@ -200,17 +198,13 @@ public class HailiangSmartplcTestDeviceDriver extends AbstractOpcDeviceDriver im if (res_jo.getString("status").equals("200")) { logServer.deviceExecuteLog(device_code, "", "", "空盘任务申请成功-"); requireSucess = true; - } else { - System.out.println("申请满托入库失败" + String.valueOf(res_jo)); } } } break; case 5: - System.out.println("执行到mode = 5了,此时move = " + move + ",requireSucessFullIn = " + requireSucessFullIn); //满托入库 if (move == 1 && !requireSucessFullIn) { - System.out.println("进入到申请空盘的任务了,mode = " + mode); Date date = new Date(); if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); @@ -227,8 +221,6 @@ public class HailiangSmartplcTestDeviceDriver extends AbstractOpcDeviceDriver im if (res_jo.getString("status").equals("200")) { requireSucessFullIn = true; logServer.deviceExecuteLog(device_code, "", "", "满托入库任务申请成功-"); - } else { - System.out.println("申请满托入库失败" + String.valueOf(res_jo)); } } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 1767f31..4c6e24b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -88,7 +88,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String task_type = task.getString("task_type"); String remark = task.getString("remark"); String params = task.getString("params"); - String vehicle_qty = task.getString("vehicle_qty"); if (start_point_code.indexOf("-") > 0) { String str[] = start_point_code.split("-"); @@ -138,7 +137,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("vehicle_type", vehicle_type); jo.put("remark", remark); jo.put("params", params); - jo.put("emptypallet_num", vehicle_qty); jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type)); if (!StrUtil.isEmpty(ext_task_id)) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index bde332c..0caad2f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -248,7 +248,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { public List queryAllUnfinished(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONArray arr = wo.query("task_status < 2 ").getResultJSONArray(0); - List list = arr.toJavaList(TaskDto.class); + List list =arr.toJavaList(TaskDto.class); return list; } @@ -390,7 +390,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); wo.insert(json); tasks.add(dto); @@ -492,7 +492,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } if (ObjectUtil.isNotEmpty(this.findByStartCode(start_device_code)) - || ObjectUtil.isNotEmpty(this.findByNextCode(next_device_code))) { + || ObjectUtil.isNotEmpty(this.findByNextCode(next_device_code))) { throw new WDKException("已存在该起点或终点的任务!"); } if (StrUtil.equals(material_type, "") || StrUtil.equals(quantity, "")) { @@ -523,7 +523,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { dto.setUpdate_by(currentUsername); WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); wo.update(json); @@ -787,7 +787,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { JSONObject feed_jo = new JSONObject(); feed_jo.put("ext_task_id", entity.getExt_task_id()); feed_jo.put("task_code", entity.getTask_code()); - feed_jo.put("task_status", "0"); + feed_jo.put("task_status", entity.getTask_status()); JSONArray ja = new JSONArray(); ja.add(feed_jo); acstowmsService.feedbackTaskStatusToWms(ja); @@ -1215,7 +1215,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } @Override - public Integer queryStartNum(String start_code, String next_code) { + public Integer queryStartNum(String start_code,String next_code) { int num = 0; Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -1228,7 +1228,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } @Override - public Integer queryEndNum(String next_code, String start_code) { + public Integer queryEndNum(String next_code,String start_code) { int num = 0; Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java index 8b69b3f..01307b7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java @@ -145,6 +145,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { dto.setUpdate_optname(nickName); dto.setUpdate_time(now); dto.setCreate_time(now); + dto.setBase_unit_id(15); WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java index b4c2586..d864d69 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java @@ -90,4 +90,7 @@ public class WorkorderDto implements Serializable { /** 修改时间 */ private String update_time; + + /** 工单类型 **/ + private String workorder_type; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java index 7310c4e..87afafc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java @@ -2,7 +2,6 @@ package org.nl.wms.sch.rest; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index e3251ff..37f93b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -54,6 +54,10 @@ public class TaskServiceImpl implements TaskService { if (StrUtil.isNotEmpty(task_status)) { task_status = task_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); } + String moreTaskStatus = whereJson.getString("more_task_status"); + if (ObjectUtil.isNotEmpty(moreTaskStatus)) { + task_status = moreTaskStatus; + } map.put("task_status", task_status); //处理状态为未完成 if (StrUtil.isNotEmpty(task_status) && task_status.contains("-1")) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/AcsTaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/AcsTaskDto.java index c76d653..e6db861 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/AcsTaskDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/AcsTaskDto.java @@ -28,5 +28,7 @@ public class AcsTaskDto { private String params; //路由类型 private String route_plan_code; + // 载具数量 + private String vehicle_qty; } 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 e11d4ab..ae3e029 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 @@ -181,7 +181,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { // 创建任务 JSONObject jsonTask = taskArr.getJSONObject(i); String vehicle_type = jsonTask.getString("vehicle_type"); - // 更新点位 + // 更新点位 更新所有叠盘架B Map query = new HashMap<>(); query.put("flag", "2"); query.put("region_code", RegionTypeEnum.DPJQB.getCode()); @@ -192,7 +192,8 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { JSONObject jsonDpjStart = pointTab.query("region_code = '" + RegionTypeEnum.DPJQB.getCode() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty <> '0'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonDpjStart)) { - // 判断叠盘架是否有任务 有就下一个任务 + // todo + // 判断叠盘架是否有任务 有就下一个任务 : 可以去除 boolean is_point = this.isTask(jsonDpjStart.getString("point_code")); if (!is_point) continue; @@ -210,10 +211,12 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { JSONObject jsonDpjStart2 = pointTab.query("region_id = '" + RegionTypeEnum.DPJQB.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty = '0'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonDpjStart2)) continue; + // todo: 删除任务校验 // 判断叠盘架是否有任务 boolean is_point = this.isTask(jsonDpjStart2.getString("point_code")); if (!is_point) continue; + // todo: 如何知道缓存位是否有空托盘 // 找叠盘架暂存位是否有空托盘 JSONObject map = new JSONObject(); map.put("flag", "1"); @@ -357,7 +360,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { .acs_task_type("2") .vehicle_code(form.getString("vehicle_code")) .vehicle_type(workOrderObj.getString("vehicle_type")) - .vehicle_qty(form.getIntValue("qty")) + .vehicle_qty(1) .task_group_id(IdUtil.getLongId()) .handle_class(THIS_CLASS) .create_time(DateUtil.now()) @@ -420,6 +423,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) .remark(json.getString("remark")) + .vehicle_qty(json.getString("vehicle_qty")) .build(); resultList.add(dto); } 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 2b47722..79b2e60 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 @@ -89,7 +89,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { taskTab.delete("task_id = '" + task_id + "'"); } - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { + if (StrUtil.equals(status, "1")) { // 更新任务状态为执行中 jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); jsonTask.put("update_time", DateUtil.now()); @@ -97,7 +97,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { taskTab.update(jsonTask); } - if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { + if (StrUtil.equals(status, "2")) { /* * 更改任务状态为完成 * 1.终点为叠盘架更新叠盘架数量、起点点位状态、等待位状态，更新任务组状态 @@ -364,7 +364,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { .acs_task_type("2") .vehicle_code(form.getString("vehicle_code")) .vehicle_type(workOrderObj.getString("vehicle_type")) - .vehicle_qty(form.getIntValue("qty")) + .vehicle_qty(1) .task_group_id(org.nl.wms.util.IdUtil.getLongId()) .handle_class(THIS_CLASS) .create_time(DateUtil.now()) @@ -427,6 +427,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { .vehicle_type(json.getString("vehicle_type")) .priority(json.getString("priority")) .remark(json.getString("remark")) + .vehicle_qty(json.getString("vehicle_qty")) .build(); resultList.add(dto); } 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 4e4d26e..e4f0039 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 @@ -61,7 +61,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask { taskTab.delete("task_id = '" + task_id + "'"); } - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { + if (StrUtil.equals(status, "1")) { // 更新任务状态为执行中 jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); jsonTask.put("update_time", DateUtil.now()); @@ -69,7 +69,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask { taskTab.update(jsonTask); } - if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { + if (StrUtil.equals(status, "2")) { // 更改任务状态为完成 jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("update_time", DateUtil.now()); 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 10bbbfb..20dd5c7 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 @@ -59,7 +59,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { taskTab.delete("task_id = '" + task_id + "'"); } - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { + if (StrUtil.equals(status, "1")) { // 更新任务状态为执行中 jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); jsonTask.put("update_time", DateUtil.now()); @@ -67,7 +67,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { taskTab.update(jsonTask); } - if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { + if (StrUtil.equals(status, "2")) { // 更改任务状态为完成 jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("update_time", DateUtil.now()); 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 65aed4d..a7616fa 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 @@ -17,6 +17,7 @@ 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.tasks.AcsTaskDto; +import org.nl.wms.sch.tasks.utils.PointUpdateUtil; import org.nl.wms.util.IdUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,10 +41,11 @@ public class GjxSendMaterialTask extends AbstractAcsTask { public void updateTaskStatus(JSONObject task, String status) { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); String task_id = task.getString("task_id"); JSONObject taskObj = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - + String workOrderId = taskObj.getString("material_info_id"); //任务取消 if (StrUtil.equals(status, "0")) { // 取消删除任务 @@ -84,8 +86,19 @@ public class GjxSendMaterialTask extends AbstractAcsTask { // 更改任务状态为完成 taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); taskObj.put("update_time", DateUtil.now()); + taskObj.put("remark", "任务执行完成"); taskTab.update(taskObj); + JSONObject order = orderTab.query("workorder_id = '" + workOrderId + "'").uniqueResult(0); + if (order.getString("workorder_type").equals("1")) { + // 货梯口 + String point_code2 = taskObj.getString("point_code2"); + JSONObject param = new JSONObject(); + param.put("lock_type", "1"); + param.put("point_status", "3"); + pointTab.update(param, "point_code = '" + point_code2 + "'"); + } + String point_code2 = taskObj.getString("point_code2"); JSONObject endPoint = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); @@ -146,24 +159,56 @@ public class GjxSendMaterialTask extends AbstractAcsTask { public void findNextPoint() { //判断共挤线是否有执行中的任务，如果任务数>=3,则不生成任务 WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - /* + WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); + /** * 根据业务找对应的终点 */ WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0); for (int i = 0; i < taskArr.size(); i++) { JSONObject taskObj = taskArr.getJSONObject(i); + String task_id = taskObj.getString("task_id"); String material_id = taskObj.getString("material_id"); String vehicle_type = taskObj.getString("vehicle_type"); + String workOrderId = taskObj.getString("material_info_id"); // 工单号 + // 获取工单判断是去养生区还是货梯口 + JSONObject workOrder = orderTab.query("workorder_id = '" + workOrderId + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(workOrder)) throw new BadRequestException("工单不能为空"); + if (workOrder.getString("workorder_type").equals("1")) { // 机采去货梯扣 + // 更新点位 + JSONArray ssxArray = WQL.getWO("QSCH_yqxSendMaterial_01").addParam("flag", "2").process().getResultJSONArray(0); + PointUpdateUtil.updatePoint(ssxArray); + JSONObject param = new JSONObject(); + param.put("flag", "1"); + JSONObject endPoint = WQL.getWO("QSCH_yqxSendMaterial_01").addParamMap(param).process().uniqueResult(0); + if (ObjectUtil.isEmpty(endPoint)) { + taskObj.put("remark", "电梯无可用点"); + taskObj.put("update_time", DateUtil.now()); + taskTab.update(taskObj); + } else { + //锁住点位 + endPoint.put("lock_type", "2"); + endPoint.put("task_id", task_id); + pointTab.update(endPoint); + + //修改任务状态 + taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + taskObj.put("remark", ""); + taskObj.put("point_code2", endPoint.getString("point_code")); + taskObj.put("update_time", DateUtil.now()); + taskTab.update(taskObj); + } + return; + } JSONObject param1 = new JSONObject(); param1.put("flag", "1"); param1.put("material_id", material_id); param1.put("region_code", "YSQA01"); - param1.put("vehicle_type", "%" + vehicle_type + "%"); + param1.put("vehicle_type", vehicle_type ); //1、查找库区类是否有响应的载具类型和对应的物料 + // json1: 对应相同物料的点位 JSONObject json1 = WQL.getWO("QSCH_gjxSendMaterial_01").addParamMap(param1).process().uniqueResult(0); - //判断是否有到同一列的相同物料SKU的AGV任务，如果有，则等待 JSONArray taskIngs = taskTab.query("is_delete='0' and material_id = '" + material_id + "' and (task_status = '4' or task_status = '5' or task_status = '6' )").getResultJSONArray(0); @@ -181,59 +226,68 @@ public class GjxSendMaterialTask extends AbstractAcsTask { } - if (ObjectUtil.isNotEmpty(json1)) { + if (ObjectUtil.isNotEmpty(json1)) { // json1: 对应相同物料的点位 Integer block_num = json1.getInteger("block_num"); Integer col_num = json1.getInteger("col_num"); Integer row_num = json1.getInteger("row_num"); - - JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num ='" + (col_num - 1) + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!"); - taskObj.put("point_code2", firstRow.getString("point_code")); - taskObj.put("update_time", DateUtil.now()); - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - //二楼普通任务 - taskTab.update(taskObj); - //锁住相关货位 - JSONObject point = new JSONObject(); - point.put("lock_type", "2"); - point.put("task_id", taskObj.getString("task_id")); - pointTab.update(point, "block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num <= '" + (col_num - 1) + "'"); - - } else {//找空位入 - if (ObjectUtil.isNotEmpty(taskIngs) && taskIngs.size() > 1) { - taskObj.put("remark", "相应列有AGV在工作,等待执行!"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - continue; - } - - JSONObject param2 = new JSONObject(); - param2.put("flag", "2"); - param2.put("region_code", "YSQA01"); - param2.put("vehicle_type", "%" + vehicle_type + "%"); - //1、查找整列为空的货位 - JSONObject json2 = WQL.getWO("QSCH_gjxSendMaterial_01").addParamMap(param2).process().uniqueResult(0); - if (ObjectUtil.isEmpty(json2)) { - taskObj.put("remark", "养生A区无可用货位"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } else { - Integer block_num = json2.getInteger("block_num"); - Integer row_num = json2.getInteger("row_num"); - JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num ='9'").uniqueResult(0); + if (col_num != 1) {// 物料位在第一个位置说明已经叠满了 + // 因为找到的是对应相同的物料点，所以是下一个位置 + JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and lock_type = '1' and point_status = '1' and is_used = '1' and is_delete = '0'", "col_num desc").uniqueResult(0); // and col_num ='" + (col_num - 1) + "' + if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!"); taskObj.put("point_code2", firstRow.getString("point_code")); - //二楼普通任务 - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); taskObj.put("update_time", DateUtil.now()); + taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + //二楼普通任务 taskTab.update(taskObj); //锁住相关货位 JSONObject point = new JSONObject(); point.put("lock_type", "2"); - point.put("task_id", taskObj.getString("task_id")); - pointTab.update(point, "block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num <= '" + 9 + "'"); + pointTab.update(point, "point_code = '" + firstRow.getString("point_code") + "'"); + return; +// JSONObject point = new JSONObject(); +// point.put("lock_type", "2"); +// point.put("task_id", taskObj.getString("task_id")); +// pointTab.update(point, "block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num <= '" + (col_num - 1) + "'"); } } + //找空位入: 物料点查找在第一列或者是没有找到物料点 + if (ObjectUtil.isNotEmpty(taskIngs) && taskIngs.size() > 1) { + taskObj.put("remark", "相应列有AGV在工作,等待执行!"); + taskObj.put("update_time", DateUtil.now()); + taskTab.update(taskObj); + continue; + } + + JSONObject param2 = new JSONObject(); + param2.put("flag", "2"); + param2.put("region_code", "YSQA01"); + param2.put("vehicle_type",vehicle_type); + //1、查找整列为空的货位 + JSONObject json2 = WQL.getWO("QSCH_gjxSendMaterial_01").addParamMap(param2).process().uniqueResult(0); + if (ObjectUtil.isEmpty(json2)) { + taskObj.put("remark", "养生A区无可用货位"); + taskObj.put("update_time", DateUtil.now()); + taskTab.update(taskObj); + } else { + Integer block_num = json2.getInteger("block_num"); + Integer row_num = json2.getInteger("row_num"); + Integer sum = json2.getInteger("sum"); + JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and lock_type = '1' and point_status = '1' and is_used = '1' and is_delete = '0'", "col_num desc").uniqueResult(0); // and col_num = '" + sum + "' + taskObj.put("point_code2", firstRow.getString("point_code")); + //二楼普通任务 + taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + taskObj.put("update_time", DateUtil.now()); + taskTab.update(taskObj); + //锁住相关货位 + JSONObject point = new JSONObject(); + point.put("lock_type", "2"); + pointTab.update(point, "point_code = '" + firstRow.getString("point_code") + "'"); +// JSONObject point = new JSONObject(); +// point.put("lock_type", "2"); +// point.put("task_id", taskObj.getString("task_id")); +// pointTab.update(point, "block_num = '" + block_num + "' and row_num = '" + row_num + "' and col_num <= '" + sum + "'"); // 9 + } } } @@ -273,7 +327,6 @@ public class GjxSendMaterialTask extends AbstractAcsTask { @Override public String createTask(JSONObject whereJson) { String point_code1 = whereJson.getString("point_code1"); - String vehicle_type = whereJson.getString("vehicle_type"); String vehicle_code = whereJson.getString("vehicle_code"); String qty = whereJson.getString("qty"); 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 c0af6f2..a3d3b32 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 @@ -67,7 +67,7 @@ public class YqxSendMaterialTask extends AbstractAcsTask { taskTab.update(jsonTask); } - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { + if (StrUtil.equals(status, "1")) { //更新任务状态为执行中 jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); jsonTask.put("update_time", DateUtil.now()); @@ -75,7 +75,7 @@ public class YqxSendMaterialTask extends AbstractAcsTask { taskTab.update(jsonTask); } - if (TaskStatusEnum.FINISHED.getCode().equals(status)) { + if (StrUtil.equals(status, "2")) { // 更新任务状态为完成 jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); @@ -130,8 +130,7 @@ public class YqxSendMaterialTask extends AbstractAcsTask { //修改任务状态 taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); taskObj.put("point_code2", endPoint.getString("point_code")); - taskObj.put("update_optid", SecurityUtils.getCurrentUserId()); - taskObj.put("update_optname", SecurityUtils.getCurrentNickName()); + taskObj.put("remark", ""); taskObj.put("update_time", DateUtil.now()); taskTab.update(taskObj); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql index 29b1351..c9282ab 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql @@ -57,7 +57,7 @@ AND is_delete = '0' AND lock_type = '1' AND point_status = '3' - and col_num>1 + and col_num>=1 OPTION 输入.material_id <> "" p.material_id = 输入.material_id ENDOPTION @@ -65,7 +65,7 @@ p.region_code = 输入.region_code ENDOPTION OPTION 输入.vehicle_type <> "" - p.can_vehicle_type like 输入.vehicle_type + p.can_vehicle_type like "%" 输入.vehicle_type "%" ENDOPTION ORDER BY block_num,row_num,col_num ENDSELECT @@ -87,10 +87,10 @@ AND point_status = '1' AND lock_type = '1' OPTION 输入.vehicle_type <> "" - p.can_vehicle_type like 输入.vehicle_type + p.can_vehicle_type like "%" 输入.vehicle_type "%" ENDOPTION GROUP BY block_num,row_num - HAVING sum = 9 + HAVING sum in ('9','13') ORDER BY block_num,row_num ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java index 9554e22..81898aa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java @@ -32,6 +32,7 @@ public class PointUpdateUtil { if (pointObj2.getString("region_code").equals(RegionTypeEnum.DPJQB.getCode())) { // 碟盘机 String vehicleNum = pointObj.getString("vehicle_num"); pointObj2.put("vehicle_qty", vehicleNum); + pointObj2.put("point_status", vehicleNum.equals("0")?"1":"2"); pointTable.update(pointObj2); } else if (pointObj2.getString("region_code").equals(RegionTypeEnum.SSX.getCode())) { String move = pointObj.getString("move"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql index e139c90..5a35f1d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql @@ -54,7 +54,9 @@ SELECT point.*, d3.label as lock_type_name, - ma.material_name + ma.material_name, + ma.material_code, + ma.material_spec FROM sch_base_point point LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql index 729b8ca..91351d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql @@ -72,7 +72,7 @@ task.create_time <= 输入.end_time ENDOPTION OPTION 输入.unFinish <> "" - task.task_status <> '07' + task.task_status <> '7' ENDOPTION OPTION 输入.task_status <> "" find_in_set( task.task_status, 输入.task_status) 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 9bd0cbb655d68ea3a2bdfa736a12789bdc615bc5..11fdae97046cd7ae7dddd24fd6394a4c52c14ce4 100644 GIT binary patch delta 12650 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 W$zRSBUUPV3fz;iU_Ya?E_J085L5pet delta 12090 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 diff --git a/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue b/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue index 739f100..a9ca01d 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue @@ -202,8 +202,9 @@ export default { // 打印纸张大小设置https://www.it610.com/article/2094844.html LODOP.SET_PRINT_PAGESIZE(1, '100mm', '60mm', '1') // LODOP.ADD_PRINT_RECT('0mm', '0mm', '50mm', '30mm', 0, 1) - LODOP.ADD_PRINT_BARCODE('4.3mm', '6.2mm', '60mm', '40mm', '128Auto', item) + LODOP.ADD_PRINT_BARCODE('10mm', '15mm', '80mm', '38mm', '128Auto', item) LODOP.SET_PRINT_STYLEA(0, 'Horient', 2) // 设置对象在纸张范围内水平居中 + LODOP.SET_PRINT_STYLEA(0, 'Vorient', 2) // LODOP.PREVIEW()// 预览 LODOP.PRINT()// 打印 }) @@ -225,8 +226,9 @@ export default { // 打印纸张大小设置https://www.it610.com/article/2094844.html LODOP.SET_PRINT_PAGESIZE(1, '100mm', '60mm', '') // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1) - LODOP.ADD_PRINT_BARCODE('4.3mm', '8.2mm', '60mm', '40mm', '128Auto', code) + LODOP.ADD_PRINT_BARCODE('10mm', '15mm', '80mm', '38mm', '128Auto', code) LODOP.SET_PRINT_STYLEA(0, 'Horient', 2) // 设置对象在纸张范围内水平居中 + LODOP.SET_PRINT_STYLEA(0, 'Vorient', 2) // LODOP.PREVIEW()// 预览 LODOP.PRINT()// 打印 this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 0794291..c56bb90 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -200,6 +200,22 @@ /> + + + + + + + + @@ -342,13 +363,14 @@ const defaultForm = { device_code: null, is_canupdate_update: '1', material_spec: null, - sale_id: null + sale_id: null, + workorder_type: '1' } export default { name: 'Produceshiftorder', components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], - dicts: ['pdm_workorder_status', 'is_used', 'is_or_not', 'vehicle_type', 'workorder_procedure'], + dicts: ['pdm_workorder_status', 'is_used', 'is_or_not', 'vehicle_type', 'workorder_procedure', 'workorder_type'], cruds() { return CRUD({ title: '工单', url: 'api/workorder', idField: 'workorder_id', sort: 'workorder_id,desc', diff --git a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue index ee122f2..7b4c2be 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue @@ -56,30 +56,30 @@ - - + + - + - + - + - + - + - + diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 4072c36..4fdca4e 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -315,6 +315,7 @@ + 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 5a73580..8825747 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -132,10 +132,10 @@ - - - - + + + + - + + + + + 取 消 确 定 @@ -254,8 +254,8 @@ export default { crudTask.getFinishType().then(data => { this.finishTypeList = data }) - this.crud.query.task_status = ['-1'] - this.crud.toQuery() + // this.crud.query.task_status = ['-1'] + // this.crud.toQuery() }, methods: { initClass1() { @@ -298,8 +298,9 @@ export default { this.crud.toQuery() }, handTaskStatus(value) { + this.crud.query.more_task_status = null if (value) { - this.query.task_status = this.task_status.toString() + this.crud.query.more_task_status = value.toString() } this.crud.toQuery() },