From 6c552cb6d949af941078069d9131bb2adc9db110 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Tue, 18 Oct 2022 15:21:36 +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 --- .../acs/service/impl/AcsToWmsServiceImpl.java | 469 +++++++----------- .../impl/ProduceshiftorderServiceImpl.java | 14 +- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 166912 -> 166912 bytes .../nl/wms/sch/tasks/CallEmpVehicleTask.java | 23 +- .../nl/wms/sch/tasks/SendEmpVehicleTask.java | 2 +- .../src/main/java/org/nl/wms/sch/wql/sch.xls | Bin 202240 -> 201728 bytes .../service/impl/RegionioInServiceImpl.java | 2 +- 7 files changed, 203 insertions(+), 307 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 2196901..eba34ee 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -8,11 +8,9 @@ import com.alibaba.fastjson.JSONArray; 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.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.acs.service.AcsToWmsService; @@ -25,7 +23,6 @@ import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.TaskService; import org.nl.wms.sch.service.dto.TaskDto; import org.nl.wms.sch.tasks.*; - import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -114,11 +111,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.put("errArr", errArr); return result; } + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Override public Map receivePointStatusFromAcs(Map jsonObject) { return null; } + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Override public Map orderFinish(String string) { @@ -172,286 +171,199 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * 7.油漆线->输送线 * 8.豪凯自动线下料入库 */ - JSONObject resuft = new JSONObject(); - try { - if (StrUtil.equals(type, "1")) { - // 1.共挤线申请空盘： 调用空托盘出库处理类创建任务 - if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); - - JSONObject param = new JSONObject(); - param.put("next_point_code", point_code); - param.put("qty", vehicle_num); - // 创建任务 - CallEmpVehicleTask taskBean = SpringContextHolder.getBean(CallEmpVehicleTask.class); - String task_id = taskBean.createTask(param); - - // 插入空载具作业记录表 - JSONObject jsonEmpParam = new JSONObject(); - jsonEmpParam.put("vehicle_qty", vehicle_num); - jsonEmpParam.put("task_id", task_id); - jsonEmpParam.put("io_type", "1"); - this.createEmp(jsonEmpParam); - // 下发 - JSONObject jsonObject = taskBean.renotifyAcs(task_id); - if (StrUtil.equals(jsonObject.getString("status"), "200")) { - // 成功返回 更新任务状态 - resuft.put("status", "200"); - resuft.put("message", ""); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); - taskTab.update(jsonTask); - } else { - throw new BadRequestException(jsonObject.getString("message")); - } - - } else if (StrUtil.equals(type, "2")) { - // 2.共挤线满托入库: 调用物料入库处理类创建任务 - if (ObjectUtil.isEmpty(qty) || (StrUtil.equals(qty, "0"))) - throw new BadRequestException("物料数量不能为空或者为0"); - - JSONObject param = new JSONObject(); - param.put("start_point_code", point_code); // 满料位 - - SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class); - String task_id = taskBean.createTask(param); // 创建任务 + if (StrUtil.equals(type, "1")) { + // 1.共挤线申请空盘： 调用空托盘出库处理类创建任务 + if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); + JSONObject param = new JSONObject(); + param.put("next_point_code", point_code); + param.put("qty", vehicle_num); + // 创建任务 + CallEmpVehicleTask taskBean = SpringContextHolder.getBean(CallEmpVehicleTask.class); + String task_id = taskBean.createTask(param); + // 下发 + JSONObject jsonObject = taskBean.renotifyAcs(task_id); + if (StrUtil.equals(jsonObject.getString("status"), "200")) { + // 成功返回 更新任务状态 JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - // 插入区域出入库表 - param.put("next_point_code", jsonTask.getString("next_point_code")); - param.put("qty", qty); - param.put("task_id", task_id); - param.put("io_type", "0"); - JSONObject json = this.inCreateRegion(param); - // 回显任务载具类型 - jsonTask.put("vehicle_type", json.getString("vehicle_type")); + jsonTask.put("task_status", "05"); taskTab.update(jsonTask); - - // 下发 - JSONObject jsonObject = taskBean.renotifyAcs(task_id); - if (StrUtil.equals(jsonObject.getString("status"), "200")) { - // 成功返回 更新任务状态 - resuft.put("status", "200"); - resuft.put("message", ""); - jsonTask.put("task_status", "05"); - taskTab.update(jsonTask); - } else { - throw new BadRequestException(jsonObject.getString("message")); - } - } else if (StrUtil.equals(type, "3")) { - // 3.油漆线申请空盘: 调用空托盘出库处理类创建任务 - if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); - - JSONObject param = new JSONObject(); - param.put("next_point_code", point_code); - param.put("qty", vehicle_num); - // 创建任务 - CallEmpVehicleTask taskBean = SpringContextHolder.getBean(CallEmpVehicleTask.class); - String task_id = taskBean.createTask(param); - - // 插入空载具作业记录表 - JSONObject jsonEmpParam = new JSONObject(); - jsonEmpParam.put("vehicle_qty", vehicle_num); - jsonEmpParam.put("task_id", task_id); - jsonEmpParam.put("io_type", "1"); - this.createEmp(jsonEmpParam); - - // 下发 - JSONObject jsonObject = taskBean.renotifyAcs(task_id); - if (StrUtil.equals(jsonObject.getString("status"), "200")) { - // 成功返回 更新任务状态 - resuft.put("status", "200"); - resuft.put("message", ""); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); - taskTab.update(jsonTask); - } else { - throw new BadRequestException(jsonObject.getString("message")); - } - } else if (StrUtil.equals(type, "4")) { - // 4.油漆线申请物料: 调用物料出库库处理类创建任务 - JSONObject param = new JSONObject(); - param.put("next_point_code", point_code); - param.put("io_type", "1"); - // 插入区域出库单 - JSONObject json = this.outCreateRegion(param); - - param.put("vehicle_type", json.getString("vehicle_type")); - param.put("material_id", json.getString("material_id")); - param.put("create_mode", json.getString("create_mode")); - param.put("iostorinv_id", json.getString("iostorinv_id")); - // 创建任务 - CallMaterialTask taskBean = SpringContextHolder.getBean(CallMaterialTask.class); - String task_id = taskBean.createTask(param); - - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - // 回显出库单：起始点位、起始区域、任务id - JSONObject jsonRegion = regionTab.query("iostorinv_id = '" + json.getString("iostorinv_id") + "'").uniqueResult(0); - jsonRegion.put("start_point_code", jsonTask.getString("start_point_code")); - Long start_region_id = SpringContextHolder.getBean(PointService.class).findByCode(jsonTask.getString("start_point_code")).getRegion_id(); - jsonRegion.put("start_region_id", String.valueOf(start_region_id)); - jsonRegion.put("task_id", Long.valueOf(task_id)); - regionTab.update(jsonRegion); - - // 下发 - JSONObject jsonObject = taskBean.renotifyAcs(task_id); - if (StrUtil.equals(jsonObject.getString("status"), "200")) { - // 成功返回 更新任务状态 - resuft.put("status", "200"); - resuft.put("message", ""); - jsonTask.put("task_status", "05"); - taskTab.update(jsonTask); - } else { - throw new BadRequestException(jsonObject.getString("message")); - } - } else if (StrUtil.equals(type, "5")) { - // 5.油漆线空盘入库: 调用空托盘入库处理类创建任务 - if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); - - JSONObject param = new JSONObject(); - param.put("start_point_code", point_code); - param.put("qty", vehicle_num); - // 创建任务 - SendEmpVehicleTask taskBean = SpringContextHolder.getBean(SendEmpVehicleTask.class); - String task_id = taskBean.createTask(param); - - // 插入空载具作业记录表 - JSONObject jsonEmpParam = new JSONObject(); - jsonEmpParam.put("vehicle_qty", vehicle_num); - jsonEmpParam.put("task_id", task_id); - jsonEmpParam.put("io_type", "0"); - this.createEmp(jsonEmpParam); - // 下发 - JSONObject jsonObject = taskBean.renotifyAcs(task_id); - if (StrUtil.equals(jsonObject.getString("status"), "200")) { - // 成功返回 更新任务状态 - resuft.put("status", "200"); - resuft.put("message", ""); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); - taskTab.update(jsonTask); - } else { - throw new BadRequestException(jsonObject.getString("message")); - } - - } else if (StrUtil.equals(type, "6")) { - // 6.一楼空盘入库 （有载具号）: 调用空托盘入库处理类创建任务 - if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("载具号不能为空"); - JSONObject param = new JSONObject(); - - // 查询载具号对应的数量 - JSONObject jsonVeQty = new JSONObject(); - if (ObjectUtil.isEmpty(qty)) { -// jsonVeQty = veQtyTab.query("vehicle_code = '" + vehicle_code + "' and is_task = '0' order by create_time DESC").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVeQty)) throw new BadRequestException("请先手持扫码"); - } else { - jsonVeQty.put("qty", qty); - } - - param.put("qty", jsonVeQty.getString("qty")); - param.put("start_point_code", point_code); - param.put("vehicle_code", vehicle_code); - // 创建任务 - SendEmpVehicleTask taskBean = SpringContextHolder.getBean(SendEmpVehicleTask.class); - String task_id = taskBean.createTask(param); - - // 插入空载具作业记录表 - JSONObject jsonEmpParam = new JSONObject(); - jsonEmpParam.put("vehicle_qty", jsonVeQty.getString("qty")); - jsonEmpParam.put("task_id", task_id); - jsonEmpParam.put("io_type", "0"); - this.createEmp(jsonEmpParam); - // 下发 - JSONObject jsonObject = taskBean.renotifyAcs(task_id); - if (StrUtil.equals(jsonObject.getString("status"), "200")) { - // 成功返回 更新任务状态 - resuft.put("status", "200"); - resuft.put("message", ""); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); - taskTab.update(jsonTask); - // 更新载具对应数量表 -// veQtyTab.update(jsonVeQty); - } else { - throw new BadRequestException(jsonObject.getString("message")); - } - } else if (StrUtil.equals(type, "7")) { - JSONObject param = new JSONObject(); - param.put("start_point_code", point_code); - // 1.生成起点确定的任务 - SpringContextHolder.getBean(PointToPointTask.class).createTask(param); - - resuft.put("status", "200"); - resuft.put("message", ""); - } else if (StrUtil.equals(type, "8")) { - // 8.豪凯自动线下料入库 - JSONObject param = new JSONObject(); - param.put("start_point_code", point_code); - SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class); - String task_id = taskBean.createTask(param); - - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - // 插入区域出入库表 - param.put("next_point_code", jsonTask.getString("next_point_code")); - if (ObjectUtil.isEmpty(qty)) { - param.put("qty", "1"); // 为空先写死1 - } else { - param.put("qty", qty); - } - param.put("task_id", task_id); - param.put("io_type", "0"); - JSONObject json = this.inCreateRegion(param); - // 回显任务载具类型 - jsonTask.put("vehicle_type", json.getString("vehicle_type")); - taskTab.update(jsonTask); - - // 下发 - JSONObject jsonObject = taskBean.renotifyAcs(task_id); - if (StrUtil.equals(jsonObject.getString("status"), "200")) { - // 成功返回 更新任务状态 - resuft.put("status", "200"); - resuft.put("message", ""); - jsonTask.put("task_status", "05"); - taskTab.update(jsonTask); - } else { - throw new BadRequestException(jsonObject.getString("message")); - } + } else { + throw new BadRequestException(jsonObject.getString("message")); + } + + } else if (StrUtil.equals(type, "2")) { + // 2.共挤线满托入库: 调用物料入库处理类创建任务 + if (ObjectUtil.isEmpty(qty) || (StrUtil.equals(qty, "0"))) + throw new BadRequestException("物料数量不能为空或者为0"); + + JSONObject param = new JSONObject(); + param.put("start_point_code", point_code); // 满料位 + + SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class); + String task_id = taskBean.createTask(param); // 创建任务 + + JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); + // 插入区域出入库表 + param.put("next_point_code", jsonTask.getString("next_point_code")); + param.put("qty", qty); + param.put("task_id", task_id); + param.put("io_type", "0"); + JSONObject json = this.inCreateRegion(param); + // 回显任务载具类型 + jsonTask.put("vehicle_type", json.getString("vehicle_type")); + taskTab.update(jsonTask); + + // 下发 + JSONObject jsonObject = taskBean.renotifyAcs(task_id); + if (StrUtil.equals(jsonObject.getString("status"), "200")) { + // 成功返回 更新任务状态 + jsonTask.put("task_status", "05"); + taskTab.update(jsonTask); + } else { + throw new BadRequestException(jsonObject.getString("message")); + } + } else if (StrUtil.equals(type, "3")) { + // 3.油漆线申请空盘: 调用空托盘出库处理类创建任务 + if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); + + JSONObject param = new JSONObject(); + param.put("next_point_code", point_code); + param.put("qty", vehicle_num); + // 创建任务 + CallEmpVehicleTask taskBean = SpringContextHolder.getBean(CallEmpVehicleTask.class); + String task_id = taskBean.createTask(param); + JSONObject jsonObject = taskBean.renotifyAcs(task_id); + if (StrUtil.equals(jsonObject.getString("status"), "200")) { + JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); + jsonTask.put("task_status", "05"); + taskTab.update(jsonTask); + } else { + throw new BadRequestException(jsonObject.getString("message")); + } + } else if (StrUtil.equals(type, "4")) { + // 4.油漆线申请物料: 调用物料出库库处理类创建任务 + JSONObject param = new JSONObject(); + param.put("next_point_code", point_code); + param.put("io_type", "1"); + // 插入区域出库单 + JSONObject json = this.outCreateRegion(param); + + param.put("vehicle_type", json.getString("vehicle_type")); + param.put("material_id", json.getString("material_id")); + param.put("create_mode", json.getString("create_mode")); + param.put("iostorinv_id", json.getString("iostorinv_id")); + // 创建任务 + CallMaterialTask taskBean = SpringContextHolder.getBean(CallMaterialTask.class); + String task_id = taskBean.createTask(param); + + JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); + // 回显出库单：起始点位、起始区域、任务id + JSONObject jsonRegion = regionTab.query("iostorinv_id = '" + json.getString("iostorinv_id") + "'").uniqueResult(0); + jsonRegion.put("start_point_code", jsonTask.getString("start_point_code")); + Long start_region_id = SpringContextHolder.getBean(PointService.class).findByCode(jsonTask.getString("start_point_code")).getRegion_id(); + jsonRegion.put("start_region_id", String.valueOf(start_region_id)); + jsonRegion.put("task_id", Long.valueOf(task_id)); + regionTab.update(jsonRegion); + + // 下发 + JSONObject jsonObject = taskBean.renotifyAcs(task_id); + if (StrUtil.equals(jsonObject.getString("status"), "200")) { + jsonTask.put("task_status", "05"); + taskTab.update(jsonTask); + } else { + throw new BadRequestException(jsonObject.getString("message")); + } + } else if (StrUtil.equals(type, "5")) { + // 5.油漆线空盘入库: 调用空托盘入库处理类创建任务 + if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); + + JSONObject param = new JSONObject(); + param.put("start_point_code", point_code); + param.put("qty", vehicle_num); + // 创建任务 + SendEmpVehicleTask taskBean = SpringContextHolder.getBean(SendEmpVehicleTask.class); + String task_id = taskBean.createTask(param); + // 下发 + JSONObject jsonObject = taskBean.renotifyAcs(task_id); + if (StrUtil.equals(jsonObject.getString("status"), "200")) { + JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); + jsonTask.put("task_status", "05"); + taskTab.update(jsonTask); + } else { + throw new BadRequestException(jsonObject.getString("message")); + } + + } else if (StrUtil.equals(type, "6")) { + // 6.一楼空盘入库 （有载具号）: 调用空托盘入库处理类创建任务 + if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("载具号不能为空"); + JSONObject param = new JSONObject(); + + // 查询载具号对应的数量 + JSONObject jsonVeQty = new JSONObject(); + if (ObjectUtil.isEmpty(qty)) { +// jsonVeQty = veQtyTab.query("vehicle_code = '" + vehicle_code + "' and is_task = '0' order by create_time DESC").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonVeQty)) throw new BadRequestException("请先手持扫码"); + } else { + jsonVeQty.put("qty", qty); + } + + param.put("qty", jsonVeQty.getString("qty")); + param.put("start_point_code", point_code); + param.put("vehicle_code", vehicle_code); + // 创建任务 + SendEmpVehicleTask taskBean = SpringContextHolder.getBean(SendEmpVehicleTask.class); + String task_id = taskBean.createTask(param); + // 下发 + JSONObject jsonObject = taskBean.renotifyAcs(task_id); + if (StrUtil.equals(jsonObject.getString("status"), "200")) { + JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); + jsonTask.put("task_status", "05"); + taskTab.update(jsonTask); + // 更新载具对应数量表 +// veQtyTab.update(jsonVeQty); + } else { + throw new BadRequestException(jsonObject.getString("message")); + } + } else if (StrUtil.equals(type, "7")) { + JSONObject param = new JSONObject(); + param.put("start_point_code", point_code); + // 1.生成起点确定的任务 + SpringContextHolder.getBean(PointToPointTask.class).createTask(param); + } else if (StrUtil.equals(type, "8")) { + // 8.豪凯自动线下料入库 + JSONObject param = new JSONObject(); + param.put("start_point_code", point_code); + SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class); + String task_id = taskBean.createTask(param); + + JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); + // 插入区域出入库表 + param.put("next_point_code", jsonTask.getString("next_point_code")); + if (ObjectUtil.isEmpty(qty)) { + param.put("qty", "1"); // 为空先写死1 + } else { + param.put("qty", qty); + } + param.put("task_id", task_id); + param.put("io_type", "0"); + JSONObject json = this.inCreateRegion(param); + // 回显任务载具类型 + jsonTask.put("vehicle_type", json.getString("vehicle_type")); + taskTab.update(jsonTask); + + // 下发 + JSONObject jsonObject = taskBean.renotifyAcs(task_id); + if (StrUtil.equals(jsonObject.getString("status"), "200")) { + jsonTask.put("task_status", "05"); + taskTab.update(jsonTask); + } else { + throw new BadRequestException(jsonObject.getString("message")); } - } catch (Exception e) { - resuft.put("status", ((BadRequestException) e).getStatus()); - resuft.put("message", e.getMessage()); } - return resuft; + return null; } - @LokiLog(type = LokiLogType.ACS_TO_LMS) - @Transactional(rollbackFor = Exception.class) - public void createEmp(JSONObject json) { - String vehicle_qty = json.getString("vehicle_qty"); - String task_id = json.getString("task_id"); - String io_type = json.getString("io_type"); - WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord");// 空载具作业记录表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");// 空载具作业记录表 - - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - JSONObject jsonEmp = new JSONObject(); - jsonEmp.put("record_uuid", IdUtil.getSnowflake(1, 1).nextId()); - jsonEmp.put("bill_code", CodeUtil.getNewCode("KZJ_BILL_CODE")); - jsonEmp.put("io_type", io_type); - jsonEmp.put("bill_status", "20"); - jsonEmp.put("vehicle_qty", vehicle_qty); - jsonEmp.put("start_point_code", jsonTask.getString("start_point_code")); - Long start_region_id = SpringContextHolder.getBean(PointService.class).findByCode(jsonTask.getString("start_point_code")).getRegion_id(); - jsonEmp.put("start_region_id", start_region_id); - jsonEmp.put("next_point_code", jsonTask.getString("next_point_code")); - Long next_region_id = SpringContextHolder.getBean(PointService.class).findByCode(jsonTask.getString("next_point_code")).getRegion_id(); - jsonEmp.put("end_region_id", next_region_id); - jsonEmp.put("task_uuid", task_id); - jsonEmp.put("create_id", SecurityUtils.getCurrentUserId()); - jsonEmp.put("create_name", SecurityUtils.getCurrentNickName()); - jsonEmp.put("create_time", DateUtil.now()); - empTab.insert(jsonEmp); - } @LokiLog(type = LokiLogType.ACS_TO_LMS) @Transactional(rollbackFor = Exception.class) public JSONObject inCreateRegion(JSONObject json) { @@ -462,7 +374,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String io_type = json.getString("io_type"); WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); - WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); @@ -505,13 +417,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { resuft.put("create_mode", jsonRegion.getString("create_mode")); return resuft; } + @Transactional(rollbackFor = Exception.class) public JSONObject outCreateRegion(JSONObject json) { String next_point_code = json.getString("next_point_code"); String io_type = json.getString("io_type"); WQLObject regionTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); - WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); JSONObject jsonRegion = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java index a42ade9..ed074cb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java @@ -83,7 +83,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { @Override public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject wo = WQLObject.getWQLObject("PDM_BD_WorkOrder"); JSONArray arr = wo.query().getResultJSONArray(0); if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(ProduceshiftorderDto.class); return null; @@ -91,7 +91,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { @Override public ProduceshiftorderDto findById(Long workorder_id) { - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject wo = WQLObject.getWQLObject("PDM_BD_WorkOrder"); JSONObject json = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(json)) { return json.toJavaObject(ProduceshiftorderDto.class); @@ -101,7 +101,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { @Override public ProduceshiftorderDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject wo = WQLObject.getWQLObject("PDM_BD_WorkOrder"); JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(json)) { return json.toJavaObject(ProduceshiftorderDto.class); @@ -128,7 +128,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { dto.setUpdate_optname(nickName); dto.setUpdate_time(now); dto.setCreate_time(now); - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject wo = WQLObject.getWQLObject("PDM_BD_WorkOrder"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); json.put("sysdeptid", deptId); json.put("syscompanyid", deptId); @@ -149,7 +149,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { dto.setUpdate_optid(currentUserId); dto.setUpdate_optname(nickName); - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject wo = WQLObject.getWQLObject("PDM_BD_WorkOrder"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.update(json); } @@ -161,7 +161,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject wo = WQLObject.getWQLObject("PDM_BD_WorkOrder"); for (Long workorder_id : ids) { JSONObject param = new JSONObject(); param.put("workorder_id", String.valueOf(workorder_id)); @@ -180,7 +180,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject wo = WQLObject.getWQLObject("PDM_BD_WorkOrder"); JSONObject json = wo.query("workorder_id = '" + param.getString("workorder_id") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(json.getString("device_id"))) throw new BadRequestException("请先绑定设备"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index d028a31c34f6c3ec7218dba22f34e04a24e9d57b..1015792849a9589b4c8983c1a0b0a7c9de30aef8 100644 GIT binary patch delta 28 kcmZpe!PPK>YeNnT>w{khf9`KCWN9yCVccHG!qndm0Jf_O_5c6? delta 28 jcmZpe!PPK>YeNnTt3hSMF{b81mi9sx#_feHO#STukXH$m diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java index 5195ae9..02f5ae9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java @@ -41,7 +41,6 @@ public class CallEmpVehicleTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); String task_id = taskObj.getString("task_id"); @@ -77,9 +76,8 @@ public class CallEmpVehicleTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(start_point_code)) throw new BadRequestException("未找到可用点位:" + next_point_code); // 1.更新点位数量 2.解锁点位 - JSONObject jsonEmp = empTab.query("task_uuid = '" + task_id + "'").uniqueResult(0); int vehicle_qty = JSONObject.parseObject(JSON.toJSONString(start_point_code)).getIntValue("vehicle_qty"); - BigDecimal vehicle_qty_point = NumberUtil.sub(String.valueOf(vehicle_qty), String.valueOf(jsonEmp.getIntValue("vehicle_qty"))); + BigDecimal vehicle_qty_point = NumberUtil.sub(String.valueOf(vehicle_qty), String.valueOf(1)); start_point_code.setVehicle_qty(Integer.valueOf(vehicle_qty_point.toString())); if (StrUtil.equals(vehicle_qty_point.toString(), "0")) { @@ -88,13 +86,6 @@ public class CallEmpVehicleTask extends AbstractAcsTask { } start_point_code.setLock_type("00"); pointTab.update(JSONObject.parseObject(JSON.toJSONString(start_point_code))); - - // 完成单据状态 - jsonEmp.put("bill_status", "50"); - jsonEmp.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonEmp.put("update_optname", SecurityUtils.getCurrentUsername()); - jsonEmp.put("update_time", DateUtil.now()); - empTab.update(jsonEmp); } } @@ -112,13 +103,11 @@ public class CallEmpVehicleTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); String start_point_code = form.getString("start_point_code"); String next_point_code = form.getString("next_point_code"); String qty = form.getString("qty"); - String record_uuid = form.getString("record_uuid"); String vehicle_type = form.getString("vehicle_type"); // 出库终点不能为空 @@ -127,7 +116,7 @@ public class CallEmpVehicleTask extends AbstractAcsTask { } else { // 判断终点是否有正在执行的任务 JSONObject beforTaskObj = taskTab.query("is_delete='0' and next_point_code='" + next_point_code + "' and task_status <>'" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(beforTaskObj)) throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！"); + if (ObjectUtil.isNotEmpty(beforTaskObj)) throw new BadRequestException("存在任务号为'" + beforTaskObj.getString("task_code") + "' 未完成！"); } // 载具数量不能为空 if (ObjectUtil.isEmpty(qty)) throw new BadRequestException("载具数量不能为空"); @@ -174,12 +163,6 @@ public class CallEmpVehicleTask extends AbstractAcsTask { jsonPoint.put("lock_type", "02"); pointTab.update(jsonPoint); - // 更新空载具单据状态 - if (ObjectUtil.isNotEmpty(record_uuid)) { - JSONObject jsonEmp = empTab.query("record_uuid ='" + record_uuid + "'").uniqueResult(0); - jsonEmp.put("bill_status","20"); - empTab.update(jsonEmp); - } return task_id; } @@ -209,7 +192,7 @@ public class CallEmpVehicleTask extends AbstractAcsTask { WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); WQLObject regionTab = WQLObject.getWQLObject("SCH_BASE_Region"); - WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); // 根据终点区域判断优先的起点区域 JSONObject jsonPointEnd = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonPointEnd)) throw new BadRequestException("终点点位不存在"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java index e5c7718..55500d4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java @@ -218,7 +218,7 @@ public class SendEmpVehicleTask extends AbstractAcsTask { WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 WQLObject regionTab = WQLObject.getWQLObject("SCH_BASE_Region"); // 区域表 - WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); //空载具记录表 + WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); //空载具记录表 WQLObject velicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); // 载具表 // 根据起点区域判断优先的终点区域 JSONObject jsonPointStart = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index 905c3b5cf4466dd25702d877045ebe57f508aa69..1f2efd1b28dddf2aed269b22564806c47d88251b 100644 GIT binary patch delta 12837 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 HmGJ)n{^4m9 delta 13462 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 GF8ptwsIt2N diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java index 8dda6fd..66d105b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java @@ -198,7 +198,7 @@ public class RegionioInServiceImpl implements RegionioInService { String iostorinv_id = jsonObject.getString("iostorinv_id"); WQLObject wo = WQLObject.getWQLObject("SCH_IVT_regionIO"); - WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); + WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); JSONObject jsonIn = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); String start_point_code = jsonIn.getString("start_point_code");