From 349117bb63753366811e5ca5672dcfbe319d1c0c Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Tue, 25 Oct 2022 14:25:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E6=BC=86=E7=BA=BF=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 26 +- .../tasks/callMaterial/CallMaterialTask.java | 277 ---------------- .../tasks/callMaterial/YqxCallMaterial.java | 296 ++++++++++++++++++ .../wql/QSCH_yqxCallMAterial_01.wql | 71 +++++ .../tasks/sendMaterial/GjxSendMaterial.java | 8 + 5 files changed, 381 insertions(+), 297 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/CallMaterialTask.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql 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 7977e59..f5a18b6 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 @@ -24,7 +24,7 @@ import org.nl.wms.sch.service.TaskService; import org.nl.wms.sch.service.dto.TaskDto; import org.nl.wms.sch.tasks.PointToPointTask; import org.nl.wms.sch.tasks.callEmpty.GjxCallEmpVehicleTask; -import org.nl.wms.sch.tasks.callMaterial.CallMaterialTask; +import org.nl.wms.sch.tasks.callMaterial.YqxCallMaterial; import org.nl.wms.sch.tasks.sendEmpty.HtSendEmpVehicleTask; import org.nl.wms.sch.tasks.sendEmpty.YqxSendEmpVehicleTask; import org.nl.wms.sch.tasks.sendMaterial.GjxSendMaterial; @@ -235,28 +235,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } else if (StrUtil.equals(type, "4")) { // 4.油漆线申请物料: 调用物料出库库处理类创建任务 JSONObject param = new JSONObject(); - param.put("point_code2", 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")); + param.put("point_code2", point_code); // 叫料点 + param.put("io_type", "2"); + param.put("vehicle_type", vehicle_type); + param.put("vehicle_code", vehicle_code); // 创建任务 - CallMaterialTask taskBean = SpringContextHolder.getBean(CallMaterialTask.class); + YqxCallMaterial taskBean = SpringContextHolder.getBean(YqxCallMaterial.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("point_code1", jsonTask.getString("point_code1")); - Long start_region_id = SpringContextHolder.getBean(PointService.class).findByCode(jsonTask.getString("point_code1")).getRegion_id(); - jsonRegion.put("start_region_id", String.valueOf(start_region_id)); - jsonRegion.put("task_id", Long.valueOf(task_id)); - regionTab.update(jsonRegion); - } else if (StrUtil.equals(type, "5")) { // 5.油漆线空盘入库: 调用空托盘入库处理类创建任务 if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("点位不能为空"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/CallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/CallMaterialTask.java deleted file mode 100644 index c1c5623..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/CallMaterialTask.java +++ /dev/null @@ -1,277 +0,0 @@ -package org.nl.wms.sch.tasks.callMaterial; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -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.modules.wql.util.SpringContextHolder; -import org.nl.wms.sch.PointFindUtil; -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.service.impl.PointServiceImpl; -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.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -@Service -public class CallMaterialTask extends AbstractAcsTask { - private final String THIS_CLASS = CallMaterialTask.class.getName(); - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject taskObj, String status) { - /** - *改变任务状态 - **/ - String task_id = taskObj.getString("task_id"); - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); - JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0); - - if (StrUtil.equals(status, "0")) { - // 取消删除任务 - taskTab.delete("task_id = '" + task_id + "'"); - } - - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { - //更新任务状态为执行中 - jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("car_no", taskObj.getString("car_no")); - taskTab.update(jsonTask); - HashMap map = new HashMap(); - map.put("bill_status", "40"); - map.put("update_optid", SecurityUtils.getCurrentUserId()); - map.put("update_optname", SecurityUtils.getCurrentNickName()); - map.put("update_time", DateUtil.now()); - WQLObject.getWQLObject("ST_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'"); - - } - - if (TaskStatusEnum.FINISHED.getCode().equals(status)) { - // 更新任务状态为完成 - jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); - jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("remark", "任务执行完成"); - ///审核单据 增加库存 改变出入库表的状态 - WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_regionIO"); - JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0); - - //解锁仓位，托盘信息，回写到点位上去 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("point_code1") + "'").uniqueResult(0); - startPointObj.put("lock_type", "1"); - startPointObj.put("point_status", "00"); - startPointObj.put("vehicle_code", ""); - startPointObj.put("vehicle_type", ""); - pointTab.update(startPointObj); - taskTab.update(jsonTask); - } - - } - - @Override - public void findStartPoint() { - String task_status = TaskStatusEnum.SURE_START.getCode(); - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONArray taskArry = taskTab.query("task_status='" + task_status + "' AND handle_class='" + THIS_CLASS + "' AND is_delete='0' ").getResultJSONArray(0); - for (int i = 0; i < taskArry.size(); i++) { - JSONObject taskObj = taskArry.getJSONObject(i); - String task_id = taskObj.getString("task_id"); - //1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位 - //找一个合适的仓位 - WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_regionIO"); - JSONObject IosObj = ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0); - if (ObjectUtil.isEmpty(IosObj)) { - throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的入库单据！"); - } - JSONObject param = new JSONObject(); - param.put("material_id", IosObj.getString("material_id")); - param.put("area_type", IosObj.getString("start_area")); - JSONObject inStructObj = PointFindUtil.getOutStruct(param); - if (ObjectUtil.isEmpty(inStructObj)) { - throw new BadRequestException("未找到合适的出库仓位！"); - } - //修改单据状态，将终点填入 - IosObj.put("bill_status", "20"); - IosObj.put("point_code1", inStructObj.getString("struct_code")); - ProcedureIOStable.update(IosObj); - //终点加锁 - HashMap lock_map = new HashMap(); - lock_map.put("lock_type", "2"); - WQLObject.getWQLObject("sch_base_point").update(lock_map, "point_code = '" + inStructObj.getString("struct_code") + "'"); - //修改任务状态 - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskObj.put("update_optid", SecurityUtils.getCurrentUserId()); - taskObj.put("update_optname", SecurityUtils.getCurrentNickName()); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } - - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public String createTask(JSONObject form) { - //请求参数 载具、起点、终点 - String vehicle_code = form.getString("vehicle_code"); - String point_code1 = form.getString("point_code1"); - String point_code2 = form.getString("point_code2"); - String vehicle_type = form.getString("vehicle_type"); - - String task_status = TaskStatusEnum.START_AND_POINT.getCode(); - String material_id = form.getString("material_id"); - String create_mode = form.getString("create_mode"); - String iostorinv_id = form.getString("iostorinv_id"); - - WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject regionTable = WQLObject.getWQLObject("ST_IVT_regionIO"); - - if (StrUtil.isEmpty(point_code2)) { - throw new BadRequestException("终点不能为空！"); - } - if (StrUtil.isEmpty(material_id)) { - throw new BadRequestException("物料标识不能为空！"); - } - if (StrUtil.isEmpty(create_mode)) { - throw new BadRequestException("创建方式不能为空！"); - } - //判断终点有没有未完成的指令 - JSONObject beforTaskObj = taskTable. - query("is_delete='0' and point_code2='" + point_code2 + "' and task_status <>'" + TaskStatusEnum.FINISHED.getCode() + "'") - .uniqueResult(0); - if (ObjectUtil.isNotEmpty(beforTaskObj)) { - throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！"); - } - PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class); - String task_id = IdUtil.getSnowflake(1, 1).nextId() + ""; - String start_area = ""; - String qty = ""; - String qty_unit_id = ""; - - if (StrUtil.isEmpty(point_code1)) { - // 起点为空找到对应的起点 - JSONObject param = new JSONObject(); - param.put("point_code2", point_code2); - param.put("vehicle_type", vehicle_type); - param.put("material_id", material_id); - JSONObject ivtObj = this.findBeginPoint(param); - - qty = ivtObj.getString("canuse_qty"); - qty_unit_id = ivtObj.getString("qty_unit_id"); - point_code1 = ivtObj.getString("struct_code"); - } else { - // 不能空则为点对点，查找对应出入库单据 - if (ObjectUtil.isEmpty(iostorinv_id)) throw new BadRequestException("出库单id不能为空"); - JSONObject jsonRegion = regionTable.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); - qty = jsonRegion.getString("qty"); - qty_unit_id = jsonRegion.getString("qty_unit_id"); - } - - PointDto startPoint = pointService.findByCode(point_code1); - //起点点加锁 - WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); - JSONObject startPointObj = pointTable.query("point_code='" + point_code1 + "'").uniqueResult(0); - startPointObj.put("lock_type", "2"); - pointTable.update(startPointObj); - - JSONObject taskObj = new JSONObject(); - taskObj.put("task_id", task_id); - taskObj.put("task_code", CodeUtil.getNewCode("TASK_CODE")); - taskObj.put("task_type", "02"); - taskObj.put("task_status", task_status); - taskObj.put("point_code1", point_code1); - taskObj.put("start_area", start_area); - taskObj.put("request_param", form.toJSONString()); - taskObj.put("point_code2", point_code2); - taskObj.put("vehicle_code", vehicle_code); - taskObj.put("handle_class", THIS_CLASS); - taskObj.put("is_auto_issue", "1"); - taskObj.put("create_name", SecurityUtils.getCurrentUsername()); - taskObj.put("create_id", SecurityUtils.getCurrentUserId()); - taskObj.put("create_time", DateUtil.now()); - taskObj.put("is_delete", "0"); - taskTable.insert(taskObj); - return task_id; - } - - @Override - public List addTask() { - //任务基础表【sch_base_task】 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); - JSONArray tasks = taskTab.query("handle_class = '" + this.getClass().getName() + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); - List arr = new ArrayList<>(); - for (int i = 0, j = tasks.size(); i < j; i++) { - /*JSONObject json = tasks.getJSONObject(i); - AcsTaskDto taskDto = new AcsTaskDto(); - taskDto.setTask_id(json.getString("task_id")); - taskDto.setTask_code(json.getString("task_code")); - taskDto.setTask_type("1"); - taskDto.setRoute_plan_code("normal"); - taskDto.setStart_device_code(json.getString("point_code1")); - taskDto.setNext_device_code(json.getString("point_code2")); - taskDto.setVehicle_code(json.getString("vehicle_code")); - arr.add(taskDto);*/ - } - return arr; - } - - @Override - public void forceFinish(String task_id) { - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); - } - - @Override - public void cancel(String task_id) { - - } - - @Transactional(rollbackFor = Exception.class) - public JSONObject findBeginPoint(JSONObject json) { - String point_code2 = json.getString("point_code2"); - String vehicle_type = json.getString("vehicle_type"); - String material_id = json.getString("material_id"); - - WQLObject regionTab = WQLObject.getWQLObject("SCH_BASE_Region"); - - // 根据起点判断是什么区域 然后要入到什么区 - PointDto endDto = SpringContextHolder.getBean(PointService.class).findByCode(point_code2); - if (ObjectUtil.isEmpty(endDto)) throw new BadRequestException("终点点位不存在"); - JSONObject jsonEndRegion = regionTab.query("region_id = '" + endDto.getRegion_id() + "'").uniqueResult(0); - - /* - * 物料出库业务：目前只有1个业务，如果区域不正确则报错 - * 1.养生A区 --> 油漆线 - */ - JSONObject resuft = new JSONObject(); - if (StrUtil.equals(jsonEndRegion.getString("region_code"), RegionTypeEnum.YQQY.getCode())) { - JSONObject map = new JSONObject(); - map.put("flag", "3"); - map.put("vehicle_type", vehicle_type); - map.put("material_id", material_id); - map.put("region_code", RegionTypeEnum.YSQA.getCode()); - resuft = WQL.getWO("ST_REGION_OUT_01").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isEmpty(resuft)) throw new BadRequestException("库存不足"); - } else { - throw new BadRequestException("业务类型错误"); - } - return resuft; - } -} 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 new file mode 100644 index 0000000..81f92bd --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java @@ -0,0 +1,296 @@ +package org.nl.wms.sch.tasks.callMaterial; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +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.WQL; +import org.nl.modules.wql.core.bean.WQLObject; +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.util.IdUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + + +/** + *油漆线叫料 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class YqxCallMaterial extends AbstractAcsTask { + private final String THIS_CLASS = YqxCallMaterial.class.getName(); + + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateTaskStatus(JSONObject task, String status) { + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + + String task_id = task.getString("task_id"); + JSONObject taskObj = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); + + //任务取消 + if (StrUtil.equals(status, "0")) { + // 取消删除任务 + if (StrUtil.equals(taskObj.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { + throw new BadRequestException("已完成不能取消!"); + } + String point_code2 = taskObj.getString("point_code2"); + String point_code3 = taskObj.getString("point_code3"); + //说明未二次申请过 + if (ObjectUtil.isEmpty(point_code3)) { + JSONObject json = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); + json.put("lock_type", "1"); + pointTab.update(json); + } + taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); + taskObj.put("remark", "已取消"); + taskTab.update(taskObj); + } + + if ("1".equals(status)) { + // 更新任务状态为执行中 + taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode()); + taskObj.put("update_time", DateUtil.now()); + taskObj.put("car_no", taskObj.getString("car_no")); + taskTab.update(taskObj); + } + + if (StrUtil.equals(status, "2")) { + // 更改任务状态为完成 + taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); + taskObj.put("update_time", DateUtil.now()); + taskTab.update(taskObj); + + String point_code3 = taskObj.getString("point_code3"); + if (ObjectUtil.isEmpty(point_code3)) point_code3 = taskObj.getString("point_code2"); // 终点 + JSONObject point3Obj = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0); + JSONObject requestObj = task.getJSONObject("request_param"); + //工单标识 + String workorder_id = requestObj.getString("material_info_id"); + //生产工单表【PDM_BD_WorkOrder】 + WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); + JSONObject workorderObj = workOrderTab.query("workorder_id", workorder_id).uniqueResult(0); + + JSONObject point3 = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0); + + + //区域出入表【st_ivt_regionIO】 + WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO"); + JSONObject regionIoObj = new JSONObject(); + regionIoObj.put("iostorinv_id", IdUtil.getLongId()); + regionIoObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE")); + regionIoObj.put("buss_date", DateUtil.today()); + regionIoObj.put("io_type", "2"); + regionIoObj.put("region_id", point3.getString("region_id")); + regionIoObj.put("region_code", point3.getString("region_code")); + regionIoObj.put("region_name", point3.getString("region_name")); + regionIoObj.put("material_id", taskObj.getString("material_id")); + regionIoObj.put("vehicle_code", taskObj.getString("vehicle_code")); + regionIoObj.put("qty", requestObj.getString("qty")); + regionIoObj.put("bill_status", "3"); + regionIoObj.put("start_point_code", taskObj.getString("point_code1")); + regionIoObj.put("end_point_code", taskObj.getString("point_code3")); + regionIoObj.put("create_mode", "2"); + regionIoObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd")); + regionIoObj.put("create_id", SecurityUtils.getCurrentUserId()); + regionIoObj.put("create_name", SecurityUtils.getCurrentNickName()); + regionIoObj.put("create_time", DateUtil.now()); + regionIoTab.insert(regionIoObj); + + + //完成后将仓位库存删掉 + //仓位库存表【ST_IVT_StructIvt】 + WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); + ivtTab.delete("point_code = '" + taskObj.getString("point_code1") + "'"); + + // 点位解锁 并设置空位 + JSONObject material_point = pointTab.query("point_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0); + material_point.put("lock_type", "1"); + material_point.put("point_status", "1"); + pointTab.update(material_point); + } + + } + + @Override + public void findStartPoint() { + /* + * 根据业务找对应的起点 + */ + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 + WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 + JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '" + TaskStatusEnum.SURE_END.getCode() + "'").getResultJSONArray(0); + for (int i = 0; i < taskArr.size(); i++) { + JSONObject taskObj = taskArr.getJSONObject(i); + String material_id = taskObj.getString("material_id"); + String vehicle_type = taskObj.getString("vehicle_type"); + 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 + "%"); + //1、根据物料id查找养生A区物料点 + JSONObject json1 = WQL.getWO("QSCH_yqxCallMAterial_01").addParamMap(param1).process().uniqueResult(0); + if (ObjectUtil.isNotEmpty(json1)) { + Integer block_num = json1.getInteger("block_num"); + Integer row_num = json1.getInteger("row_num"); + Integer col_num = json1.getInteger("col_num"); + // 拿到点位 + JSONObject material_point = pointTab.query("point_id = '" + json1.getString("point_id") + "' and lock_type = '1'").uniqueResult(0); + if (ObjectUtil.isEmpty(material_point)) throw new BadRequestException("数据错误，请校验!"); + // 物料点位上锁 + material_point.put("lock_type", 2); + pointTab.update(material_point); + //需要设置等待点 + if (row_num < 9) { + //二楼终点追加任务，taskObj的code2存叫料点 + JSONObject jsonObject = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='9'").uniqueResult(0); + taskObj.put("point_code1", taskObj.getString("point_code2")); // 叫料点 + taskObj.put("point_code2", jsonObject.getString("point_code")); // 等待点 + taskObj.put("point_code3", material_point.getString("point_code")); // 物料点 + taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + taskObj.put("acs_task_type", "4"); + taskObj.put("update_time", DateUtil.now()); + } else if (row_num == 9) { + //二楼普通任务 + taskObj.put("point_code1", material_point.getString("point_code")); + taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + taskObj.put("acs_task_type", "2"); + taskObj.put("update_time", DateUtil.now()); + } + + taskTab.update(taskObj); + } else { + taskObj.put("remark", "养生A区无所需物料"); + taskObj.put("update_time", DateUtil.now()); + taskTab.update(taskObj); + } + + } + } + + @Override + public List addTask() { + /* + * 下发给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); + + ArrayList acsTaskArr = new ArrayList<>(); + for (int i = 0; i < arr.size(); i++) { + JSONObject json = arr.getJSONObject(i); + 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")) + .vehicle_code(json.getString("vehicle_code")) + .vehicle_type(json.getString("vehicle_type")) + .priority(json.getString("priority")) + .remark(json.getString("remark")) + .build(); + acsTaskArr.add(dto); + } + return acsTaskArr; + } + + @Override + public String createTask(JSONObject whereJson) { + String point_code2 = whereJson.getString("point_code2"); + String vehicle_type = whereJson.getString("vehicle_type"); + String vehicle_code = whereJson.getString("vehicle_code"); + String qty = whereJson.getString("qty"); + + //生产工单表【PDM_BD_WorkOrder】 + WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); + //点位基础表【SCH_BASE_Point】 + WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); + String device_code = pointTab.query("point_code = '" + point_code2 + "'").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")) + .task_type("task_type") + .task_status(TaskStatusEnum.SURE_END.getCode()) + .point_code2(point_code2) + .vehicle_code(vehicle_code) + .material_info_id(workOrderObj.getLong("workorder_id")) + .material_id(workOrderObj.getLong("material_id")) + .vehicle_type(vehicle_type) + .handle_class(THIS_CLASS) + .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); + + //创建好立即下发 + this.immediateNotifyAcs(); + return String.valueOf(dto.getTask_id()); + } + + @Override + public void forceFinish(String task_id) { + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); + if (ObjectUtil.isNotEmpty(taskObj)) + this.updateTaskStatus(taskObj,"2"); + } + + + @Override + public void cancel(String task_id) { + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); + if (ObjectUtil.isNotEmpty(taskObj)) + this.updateTaskStatus(taskObj,"0"); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public String againApply(String task_id) { + /* + * 再次下发任务处理方法 + * 涉及业务：入空载具、出空载具、入物料、出物料 + */ + + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 +// WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表 + + JSONObject taskObj = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0); +// JSONObject jsonPoint2 = pointTab.query("point_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0); // + + // code1是叫料点，code3是物料点 -> code1是物料点，code2是等待点，code3是叫料点 + String askPoint = taskObj.getString("point_code1"); + taskObj.put("point_code1", taskObj.getString("point_code3")); + taskObj.put("point_code3", askPoint); + + taskObj.put("remark", "二次申请货位"); + taskObj.put("update_time", DateUtil.now()); + taskTab.update(taskObj); + + return taskObj.getString("point_code3"); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql new file mode 100644 index 0000000..b9a018e --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql @@ -0,0 +1,71 @@ +[交易说明] + 交易名： 共挤线满料请求 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.region_code TYPEAS s_string + 输入.material_id TYPEAS s_string + 输入.vehicle_type TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + IF 输入.flag = "1" + QUERY + SELECT + p.point_id, + p.point_code, + p.point_name, + p.block_num, + p.row_num, + p.col_num + FROM + ST_IVT_StructIvt ivt + LEFT JOIN SCH_BASE_Point p on ivt.point_id = p.point_id + WHERE + p.is_used = '1' + AND is_delete = '0' + AND lock_type='1' + OPTION 输入.material_id <> "" + ivt.material_id = 输入.material_id + ENDOPTION + OPTION 输入.region_code <> "" + p.region_code = 输入.region_code + ENDOPTION + OPTION 输入.vehicle_type <> "" + p.can_vehicle_type like 输入.vehicle_type + ENDOPTION + ORDER BY block_num,col_num + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterial.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterial.java index 59b5829..6925c17 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterial.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterial.java @@ -132,6 +132,11 @@ public class GjxSendMaterial extends AbstractAcsTask { ivtObj.put("standing_time", workorderObj.getString("standing_time")); ivtObj.put("material_id", workorderObj.getString("material_id")); ivtTab.insert(ivtObj); + + // 点位解锁 + point3Obj.put("lock_type", "1"); + point3Obj.put("point_status", "3"); + pointTab.update(point3Obj); } } @@ -310,6 +315,9 @@ public class GjxSendMaterial extends AbstractAcsTask { taskObj.put("update_time", DateUtil.now()); taskTab.update(taskObj); + // 点位上锁 + jsonOnePoint.put("lock_type", "2"); + pointTab.update(jsonOnePoint); return jsonOnePoint.getString("point_code"); } }