From df6b492e95999cd2c10975b580b55b58e7a87814 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Thu, 29 Jan 2026 10:42:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?rev:=E7=94=9F=E7=AE=94=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/util/SlitterTaskUtil.java | 11 + .../service/impl/LuceneLogServiceImpl.java | 2 +- .../wms/pda/mps/rest/RawFoilController.java | 15 +- .../wms/pda/mps/service/RawFoilService.java | 4 +- .../mps/service/impl/BakingServiceImpl.java | 33 +- .../mps/service/impl/RawFoilServiceImpl.java | 445 ++++++++++-------- .../service/dao/mapper/CoolPointIvtMapper.xml | 5 - .../dao/mapper/RawfoilWorkOrderMapper.xml | 15 +- .../impl/RawfoilWorkOrderServiceImpl.java | 4 +- .../service/impl/SbPointIvtServiceImpl.java | 2 +- .../org/nl/wms/sch/tasks/CallEmpReelTask.java | 137 ++---- 11 files changed, 336 insertions(+), 337 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java index 77985a6..546ee08 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java @@ -138,6 +138,17 @@ public class SlitterTaskUtil { System.out.println(getComposePaperTubeInformation("玻璃纤维及其制品|FRP管|6英寸|15|1100", "1")); } + /** + * 判断字符串是否为数字（整数、小数、负数） + */ + public static boolean isNumeric(String str) { + if (str == null || str.isEmpty() || str.trim().isEmpty()) { + return false; + } + String s = str.trim(); + return s.matches("-?\\d+(\\.\\d+)?"); + } + /** * 设置所需的套管纸管信息 * @param param 任务参数 diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java index e43ffa4..179f39d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java @@ -98,7 +98,7 @@ public class LuceneLogServiceImpl implements EsLogService { @Override public JSONObject query(LogQuery logQuery) { JSONObject res = new JSONObject(); - PageResult page = new PageResult(); + PageResult page = new PageResult(); page.setPage(logQuery.getPage()); page.setPageSize(logQuery.getSize()); try { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java index dd2a1e4..b0e814e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java @@ -44,7 +44,6 @@ public class RawFoilController { @PostMapping("/queryRawFoilList") @Log("查询生箔工单") - public ResponseEntity queryRawFoilList(@RequestBody JSONObject whereJson) { HttpContext ctx = new HttpContext("11"); ctx.setPage((String) (whereJson.get("page"))); @@ -66,18 +65,18 @@ public class RawFoilController { return new ResponseEntity<>(rawFoilService.confirmBlanking(whereJson), HttpStatus.OK); } - @PostMapping("/scrollDowm") - @Log("下卷") + @PostMapping("/needEmptyAxis") + @Log("呼叫") - public ResponseEntity scrollDowm(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(rawFoilService.scrollDowm(whereJson), HttpStatus.OK); + public ResponseEntity needEmptyAxis(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(rawFoilService.needEmptyAxis(whereJson), HttpStatus.OK); } - @PostMapping("/scrollDowmTest") - @Log("下卷") + @PostMapping("/needEmptyAxisTest") + @Log("呼叫") public ResponseEntity scrollDowmTest(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(rawFoilService.scrollDowmTest(whereJson), HttpStatus.OK); + return new ResponseEntity<>(rawFoilService.needEmptyAxisTest(whereJson), HttpStatus.OK); } @PostMapping("/confirmWeight") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java index 21b60af..83755d2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java @@ -53,7 +53,7 @@ public interface RawFoilService { * @param whereJson / * @return JSONObject */ - JSONObject scrollDowm(JSONObject whereJson); + JSONObject needEmptyAxis(JSONObject whereJson); /** * 下卷 @@ -61,7 +61,7 @@ public interface RawFoilService { * @param whereJson / * @return JSONObject */ - JSONObject scrollDowmTest(JSONObject whereJson); + JSONObject needEmptyAxisTest(JSONObject whereJson); JSONObject query(JSONObject whereJson, HttpContext ctx); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 70daeb8..00d31c9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -19,6 +19,7 @@ import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper; import org.nl.b_lms.sch.point.dao.mapper.StIvtCoolregionioMapper; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dao.mapper.SchBaseTaskMapper; +import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; import org.nl.b_lms.storage_manage.md.dao.MdMeMaterialBase; import org.nl.b_lms.storage_manage.md.dao.mapper.MdMeMaterialBaseMapper; import org.nl.common.utils.SecurityUtils; @@ -32,6 +33,7 @@ import org.nl.modules.wql.core.content.HttpContext; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.system.service.param.ISysParamService; +import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; @@ -40,10 +42,7 @@ import org.nl.wms.pda.mps.service.HandleBakingService; import org.nl.wms.pdm.rawfoilworkorder.service.dao.*; import org.nl.wms.pdm.rawfoilworkorder.service.dao.mapper.*; import org.nl.wms.pdm.rawfoilworkorder.service.dto.HotPointIvtDto; -import org.nl.wms.sch.tasks.CutConveyorTask; -import org.nl.wms.sch.tasks.InCoolIvtTask; -import org.nl.wms.sch.tasks.InHotTask; -import org.nl.wms.sch.tasks.OutHotTask; +import org.nl.wms.sch.tasks.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -113,6 +112,12 @@ public class BakingServiceImpl implements BakingService { String temperature = whereJson.getString("temperature"); // 温度 String hours = whereJson.getString("hours"); // 时间 String point_code1 = whereJson.getString("point_code"); // 点位 + if (!SlitterTaskUtil.isNumeric(hours)) { + throw new BadRequestException("请输入合法的时间!"); + } + if (!SlitterTaskUtil.isNumeric(temperature)) { + throw new BadRequestException("请输入合法的温度!"); + } //查询该点位是否存在未完成的任务 JSONObject hasTask = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code1 + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); if (hasTask != null) { @@ -136,11 +141,14 @@ public class BakingServiceImpl implements BakingService { throw new BadRequestException("未查询到母卷号：" + container_name + "对应的生箔机台编号！"); } - String mes_used = paramService.findByCode("mes_used").getValue(); - if (StrUtil.equals("1", mes_used)) { - if (!"1".equals(rawfoilWorkOrder.getIs_baking())) { - throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！"); - } +// String mes_used = paramService.findByCode("mes_used").getValue(); +// if (StrUtil.equals("1", mes_used)) { +// if (!"1".equals(rawfoilWorkOrder.getIs_baking())) { +// throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！"); +// } +// } + if (StrUtil.equals("1", sbPointIvt.getMes_used()) && !"1".equals(rawfoilWorkOrder.getIs_baking())) { + throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！"); } if (ObjectUtil.isEmpty(container_name)) { throw new BadRequestException("母卷号不能为空"); @@ -155,6 +163,11 @@ public class BakingServiceImpl implements BakingService { throw new BadRequestException("点位不能为空"); } + String maxHour = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MAX_HOUR").getValue(); + + if (Integer.parseInt(hours) >= Integer.parseInt(maxHour)) { + throw new BadRequestException("设置的最大烘烤时间不能超过"+maxHour+"分钟"); + } /* * 根据点位判断是 冷却区入烘箱还是烘箱对接位入烘箱 */ @@ -856,7 +869,7 @@ public class BakingServiceImpl implements BakingService { param.put("product_area", jsonPoint.getProduct_area()); - InCoolIvtTask inCoolIvtTask = new InCoolIvtTask(); + InCoolIvtTask inCoolIvtTask = SpringContextHolder.getBean(InCoolIvtTask.class); String task_id = inCoolIvtTask.createTask(param); // 生成冷却区出入表 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index 5d16629..6727826 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -166,10 +166,10 @@ public class RawFoilServiceImpl implements RawFoilService { @Override public JSONObject queryRawFoilList(JSONObject whereJson, HttpContext ctx) { - PageHelper.startPage(Integer.parseInt(ctx.getPage()), Integer.parseInt(ctx.getRows())); +// PageHelper.startPage(Integer.parseInt(ctx.getPage()), Integer.parseInt(ctx.getRows())); JSONObject map = new JSONObject(); map.put("point_code", whereJson.getString("point_code")); - map.put("container_name", whereJson.getString("container_name")); +// map.put("container_name", whereJson.getString("container_name")); map.put("product_area", whereJson.getString("product_area")); //获取人员对应的区域 UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); @@ -251,15 +251,22 @@ public class RawFoilServiceImpl implements RawFoilService { public JSONObject confirmBlanking(JSONObject whereJson) { String point_code = whereJson.getString("point_code"); - //查询该点位对应的任务 - JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code + "' OR point_code2 = '" + point_code + "' OR point_code3 = '" + point_code + "' OR point_code4 = '" + point_code + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0); + JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); + RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper() + .eq(RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id"))); + if (!rawfoilWorkOrder.getStatus().equals("02")){ + throw new BadRequestException("工单状态不为空轴搬出"); + } + //查询该母卷号对应的任务 + String container_name = rawfoilWorkOrder.getContainer_name(); + JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '" + container_name + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0); if (ObjectUtil.isEmpty(task_jo)) { - throw new BadRequestException("点位编码【" + point_code + "】的任务不存在！"); + throw new BadRequestException("当前母卷AGV搬运任务不存在或已被强制完成！"); } // 查询生箔点位库存表 SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper() - .eq(SbPointIvt::getPoint_code, point_code.substring(0, point_code.length()-2))); + .eq(SbPointIvt::getExt_code, rawfoilWorkOrder.getResource_name())); if (ObjectUtil.isEmpty(stIvtSbpointivt)) { throw new BadRequestException("点位设备不存在"); } @@ -280,6 +287,10 @@ public class RawFoilServiceImpl implements RawFoilService { throw new BadRequestException("操作失败：" + result.getString("message ")); } + // 更新工单状态为确认下卷 + rawfoilWorkOrder.setStatus("03"); + rawfoilWorkOrderMapper.updateById(rawfoilWorkOrder); + JSONObject jo = new JSONObject(); jo.put("message", "操作成功!"); return jo; @@ -288,37 +299,74 @@ public class RawFoilServiceImpl implements RawFoilService { @Override @Transactional(rollbackFor = Exception.class) - public JSONObject scrollDowm(JSONObject whereJson) { + public JSONObject needEmptyAxis(JSONObject whereJson) { String message = "操作完成！"; - String type = whereJson.getString("type"); JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); - String point_code = whereJson.getString("point_code"); JSONObject param = new JSONObject(); - if ("1".equals(type) || "3".equals(type)) {// 1：取空取满放空放满， - handleType1And3(raw_jo, param, type); - } else if ("2".equals(type)) {//2：单上空轴 - handleType2(point_code, param); - } else if ("4".equals(type)) {//4：单下空轴 - handleType4(point_code, param); - } - CallEmpReelTask callEmpReelTask = new CallEmpReelTask(); + if (ObjectUtil.isEmpty(raw_jo)) { + throw new BadRequestException("生箔工单不能为空！"); + } + SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper() + .eq(ObjectUtil.isNotEmpty(raw_jo.getString("point_code")), SbPointIvt::getPoint_code, raw_jo.getString("point_code"))); + if (ObjectUtil.isEmpty(stIvtSbpointivt)) { + throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在"); + } + if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) { + throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！"); + } + JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("material_code = '" + raw_jo.getString("container_name") + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(task_jo)) { + throw new BadRequestException("该生箔工单存在未完成的任务，请先完成任务！"); + } + RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper() + .eq(ObjectUtil.isNotEmpty(raw_jo.getString("workorder_id")), RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id"))); + if (!StrUtil.equals(rawfoilWorkOrder.getStatus(), "01")) { + throw new BadRequestException("工单状态不为开始"); + } + JSONObject map = new JSONObject(); + map.put("product_area", stIvtSbpointivt.getProduct_area()); + map.put("point_location", stIvtSbpointivt.getPoint_location()); + map.put("point_type", "1"); + map.put("empty_point_status", "02"); + map.put("full_point_status", "01"); + List coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); + + //如果没找到则继续找下一节点 + if (CollectionUtil.isEmpty(coolPointIvtList)) { + String point_location = stIvtSbpointivt.getPoint_location(); + if (StrUtil.equals(point_location, "0")) map.put("point_location", "1"); + if (StrUtil.equals(point_location, "1")) map.put("point_location", "0"); + coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); + if (CollectionUtil.isEmpty(coolPointIvtList)) { + throw new BadRequestException("未查询到合适的冷却区点位"); + } + } + CoolPointIvt jsonIvt = coolPointIvtList.get(0); + param.put("point_code1", jsonIvt.getEmpty_point_code()); + param.put("point_code2", stIvtSbpointivt.getEmpty_point_code()); + param.put("point_code3", stIvtSbpointivt.getFull_point_code()); + param.put("point_code4", jsonIvt.getFull_point_code()); + param.put("task_type", "010101"); + + param.put("material_code", rawfoilWorkOrder.getContainer_name()); + param.put("product_area", rawfoilWorkOrder.getProduct_area()); + + CallEmpReelTask callEmpReelTask = SpringContextHolder.getBean(CallEmpReelTask.class); callEmpReelTask.createTask(param); // 更新工单状态 - if ("1".equals(type) || "3".equals(type)) { - RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(raw_jo.getString("workorder_id")), RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id"))); - rawfoilWorkOrder.setStatus("10"); - rawfoilWorkOrder.setUpdate_time(DateUtil.now()); - rawfoilWorkOrderMapper.updateById(rawfoilWorkOrder); - } + + rawfoilWorkOrder.setStatus("02"); + rawfoilWorkOrder.setUpdate_time(DateUtil.now()); + rawfoilWorkOrderMapper.updateById(rawfoilWorkOrder); + JSONObject jo = new JSONObject(); jo.put("message", message); return jo; } @Override - public JSONObject scrollDowmTest(JSONObject whereJson) { + public JSONObject needEmptyAxisTest(JSONObject whereJson) { SbPointIvt sbPointIvt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper().eq(ObjectUtil.isNotEmpty(whereJson.getString("point_code")), SbPointIvt::getPoint_code, whereJson.getString("point_code"))); if (ObjectUtil.isEmpty(sbPointIvt)) { throw new BadRequestException("点位设备不存在"); @@ -335,9 +383,9 @@ public class RawFoilServiceImpl implements RawFoilService { rawfoilWorkOrder.setUp_coiler_date(DateUtil.now()); rawfoilWorkOrder.setIs_reload_send("0"); rawfoilWorkOrder.setOrder_type("2"); - rawfoilWorkOrder.setProduct_area("B2"); + rawfoilWorkOrder.setProduct_area("A4"); rawfoilWorkOrder.setRealstart_time(DateUtil.now()); - rawfoilWorkOrder.setStatus("00"); + rawfoilWorkOrder.setStatus("01"); rawfoilWorkOrder.setIs_delete("0"); rawfoilWorkOrder.setAgvno("0"); rawfoilWorkOrder.setProductin_qty(BigDecimal.valueOf(0)); @@ -406,52 +454,49 @@ public class RawFoilServiceImpl implements RawFoilService { } } - private void handleType1And3(JSONObject raw_jo, JSONObject param, String type) { - if (ObjectUtil.isEmpty(raw_jo)) { - throw new BadRequestException("生箔工单不能为空！"); - } - SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(raw_jo.getString("point_code")), SbPointIvt::getPoint_code, raw_jo.getString("point_code"))); - if (ObjectUtil.isEmpty(stIvtSbpointivt)) { - throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在"); - } - if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) { - throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！"); - } - JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("material_code = '" + raw_jo.getString("container_name") + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(task_jo)) { - throw new BadRequestException("该生箔工单存在未完成的任务，请先完成任务！"); - } - RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(raw_jo.getString("workorder_id")), RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id"))); - if (!StrUtil.equals(rawfoilWorkOrder.getStatus(), "30")) { - throw new BadRequestException("工单状态不为开始生产"); - } - if (StrUtil.equals("02", stIvtSbpointivt.getFull_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getEmpty_point_status())) { - JSONObject map = new JSONObject(); - map.put("product_area", stIvtSbpointivt.getProduct_area()); - map.put("point_location", stIvtSbpointivt.getPoint_location()); - map.put("point_type", "1"); - if ("1".equals(type)) { - map.put("empty_point_status", "02"); - map.put("full_point_status", "01"); - } else { - map.put("empty_point_status", "01"); - map.put("full_point_status", "01"); - } - List coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); - - String start_pint_code = ""; - String next_pint_code = ""; - String point_code4 = ""; - CoolPointIvt jsonIvt; - //如果没找到则继续找下一节点 - if (CollectionUtil.isEmpty(coolPointIvtList)) { -// adjustPointLocation(map, stIvtSbpointivt); -// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); -// if (CollectionUtil.isEmpty(coolPointIvtList)) { -// throw new BadRequestException("未查询到合适的点位"); -// } +// private void handleType1And3(JSONObject raw_jo, JSONObject param, String type) { +// if (ObjectUtil.isEmpty(raw_jo)) { +// throw new BadRequestException("生箔工单不能为空！"); +// } +// SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper() +// .eq(ObjectUtil.isNotEmpty(raw_jo.getString("point_code")), SbPointIvt::getPoint_code, raw_jo.getString("point_code"))); +// if (ObjectUtil.isEmpty(stIvtSbpointivt)) { +// throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在"); +// } +// if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) { +// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！"); +// } +// JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("material_code = '" + raw_jo.getString("container_name") + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); +// if (ObjectUtil.isNotEmpty(task_jo)) { +// throw new BadRequestException("该生箔工单存在未完成的任务，请先完成任务！"); +// } +// RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper() +// .eq(ObjectUtil.isNotEmpty(raw_jo.getString("workorder_id")), RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id"))); +// if (!StrUtil.equals(rawfoilWorkOrder.getStatus(), "01")) { +// throw new BadRequestException("工单状态不为开始"); +// } +// if (StrUtil.equals("02", stIvtSbpointivt.getFull_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getEmpty_point_status())) { +// JSONObject map = new JSONObject(); +// map.put("product_area", stIvtSbpointivt.getProduct_area()); +// map.put("point_location", stIvtSbpointivt.getPoint_location()); +// map.put("point_type", "1"); +// if ("1".equals(type)) { +// map.put("empty_point_status", "02"); +// map.put("full_point_status", "01"); +// } else { +// map.put("empty_point_status", "01"); +// map.put("full_point_status", "01"); +// } +// List coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); +// +// String start_pint_code = ""; +// String next_pint_code = ""; +// String point_code4 = ""; +// CoolPointIvt jsonIvt; +// //如果没找到则继续找下一节点 +// if (CollectionUtil.isEmpty(coolPointIvtList)) { +// throw new BadRequestException("未查询到合适的冷却区点位"); +// } else { // jsonIvt = coolPointIvtList.get(0); // if ("1".equals(type)) { // start_pint_code = jsonIvt.getEmpty_point_code(); @@ -459,140 +504,130 @@ public class RawFoilServiceImpl implements RawFoilService { // } else { // next_pint_code = jsonIvt.getFull_point_code(); // } - throw new BadRequestException("未查询到合适的冷却区点位"); - - } else { - jsonIvt = coolPointIvtList.get(0); - if ("1".equals(type)) { - start_pint_code = jsonIvt.getEmpty_point_code(); - point_code4 = jsonIvt.getFull_point_code(); - } else { - next_pint_code = jsonIvt.getFull_point_code(); - } - } - - if ("1".equals(type)) { - param.put("point_code1", start_pint_code); - param.put("point_code2", stIvtSbpointivt.getEmpty_point_code()); - param.put("point_code3", stIvtSbpointivt.getFull_point_code()); - param.put("point_code4", point_code4); - param.put("task_type", "010101"); - } else { - param.put("point_code1", stIvtSbpointivt.getFull_point_code()); - param.put("point_code2", next_pint_code); - param.put("task_type", "010102"); - } - - param.put("material_code", rawfoilWorkOrder.getContainer_name()); - param.put("product_area", rawfoilWorkOrder.getProduct_area()); - } else { - throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "不为有满卷且空轴位为空的状态！"); - } - } - - private void handleType2(String point_code, JSONObject param) { - if (ObjectUtil.isEmpty(point_code)) { - throw new BadRequestException("点位不能为空！"); - } - SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper() - .eq(SbPointIvt::getPoint_code, point_code)); - if (ObjectUtil.isEmpty(stIvtSbpointivt)) { - throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在"); - } - if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) { - throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！"); - } - if (StrUtil.equals("01", stIvtSbpointivt.getEmpty_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getFull_point_status())) { - JSONObject map = new JSONObject(); - map.put("product_area", stIvtSbpointivt.getProduct_area()); - map.put("point_location", stIvtSbpointivt.getPoint_location()); - map.put("empty_point_status", "02"); - map.put("full_point_status", "01"); - List coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); - String start_pint_code = ""; - //如果没找到则继续找下一节点 - CoolPointIvt jsonIvt; - if (ObjectUtil.isEmpty(coolPointIvtList)) { -// adjustPointLocation(map, stIvtSbpointivt); -// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); -// if (CollectionUtil.isEmpty(coolPointIvtList)) { -// throw new BadRequestException("未查询到合适的点位"); -// } +// } +// +// if ("1".equals(type)) { +// param.put("point_code1", start_pint_code); +// param.put("point_code2", stIvtSbpointivt.getEmpty_point_code()); +// param.put("point_code3", stIvtSbpointivt.getFull_point_code()); +// param.put("point_code4", point_code4); +// param.put("task_type", "010101"); +// } else { +// param.put("point_code1", stIvtSbpointivt.getFull_point_code()); +// param.put("point_code2", next_pint_code); +// param.put("task_type", "010102"); +// } +// +// param.put("material_code", rawfoilWorkOrder.getContainer_name()); +// param.put("product_area", rawfoilWorkOrder.getProduct_area()); +// } else { +// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "不为有满卷且空轴位为空的状态！"); +// } +// } +// +// private void handleType2(String point_code, JSONObject param) { +// if (ObjectUtil.isEmpty(point_code)) { +// throw new BadRequestException("点位不能为空！"); +// } +// SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper() +// .eq(SbPointIvt::getPoint_code, point_code)); +// if (ObjectUtil.isEmpty(stIvtSbpointivt)) { +// throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在"); +// } +// if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) { +// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！"); +// } +// if (StrUtil.equals("01", stIvtSbpointivt.getEmpty_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getFull_point_status())) { +// JSONObject map = new JSONObject(); +// map.put("product_area", stIvtSbpointivt.getProduct_area()); +// map.put("point_location", stIvtSbpointivt.getPoint_location()); +// map.put("empty_point_status", "02"); +// map.put("full_point_status", "01"); +// List coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); +// String start_pint_code = ""; +// //如果没找到则继续找下一节点 +// CoolPointIvt jsonIvt; +// if (ObjectUtil.isEmpty(coolPointIvtList)) { +//// adjustPointLocation(map, stIvtSbpointivt); +//// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); +//// if (CollectionUtil.isEmpty(coolPointIvtList)) { +//// throw new BadRequestException("未查询到合适的点位"); +//// } +//// jsonIvt = coolPointIvtList.get(0); +//// start_pint_code = jsonIvt.getEmpty_point_code(); +// throw new BadRequestException("未查询到合适的冷却区点位"); +// } else { // jsonIvt = coolPointIvtList.get(0); // start_pint_code = jsonIvt.getEmpty_point_code(); - throw new BadRequestException("未查询到合适的冷却区点位"); - } else { - jsonIvt = coolPointIvtList.get(0); - start_pint_code = jsonIvt.getEmpty_point_code(); - } - param.put("point_code1", start_pint_code); - param.put("point_code2", stIvtSbpointivt.getEmpty_point_code()); - param.put("task_type", "010103"); - param.put("product_area", jsonIvt.getProduct_area()); - } else { - throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "空轴位或者满轴位不为空！"); - } - } - - private void handleType4(String point_code, JSONObject param) { - if (ObjectUtil.isEmpty(point_code)) { - throw new BadRequestException("点位不能为空！"); - } - SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper() - .eq(SbPointIvt::getPoint_code, point_code)); - if (ObjectUtil.isEmpty(stIvtSbpointivt)) { - throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在"); - } - if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) { - throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！"); - } - List rawfoilWorkOrderList = rawfoilWorkOrderMapper.selectList(new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(stIvtSbpointivt.getExt_code()), RawfoilWorkOrder::getResource_name, stIvtSbpointivt.getExt_code()) - .eq(RawfoilWorkOrder::getStatus, "30")); - if (rawfoilWorkOrderList.size() > 0) { - throw new BadRequestException("该机台已经存在开始生产的工单，请先维护再重试！"); - } - - if (StrUtil.equals("02", stIvtSbpointivt.getEmpty_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getFull_point_status())) { - JSONObject map = new JSONObject(); - map.put("product_area", stIvtSbpointivt.getProduct_area()); - map.put("point_location", stIvtSbpointivt.getPoint_location()); - map.put("empty_point_status", "01"); - map.put("full_point_status", "01"); - List coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); - - String next_pint_code = ""; - CoolPointIvt jsonIvt; - //如果没找到则继续找下一节点 - if (CollectionUtil.isEmpty(coolPointIvtList)) { -// adjustPointLocation(map, stIvtSbpointivt); -// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); -// if (CollectionUtil.isEmpty(coolPointIvtList)) { -// throw new BadRequestException("未查询到合适的点位"); -// } +// } +// param.put("point_code1", start_pint_code); +// param.put("point_code2", stIvtSbpointivt.getEmpty_point_code()); +// param.put("task_type", "010103"); +// param.put("product_area", jsonIvt.getProduct_area()); +// } else { +// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "空轴位或者满轴位不为空！"); +// } +// } +// +// private void handleType4(String point_code, JSONObject param) { +// if (ObjectUtil.isEmpty(point_code)) { +// throw new BadRequestException("点位不能为空！"); +// } +// SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper() +// .eq(SbPointIvt::getPoint_code, point_code)); +// if (ObjectUtil.isEmpty(stIvtSbpointivt)) { +// throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在"); +// } +// if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) { +// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！"); +// } +// List rawfoilWorkOrderList = rawfoilWorkOrderMapper.selectList(new LambdaQueryWrapper() +// .eq(ObjectUtil.isNotEmpty(stIvtSbpointivt.getExt_code()), RawfoilWorkOrder::getResource_name, stIvtSbpointivt.getExt_code()) +// .eq(RawfoilWorkOrder::getStatus, "30")); +// if (rawfoilWorkOrderList.size() > 0) { +// throw new BadRequestException("该机台已经存在开始生产的工单，请先维护再重试！"); +// } +// +// if (StrUtil.equals("02", stIvtSbpointivt.getEmpty_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getFull_point_status())) { +// JSONObject map = new JSONObject(); +// map.put("product_area", stIvtSbpointivt.getProduct_area()); +// map.put("point_location", stIvtSbpointivt.getPoint_location()); +// map.put("empty_point_status", "01"); +// map.put("full_point_status", "01"); +// List coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); +// +// String next_pint_code = ""; +// CoolPointIvt jsonIvt; +// //如果没找到则继续找下一节点 +// if (CollectionUtil.isEmpty(coolPointIvtList)) { +//// adjustPointLocation(map, stIvtSbpointivt); +//// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map); +//// if (CollectionUtil.isEmpty(coolPointIvtList)) { +//// throw new BadRequestException("未查询到合适的点位"); +//// } +//// jsonIvt = coolPointIvtList.get(0); +//// next_pint_code = jsonIvt.getEmpty_point_code(); +// throw new BadRequestException("未查询到合适的冷却区点位"); +// } else { // jsonIvt = coolPointIvtList.get(0); // next_pint_code = jsonIvt.getEmpty_point_code(); - throw new BadRequestException("未查询到合适的冷却区点位"); - } else { - jsonIvt = coolPointIvtList.get(0); - next_pint_code = jsonIvt.getEmpty_point_code(); - } - - param.put("point_code1", stIvtSbpointivt.getEmpty_point_code()); - param.put("point_code2", next_pint_code); - param.put("task_type", "010104"); - param.put("product_area", jsonIvt.getProduct_area()); - } else { - throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "不是满轴位为空且空轴位不为空的状态！"); - } - } - - private void adjustPointLocation(JSONObject map, SbPointIvt stIvtSbpointivt) { - String point_location = stIvtSbpointivt.getPoint_location(); - if (StrUtil.equals(point_location, "0")) { - map.put("point_location", "1"); - } else if (StrUtil.equals(point_location, "1")) { - map.put("point_location", "0"); - } - } +// } +// +// param.put("point_code1", stIvtSbpointivt.getEmpty_point_code()); +// param.put("point_code2", next_pint_code); +// param.put("task_type", "010104"); +// param.put("product_area", jsonIvt.getProduct_area()); +// } else { +// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "不是满轴位为空且空轴位不为空的状态！"); +// } +// } +// +// private void adjustPointLocation(JSONObject map, SbPointIvt stIvtSbpointivt) { +// String point_location = stIvtSbpointivt.getPoint_location(); +// if (StrUtil.equals(point_location, "0")) { +// map.put("point_location", "1"); +// } else if (StrUtil.equals(point_location, "1")) { +// map.put("point_location", "0"); +// } +// } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml index f7a2577..498ac3b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml @@ -107,17 +107,14 @@ AND full_point_status = '01' AND empty_point_status = '01' - AND point_type = #{point_type} - AND point_type = '1' - AND NOT EXISTS ( SELECT 1 FROM sch_base_task @@ -127,12 +124,10 @@ AND is_delete = '0' ) - AND product_area = #{product_area} - AND point_location = #{point_location} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/RawfoilWorkOrderMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/RawfoilWorkOrderMapper.xml index e9cb537..8b1db22 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/RawfoilWorkOrderMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/RawfoilWorkOrderMapper.xml @@ -33,8 +33,7 @@ PDM_BI_RawFoilWorkOrder der LEFT JOIN st_ivt_sbpointivt sb ON sb.ext_code = der.resource_name WHERE - der.status = '00' - OR der.status = '10' + der.status = '01' AND der.is_delete = '0' AND sb.product_area IN @@ -49,15 +48,17 @@ AND der.product_area = #{map.product_area} + order by der.container_name - SELECT * FROM @@ -164,7 +164,7 @@ ) - AND product_area = #{product_area} + AND product_area = #{param.product_area} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index a20907c..19b16ed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -70,6 +70,10 @@ public class CoolCutTask extends AbstractAcsTask { private RawfoilWorkOrderMapper rawfoilWorkOrderMapper; + @Autowired + private CutConveyorTask cutConveyorTask; + + @Override public List addTask() { /* @@ -307,7 +311,7 @@ public class CoolCutTask extends AbstractAcsTask { coolPointIvtMapper.updateById(jsonCoolIvt); //更新母卷状态 - RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper().eq(RawfoilWorkOrder::getContainer_name, schBaseTask.getMaterial_code())); + RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper().eq(RawfoilWorkOrder::getContainer_name, schBaseTask.getVehicle_code())); rawfoilWorkOrder.setOrigin("3"); rawfoilWorkOrder.setRoll_status("3"); rawfoilWorkOrder.setUpdate_optid(currentUserId); @@ -333,7 +337,6 @@ public class CoolCutTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task"); - CutConveyorTask cutConveyorTask = new CutConveyorTask(); String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index d72a053..e224e3b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -313,7 +313,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { if (StrUtil.isNotEmpty(box_name)) { String[] s = box_name.split("木箱"); String s1 = s[1]; - String[] split = s1.split("\\|"); + String[] split = s1.split("\\\\"); mp.put("木箱规格/尺寸", split[1] + "*" + split[2]); } else { mp.put("木箱规格/尺寸", ""); @@ -493,7 +493,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { if (StrUtil.isNotEmpty(box_name)) { String[] s = box_name.split("木箱"); String s1 = s[1]; - String[] split = s1.split("\\|"); + String[] split = s1.split("\\\\"); mp.put("木箱规格/尺寸", split[1] + "*" + split[2]); } else { mp.put("木箱规格/尺寸", ""); @@ -591,7 +591,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { if (StrUtil.isNotEmpty(box_name)) { String[] s = box_name.split("木箱"); String s1 = s[1]; - String[] split = s1.split("\\|"); + String[] split = s1.split("\\\\"); mp.put("木箱规格/尺寸", split[1] + "*" + split[2]); } else { mp.put("木箱规格/尺寸", ""); @@ -654,4 +654,6 @@ public class InBillQueryServiceImpl implements InBillQueryService { FileUtil.downloadExcel(list, response); } + + } From 9a6b3973fd28ee185a72862384f7ee708084a94d Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Wed, 4 Feb 2026 13:13:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/BakingServiceImpl.java | 27 +++++++------ .../service/dao/mapper/HotPointIvtMapper.xml | 2 +- .../org/nl/wms/sch/manage/AutoInHotTask.java | 6 ++- .../wms/sch/manage/AutoIntoHotCacheTask.java | 4 +- .../org/nl/wms/sch/tasks/CoolCutTask.java | 4 +- .../java/org/nl/wms/sch/tasks/InHotTask.java | 39 +++++++++++-------- 6 files changed, 49 insertions(+), 33 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 00d31c9..8008915 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -209,6 +209,9 @@ public class BakingServiceImpl implements BakingService { } } } + if (ObjectUtil.isEmpty(jsonHotIvt)) { + throw new BadRequestException("烘烤区没有合适温度的空位！"); + } // 2.创建暂存位 --> 烘烤区任务 JSONObject param = new JSONObject(); param.put("type", "2"); // 1- 冷却区入烘箱 2- 暂存位入烘箱 @@ -218,7 +221,7 @@ public class BakingServiceImpl implements BakingService { param.put("product_area", schBasePoint.getProduct_area()); param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60)); - InHotTask inHotTask = new InHotTask(); + InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); String task_id = inHotTask.createTask(param); // 3.插入主表 @@ -279,25 +282,24 @@ public class BakingServiceImpl implements BakingService { //只找入箱点位 map.put("point_type", "4"); - String point_code2 = ""; List point_code2_jo = schBasePointMapper.selectList(map); - if (ObjectUtil.isNotEmpty(point_code2_jo)) { - point_code2 = point_code2_jo.get(0).getPoint_code(); + if (ObjectUtil.isEmpty(point_code2_jo)) { + throw new BadRequestException("未查询到可用的点位类型为入箱的烘箱对接位（可能被占用，请稍后再试）！"); } String point_code3 = ""; SchBasePoint point = point_code2_jo.get(0); HotPointIvt jsonHotIvt = getJsonObject(product_area, point, temperature); if (ObjectUtil.isNotEmpty(jsonHotIvt)) { - point_code3 = jsonHotIvt.getPoint_code(); + throw new BadRequestException("烘烤区没有合适温度的空位！"); } // 3.创建冷却区 --> 烘烤区任务 JSONObject param = new JSONObject(); param.put("type", "1"); // 1- 冷却区入烘箱 2- 暂存位入烘箱 param.put("point_code1", point_code1); - param.put("point_code2", point_code2); - param.put("point_code3", point_code3); + param.put("point_code2", point_code2_jo.get(0).getPoint_code()); + param.put("point_code3", jsonHotIvt.getPoint_code()); param.put("material_code", container_name); param.put("product_area", product_area); param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60)); @@ -305,7 +307,7 @@ public class BakingServiceImpl implements BakingService { param.put("param", map); // 创建冷却区 --> 暂存位的任务 - InHotTask inHotTask = new InHotTask(); + InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); String task_id = inHotTask.createTask(param); // 4.插入烘箱区出入主表 @@ -373,7 +375,8 @@ public class BakingServiceImpl implements BakingService { } //查询该点位是否存在未完成的任务 - boolean have_task = new CutConveyorTask().isSingleTask(point_code1); + CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class); + boolean have_task = cutConveyorTask.isSingleTask(point_code1); if (have_task) { throw new BadRequestException("该点位存在未完成的任务！"); } @@ -601,7 +604,7 @@ public class BakingServiceImpl implements BakingService { param.put("product_area", jsonPointZc.getProduct_area()); param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60)); - InHotTask inHotTask = new InHotTask(); + InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); String task_id = inHotTask.createTask(param); // 3.插入主表 @@ -698,7 +701,7 @@ public class BakingServiceImpl implements BakingService { param.put("param", map); // 创建冷却区 --> 暂存位的任务 - InHotTask inHotTask = new InHotTask(); + InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); String task_id = inHotTask.createTask(param); // 4.插入烘箱区出入主表 @@ -1147,7 +1150,7 @@ public class BakingServiceImpl implements BakingService { param.put("product_area", jsonPointZc.getProduct_area()); param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60)); - InHotTask inHotTask = new InHotTask(); + InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); String task_id = inHotTask.createTask(param); // 3.插入主表 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml index 721d81b..117f2e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml @@ -35,7 +35,7 @@ SELECT * FROM sch_base_task WHERE (point_code3 = ivt.point_code OR point_code1 = ivt.point_code OR point_code2 = ivt.point_code OR point_code4 = ivt.point_code) - AND task_status ] '07' + AND task_status '07' AND is_delete = '0' ) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoInHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoInHotTask.java index efea08e..f1255af 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoInHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoInHotTask.java @@ -13,6 +13,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.RedisUtils; 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.tasks.InHotTask; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; @@ -42,7 +43,7 @@ public class AutoInHotTask { try { if (tryLock) { List tasks = taskService.list(new LambdaQueryWrapper() - .eq(SchBaseTask::getTask_type, "010201") + .eq(SchBaseTask::getTask_type, "010206") .eq(SchBaseTask::getIs_delete, "0") .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode())); for (SchBaseTask task : tasks) { @@ -87,7 +88,8 @@ public class AutoInHotTask { task.setRemark("-"); task.setUpdate_time(DateUtil.now()); taskService.updateById(task); - new InHotTask().immediateNotifyAcs(task.getTask_id()); + InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); + inHotTask.immediateNotifyAcs(task.getTask_id()); } public JSONObject getJsonObject(String product_area, JSONObject point_code2_jo, String temperature) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoIntoHotCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoIntoHotCacheTask.java index 7eca47a..010c4bd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoIntoHotCacheTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoIntoHotCacheTask.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.modules.wql.WQL; +import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.sch.tasks.InHotTask; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; @@ -50,7 +51,8 @@ public class AutoIntoHotCacheTask { log.info("烘箱对接位：{} 没找到暂存位！", task.getPoint_code1()); return; } - new InHotTask().immediateNotifyAcs(task.getTask_id()); + InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); + inHotTask.immediateNotifyAcs(task.getTask_id()); task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); task.setPoint_code2(cache_jo.getString("point_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 19b16ed..4e4864d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -24,6 +24,7 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; @@ -311,7 +312,7 @@ public class CoolCutTask extends AbstractAcsTask { coolPointIvtMapper.updateById(jsonCoolIvt); //更新母卷状态 - RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper().eq(RawfoilWorkOrder::getContainer_name, schBaseTask.getVehicle_code())); + RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper().eq(RawfoilWorkOrder::getContainer_name, schBaseTask.getMaterial_code())); rawfoilWorkOrder.setOrigin("3"); rawfoilWorkOrder.setRoll_status("3"); rawfoilWorkOrder.setUpdate_optid(currentUserId); @@ -337,6 +338,7 @@ public class CoolCutTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task"); + CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class); String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java index a911ced..d13c721 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java @@ -266,7 +266,7 @@ public class InHotTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { - CutConveyorTask cutConveyorTask = new CutConveyorTask(); + CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class); String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); @@ -293,17 +293,20 @@ public class InHotTask extends AbstractAcsTask { task.setTask_id(IdUtil.getSnowflake(1, 1).nextId() + ""); task.setTask_code(IdUtil.getSnowflake(1, 1).nextId() + ""); task.setTask_type("010201"); - if (StrUtil.isNotEmpty(point_code2) && StrUtil.isNotEmpty(point_code3)) { - task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); - task.setPoint_code2(form.getString("point_code2")); - task.setPoint_code3(form.getString("point_code3")); - } else { - task.setTask_status(TaskStatusEnum.SURE_START.getCode()); - task.setPoint_code2(""); - task.setPoint_code3(""); - task.setRemark(form.toJSONString()); - } +// if (StrUtil.isNotEmpty(point_code2) && StrUtil.isNotEmpty(point_code3)) { +// task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); +// task.setPoint_code2(form.getString("point_code2")); +// task.setPoint_code3(form.getString("point_code3")); +// } else { +// task.setTask_status(TaskStatusEnum.SURE_START.getCode()); +// task.setPoint_code2(""); +// task.setPoint_code3(""); +// task.setRemark(form.toJSONString()); +// } + task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); task.setPoint_code1(form.getString("point_code1")); + task.setPoint_code2(form.getString("point_code2")); + task.setPoint_code3(form.getString("point_code3")); task.setProduct_area(form.getString("product_area")); task.setRequest_param(form.getString("request_param")); task.setSort_seq(BigDecimal.valueOf(1)); @@ -319,12 +322,16 @@ public class InHotTask extends AbstractAcsTask { } else { task.setPriority(priority_jo.getValue()); } - task.setAcs_task_type("8"); + if (StrUtil.isNotEmpty(form.getString("point_code3"))) { + task.setAcs_task_type("8"); + }else { + task.setAcs_task_type("6"); + } schBaseTaskMapper.insert(task); task_id = task.getTask_id(); - if ("04".equals(task.getTask_status())) { - immediateNotifyAcs(task_id); - } +// if ("04".equals(task.getTask_status())) { +// immediateNotifyAcs(task_id); +// } //更新对应点位库存为已裹膜 CoolPointIvt cool_ivt = coolPointIvtMapper.selectOne(new LambdaQueryWrapper().eq(CoolPointIvt::getFull_point_code, form.getString("point_code1"))); if (ObjectUtil.isEmpty(cool_ivt)) { @@ -370,8 +377,8 @@ public class InHotTask extends AbstractAcsTask { task.setAcs_task_type("6"); schBaseTaskMapper.insert(task); task_id = task.getTask_id(); - immediateNotifyAcs(task_id); } + immediateNotifyAcs(task_id); return task_id; } From 3f836d4e53f2e0c322336b2103ff5f67c987b104 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Thu, 5 Feb 2026 13:24:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?add=20=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95b?= =?UTF-8?q?ug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/point/dao/SchBasePoint.java | 6 + .../point/dao/mapper/SchBasePointMapper.java | 3 +- .../point/dao/mapper/SchBasePointMapper.xml | 225 ++++++++++-------- .../b_lms/sch/point/dto/SchBasePointDto.java | 169 +------------ .../task/dao/mapper/SchBaseTaskMapper.java | 4 +- .../sch/task/dao/mapper/SchBaseTaskMapper.xml | 7 + .../tasks/slitter/util/SlitterTaskUtil.java | 2 +- .../nl/config/mybatis/MybatisPlusConfig.java | 7 +- .../mps/service/impl/BakingServiceImpl.java | 76 +++--- .../mps/service/impl/FeedingServiceImpl.java | 17 +- .../service/dao/mapper/CoolPointIvtMapper.xml | 14 +- .../service/dao/mapper/HotPointIvtMapper.xml | 2 +- .../org/nl/wms/sch/tasks/CoolCutTask.java | 4 +- .../org/nl/wms/sch/tasks/InCoolIvtTask.java | 2 +- .../java/org/nl/wms/sch/tasks/InHotTask.java | 24 +- .../java/org/nl/wms/sch/tasks/OutHotTask.java | 2 +- 16 files changed, 225 insertions(+), 339 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java index 2f9f6ce..e4390d8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java @@ -255,6 +255,10 @@ public class SchBasePoint extends Model { private String update_optname; + + + + /** * 修改时间 */ @@ -275,6 +279,8 @@ public class SchBasePoint extends Model { + + /** * 获取主键值 * diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java index 8e0c949..85b070a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.nl.b_lms.sch.point.dao.SchBasePoint; +import org.nl.b_lms.sch.point.dto.SchBasePointDto; import java.util.List; @@ -54,7 +55,7 @@ public interface SchBasePointMapper extends BaseMapper { List selectList(@Param("param") JSONObject map); - List selectDjwPoints(@Param("param") JSONObject map); + List selectDjwPoints( JSONObject map); @Select("SELECT * FROM sch_base_point WHERE region_code = 'BLKCK' and is_used = '1'") List selectByReginCode(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml index 42c5d02..d6317c6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml @@ -173,106 +173,133 @@ ORDER BY po.in_order_seq DESC - SELECT - a.*, - b.num - FROM - sch_base_point a - INNER JOIN ( - SELECT - COUNT(c.task_id) AS num, - c.point_code - FROM - ( - SELECT - task.task_id, - point_code - FROM - SCH_BASE_Point po - LEFT JOIN sch_base_task task ON task.point_code1 = po.point_code - AND task.task_status '07' - AND task.is_delete = '0' - WHERE - po.is_delete = '0' - AND po.is_used = '1' - - AND po.region_id = #{reging_id} - + * + FROM + SCH_BASE_Point po + WHERE + po.is_delete = '0' + AND po.is_used = '1' + + AND po.region_id = #{reging_id} + + + AND po.point_location = #{point_location} + + + AND po.point_type = #{point_type} + + + AND IFNULL(po.material_code, '') = '' + + + AND IFNULL(po.material_code, '') = '' + - AND po.point_location = #{point_location} - - AND po.point_type = #{point_type} - - - AND IFNULL(po.material_code, '') = '' - - - AND IFNULL(po.material_code, '') = '' - - - UNION - - SELECT - task.task_id, - point_code - FROM - SCH_BASE_Point po - LEFT JOIN sch_base_task task ON task.point_code2 = po.point_code - AND task.task_status '07' - AND task.is_delete = '0' - WHERE - po.is_delete = '0' - AND po.is_used = '1' - - AND po.region_id = #{reging_id} - - - AND po.point_location = #{point_location} - - - AND po.point_type = #{point_type} - - - AND IFNULL(po.material_code, '') = '' - - - AND IFNULL(po.material_code, '') = '' - - - UNION - - SELECT - task.task_id, - point_code - FROM - SCH_BASE_Point po - LEFT JOIN sch_base_task task ON task.point_code3 = po.point_code - AND task.task_status '07' - AND task.is_delete = '0' - WHERE - po.is_delete = '0' - AND po.is_used = '1' - - AND po.region_id = #{reging_id} - - - AND po.point_location = #{point_location} - - - AND po.point_type = #{point_type} - - - AND IFNULL(po.material_code, '') = '' - - - AND IFNULL(po.material_code, '') = '' - - ) c - GROUP BY - c.point_code - ) b ON b.point_code = a.point_code - ORDER BY num, a.point_code diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointDto.java index 2e2dbb8..31d715f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointDto.java @@ -6,6 +6,7 @@ import java.io.Serializable; import lombok.*; import lombok.Data; import lombok.Builder; +import org.nl.b_lms.sch.point.dao.SchBasePoint; /** @@ -18,173 +19,9 @@ import lombok.Builder; @Builder @NoArgsConstructor @AllArgsConstructor -public class SchBasePointDto implements Serializable { +public class SchBasePointDto extends SchBasePoint implements Serializable { - private static final long serialVersionUID = -7739291296662381396L; - /** - * 点位标识 - */ - private Long point_id; - /** - * 点位编码 - */ - private String point_code; - /** - * 点位名称 - */ - private String point_name; - /** - * 所属区域 - */ - private Long region_id; - /** - * 区域编码 - */ - private String region_code; - /** - * 区域名称 - */ - private String region_name; - /** - * 点位类型 - */ - private String point_type; - /** - * 点位状态 - */ - private String point_status; - /** - * 锁定类型 - */ - private String lock_type; - /** - * 物料标识 - */ - private Long material_id; - /** - * 设备编码 - */ - private String device_code; - /** - * MES设备编码 - */ - private String mes_device_code; - /** - * 允许的载具类型 - */ - private String can_vehicle_type; - /** - * 载具允许最大数量 - */ - private BigDecimal vehicle_max_qty; - /** - * 载具类型 - */ - private String vehicle_type; - /** - * 载具编码 - */ - private String vehicle_code; - /** - * 载具数量 - */ - private BigDecimal vehicle_qty; - /** - * 块 - */ - private BigDecimal block_num; - /** - * 排 - */ - private BigDecimal row_num; - /** - * 列 - */ - private BigDecimal col_num; - /** - * 层 - */ - private BigDecimal layer_num; - /** - * 入库顺序 - */ - private BigDecimal in_order_seq; - /** - * 出库顺序 - */ - private BigDecimal out_order_seq; - /** - * 入空载具顺序 - */ - private BigDecimal in_empty_seq; - /** - * 出空载具顺序 - */ - private BigDecimal out_empty_seq; - /** - * 点位组编码 - */ - private String point_group_code; - /** - * 是否建工单 - */ - private String is_have_workder; - /** - * 在执行的任务标识 - */ - private Long task_id; - /** - * 生产区域 - */ - private String product_area; - /** - * 备注 - */ - private String remark; - /** - * 来源标识 - */ - private Long source_id; - /** - * 是否启用 - */ - private String is_used; - /** - * 是否删除 - */ - private String is_delete; - /** - * 创建人 - */ - private Long create_id; - /** - * 创建人 - */ - private String create_name; - /** - * 创建时间 - */ - private String create_time; - /** - * 修改人 - */ - private Long update_optid; - /** - * 修改人 - */ - private String update_optname; - /** - * 修改时间 - */ - private String update_time; - /** - * 位置 - */ - private String point_location; - /** - * 物料编码 - */ - private String material_code; + private Integer num; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java index dd5960f..8ef404d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java @@ -1,6 +1,6 @@ package org.nl.b_lms.sch.task.dao.mapper; -import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; +import org.apache.ibatis.annotations.Param; import org.nl.b_lms.sch.task.dao.SchBaseTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -34,4 +34,6 @@ public interface SchBaseTaskMapper extends BaseMapper { * @return */ List checkHaveStartTask(String code); + + Integer selectTaskCount(@Param("code") String code); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml index 0732f17..c8aa15a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml @@ -28,4 +28,11 @@ AND is_delete = '0' AND point_code1 = #{code} + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java index 546ee08..ac86eb6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java @@ -530,7 +530,7 @@ public class SlitterTaskUtil { JSONObject item = jsonArray.getJSONObject(i); String containerName = item.getString("container_name"); String site = item.getString("site"); - String left_or_right = item.getString("left_or_right"); + String left_or_right = item.getString("roll"); // 3. 检查 Plan 中是否存在对应的 container_name if (!planMap.containsKey(containerName)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java index 3e97fae..456cf9c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -1,19 +1,16 @@ package org.nl.config.mybatis; -import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; + import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.github.pagehelper.PageInterceptor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; -import javax.annotation.PostConstruct; import javax.sql.DataSource; @EnableTransactionManagement @@ -33,7 +30,7 @@ public class MybatisPlusConfig { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); //// // 分页插件 - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); //乐观锁插件 interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 8008915..6c4ea05 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -17,6 +17,7 @@ import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.dao.StIvtCoolregionio; import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper; import org.nl.b_lms.sch.point.dao.mapper.StIvtCoolregionioMapper; +import org.nl.b_lms.sch.point.dto.SchBasePointDto; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dao.mapper.SchBaseTaskMapper; import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; @@ -48,10 +49,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -290,7 +289,7 @@ public class BakingServiceImpl implements BakingService { String point_code3 = ""; SchBasePoint point = point_code2_jo.get(0); HotPointIvt jsonHotIvt = getJsonObject(product_area, point, temperature); - if (ObjectUtil.isNotEmpty(jsonHotIvt)) { + if (ObjectUtil.isEmpty(jsonHotIvt)) { throw new BadRequestException("烘烤区没有合适温度的空位！"); } @@ -341,12 +340,12 @@ public class BakingServiceImpl implements BakingService { stIvtCoolregionio.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + ""); stIvtCoolregionio.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE")); stIvtCoolregionio.setIo_type("1"); - stIvtCoolregionio.setMaterial_id(Long.getLong(jsonMater.getMaterial_id())); + stIvtCoolregionio.setMaterial_id(Long.parseLong(jsonMater.getMaterial_id())); stIvtCoolregionio.setPcsn(container_name); stIvtCoolregionio.setBill_status("50"); stIvtCoolregionio.setQty(jsonRaw.getProductin_qty()); - stIvtCoolregionio.setTask_id(Long.getLong(task_id)); - stIvtCoolregionio.setQty_unit_id(Long.getLong(jsonMater.getBase_unit_id())); + stIvtCoolregionio.setTask_id(Long.parseLong(task_id)); + stIvtCoolregionio.setQty_unit_id(Long.parseLong(jsonMater.getBase_unit_id())); stIvtCoolregionio.setStart_point_code(point_code1); stIvtCoolregionio.setEnd_point_code(jsonHotIvt.getPoint_code()); stIvtCoolregionio.setCreate_mode("03"); @@ -415,16 +414,25 @@ public class BakingServiceImpl implements BakingService { map.put("point_location", jsonHotIvt.getPoint_location()); //只找出箱点位 map.put("point_type", "5"); + //先查半区可用点，查任务数 + List pointArr = schBasePointMapper.selectDjwPoints(map); - List pointArr = schBasePointMapper.selectDjwPoints(map); if (ObjectUtil.isEmpty(pointArr)) { throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位！"); } + //查任务数最少的点位 + for (SchBasePointDto schBasePointDto : pointArr) { + Integer num = schBaseTaskMapper.selectTaskCount(schBasePointDto.getPoint_code()); + schBasePointDto.setNum(num); + } + + List sortPointArr = pointArr.stream().sorted(Comparator.comparingInt(SchBasePointDto::getNum)).collect(Collectors.toList()); + // 2.判断暂存位是否有任务：找到无任务的暂存位 String point_code2 = ""; - for (int i = 0; i < pointArr.size(); i++) { - SchBasePoint jsonPoint = pointArr.get(i); + for (int i = 0; i < sortPointArr.size(); i++) { + SchBasePoint jsonPoint = sortPointArr.get(i); String point_code = jsonPoint.getPoint_code(); SchBaseTask json_point_code1 = schBaseTaskMapper.selectOne(new LambdaQueryWrapper().eq(SchBaseTask::getPoint_code1, point_code).ne(SchBaseTask::getTask_status, "07").eq(SchBaseTask::getIs_delete, "0")); @@ -446,7 +454,7 @@ public class BakingServiceImpl implements BakingService { param.put("point_code2", point_code2); param.put("material_code", jsonHotIvt.getContainer_name()); param.put("product_area", jsonHotIvt.getProduct_area()); - OutHotTask outHotTask = new OutHotTask(); + OutHotTask outHotTask = SpringContextHolder.getBean(OutHotTask.class); String task_id = outHotTask.createTask(param); RawfoilWorkOrder jsonRaw = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper().eq(RawfoilWorkOrder::getContainer_name, jsonHotIvt.getContainer_name()).eq(RawfoilWorkOrder::getIs_delete, "0")); @@ -473,12 +481,13 @@ public class BakingServiceImpl implements BakingService { hotParam.put("start_point_code", point_code1); hotParam.put("end_point_code", point_code2); boolean exists = redisUtils.hHasKey(point_code1, "temperature"); - String point_temperature = ""; - if (exists) { - point_temperature = (String) redisUtils.hget(point_code1, "temperature"); - } else { - throw new BadRequestException("当前操作点位设备:" + point_code1 + ",无法获取温度，请稍后再试!"); - } + //烘箱测试 + String point_temperature = "2"; +// if (exists) { +// point_temperature = (String) redisUtils.hget(point_code1, "temperature"); +// } else { +// throw new BadRequestException("当前操作点位设备:" + point_code1 + ",无法获取温度，请稍后再试!"); +// } hotParam.put("temperature", point_temperature); if (ObjectUtil.isEmpty(last_hot_mst)) { hotParam.put("oven_time", "480"); @@ -733,12 +742,12 @@ public class BakingServiceImpl implements BakingService { jsonCool.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + ""); jsonCool.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE")); jsonCool.setIo_type("1"); - jsonCool.setMaterial_id(Long.getLong(jsonMater.getMaterial_id())); + jsonCool.setMaterial_id(Long.parseLong(jsonMater.getMaterial_id())); jsonCool.setPcsn(container_name); jsonCool.setBill_status("50"); jsonCool.setQty(jsonRaw.getProductin_qty()); - jsonCool.setQty_unit_id(Long.getLong(jsonMater.getBase_unit_id())); - jsonCool.setTask_id(Long.getLong(task_id)); + jsonCool.setQty_unit_id(Long.parseLong(jsonMater.getBase_unit_id())); + jsonCool.setTask_id(Long.parseLong(task_id)); jsonCool.setStart_point_code(point_code1); jsonCool.setEnd_point_code(jsonHotIvt.getPoint_code()); jsonCool.setCreate_mode("03"); @@ -766,11 +775,13 @@ public class BakingServiceImpl implements BakingService { throw new BadRequestException("烘箱对接没有可用位置!"); } JSONObject jsonMap = new JSONObject(); - jsonMap.put("flag", "1"); + jsonMap.put("product_area", product_area); jsonMap.put("point_location", point_code2_jo.getPoint_location()); List hot_rows = hotPointIvtMapper.selectHotPointList(jsonMap); - HotPointIvt jsonHotIvt = null; + //烘箱测试 + HotPointIvt jsonHotIvt = hot_rows.get(0); + /** for (int i = 0; i < hot_rows.size(); i++) { HotPointIvt hot_row = hot_rows.get(i); String point_code = hot_row.getPoint_code(); @@ -786,6 +797,7 @@ public class BakingServiceImpl implements BakingService { } } } + **/ return jsonHotIvt; } @@ -889,12 +901,12 @@ public class BakingServiceImpl implements BakingService { jsonCool.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + ""); jsonCool.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE")); jsonCool.setIo_type("0"); - jsonCool.setMaterial_id(Long.getLong(jsonMater.getMaterial_id())); + jsonCool.setMaterial_id(Long.parseLong(jsonMater.getMaterial_id())); jsonCool.setPcsn(container_name); jsonCool.setBill_status("10"); jsonCool.setQty(jsonRaw.getProductin_qty()); - jsonCool.setQty_unit_id(Long.getLong(jsonMater.getBase_unit_id())); - jsonCool.setTask_id(Long.getLong(task_id)); + jsonCool.setQty_unit_id(Long.parseLong(jsonMater.getBase_unit_id())); + jsonCool.setTask_id(Long.parseLong(task_id)); jsonCool.setStart_point_code(point_code1); jsonCool.setEnd_point_code(endPointCode); jsonCool.setCreate_mode("03"); @@ -936,7 +948,7 @@ public class BakingServiceImpl implements BakingService { hotRegionIoMst.setStart_point_code(param.getString("start_point_code")); hotRegionIoMst.setEnd_point_code(param.getString("end_point_code")); hotRegionIoMst.setCreate_mode("03"); - hotRegionIoMst.setTask_id(Long.getLong(param.getString("task_id"))); + hotRegionIoMst.setTask_id(Long.parseLong(param.getString("task_id"))); hotRegionIoMst.setTask_type(param.getString("task_type")); hotRegionIoMst.setTemperature(param.getBigDecimal("temperature")); hotRegionIoMst.setOven_time(param.getBigDecimal("oven_time")); @@ -1062,7 +1074,7 @@ public class BakingServiceImpl implements BakingService { String point_code1 = whereJson.getString("point_code"); // 点位 //查询该点位是否存在未完成的任务 List hasTask = schBaseTaskMapper.selectList(new LambdaQueryWrapper().eq(SchBaseTask::getPoint_code1, point_code1).lt(SchBaseTask::getTask_status, "07").eq(SchBaseTask::getIs_delete, "0")); - if (hasTask != null) { + if (!hasTask.isEmpty()) { SchBaseTask schBaseTask = hasTask.get(0); throw new BadRequestException("当前点位" + point_code1 + "存在正在执行的任务" + schBaseTask.getTask_code()); } @@ -1247,7 +1259,7 @@ public class BakingServiceImpl implements BakingService { param.put("request_param", "1");//1-不合格入冷却 2-合格入冷却 - InCoolIvtTask inCoolIvtTask = new InCoolIvtTask(); + InCoolIvtTask inCoolIvtTask = SpringContextHolder.getBean(InCoolIvtTask.class); String task_id = inCoolIvtTask.createTask(param); // 生成冷却区出入表 @@ -1264,12 +1276,12 @@ public class BakingServiceImpl implements BakingService { jsonCool.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + ""); jsonCool.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE")); jsonCool.setIo_type("0"); - jsonCool.setMaterial_id(Long.getLong(jsonMater.getMaterial_id())); + jsonCool.setMaterial_id(Long.parseLong(jsonMater.getMaterial_id())); jsonCool.setPcsn(container_name); jsonCool.setBill_status("10"); jsonCool.setQty(jsonRaw.getProductin_qty()); - jsonCool.setQty_unit_id(Long.getLong(jsonMater.getBase_unit_id())); - jsonCool.setTask_id(Long.getLong(task_id)); + jsonCool.setQty_unit_id(Long.parseLong(jsonMater.getBase_unit_id())); + jsonCool.setTask_id(Long.parseLong(task_id)); jsonCool.setStart_point_code(point_code1); jsonCool.setEnd_point_code(endPointCode); jsonCool.setCreate_mode("03"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java index fb63a34..115422e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java @@ -178,13 +178,12 @@ public class FeedingServiceImpl implements FeedingService { throw new BadRequestException("当前登录人员暂无【" + cool_jo.getProduct_area() + "】操作权限"); } } - String point_code = cool_jo.getPoint_code(); if (!StrUtil.equals(cool_jo.getFull_point_status(), "02")) { throw new BadRequestException("该点位上不存在母卷！"); } if (!StrUtil.equals(cool_jo.getContainer_name(), container_name)) { - throw new BadRequestException("该点位:" + point_code + "不存在母卷:" + container_name); + throw new BadRequestException("该点位:" + cool_jo.getFull_point_code() + "不存在母卷:" + container_name); } JSONObject result = new JSONObject(); result.put("message", "操作成功!"); @@ -194,14 +193,14 @@ public class FeedingServiceImpl implements FeedingService { throw new BadRequestException("该分切机对应的上料位存在母卷，不能下发搬运任务！"); } if (StrUtil.equals("01", cut_jo.getEmpty_point_status())) { - jo.put("point_code1", point_code); - jo.put("point_code2", next_point_code); + jo.put("point_code1", cool_jo.getFull_point_code()); + jo.put("point_code2", cut_jo.getFull_point_code()); jo.put("vehicle_code", cool_jo.getContainer_name()); jo.put("product_area", cut_jo.getProduct_area()); jo.put("task_type", "010302"); } else { - jo.put("point_code1", point_code); - jo.put("point_code2", next_point_code); + jo.put("point_code1", cool_jo.getFull_point_code()); + jo.put("point_code2", cut_jo.getFull_point_code()); jo.put("point_code3", cut_jo.getEmpty_point_code()); jo.put("point_code4", cool_jo.getEmpty_point_code()); jo.put("vehicle_code", cool_jo.getContainer_name()); @@ -233,11 +232,11 @@ public class FeedingServiceImpl implements FeedingService { jsonCool.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + ""); jsonCool.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE")); jsonCool.setIo_type("1"); - jsonCool.setMaterial_id(Long.getLong(mater_jo.getMaterial_id())); + jsonCool.setMaterial_id(Long.parseLong(mater_jo.getMaterial_id())); jsonCool.setPcsn(cool_jo.getContainer_name()); jsonCool.setBill_status("50"); - jsonCool.setQty_unit_id(Long.getLong("1")); - jsonCool.setTask_id(Long.getLong(task_id)); + jsonCool.setQty_unit_id(Long.parseLong("1")); + jsonCool.setTask_id(Long.parseLong(task_id)); jsonCool.setStart_point_code(cool_jo.getFull_point_code()); jsonCool.setEnd_point_code(cut_jo.getFull_point_code()); jsonCool.setCreate_mode("03"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml index c544d95..9f8564f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml @@ -107,11 +107,11 @@ AND full_point_status = '01' AND empty_point_status = '01' - - AND point_type = #{point_type} + + AND point_type = #{param.point_type} - + AND point_type = '1' @@ -124,12 +124,12 @@ AND is_delete = '0' ) - - AND product_area = #{product_area} + + AND product_area = #{param.product_area} - - AND point_location = #{point_location} + + AND point_location = #{param.point_location} ORDER BY sort_seq DESC diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml index 117f2e3..cc7dd85 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml @@ -13,7 +13,7 @@ OR point_code1 = ivt.point_code OR point_code2 = ivt.point_code OR point_code4 = ivt.point_code) - AND task_status ] '07' + AND task_status '07' AND is_delete = '0' ) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 4e4864d..3d944cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -211,7 +211,7 @@ public class CoolCutTask extends AbstractAcsTask { } //单送满卷 - if ("010302".equals(schBaseTask.getTask_status())) { + if ("010302".equals(schBaseTask.getTask_type())) { // 更新主表状态 StIvtCoolregionio coolMst = stIvtCoolregionioMapper.selectOne(new LambdaQueryWrapper().eq(StIvtCoolregionio::getTask_id, task_id)); // JSONObject coolMst = ivtTab.query("task_id = '" + task_id + "'").uniqueResult(0); @@ -238,7 +238,7 @@ public class CoolCutTask extends AbstractAcsTask { StIvtCutpointivt cut_jo = stIvtCutpointivtMapper.selectOne(new LambdaQueryWrapper().eq(StIvtCutpointivt::getFull_point_code, point_code2)); cut_jo.setFull_point_status("02"); cut_jo.setContainer_name(container_name); - cut_jo.setUpdate_optid(Long.getLong(currentUserId)); + cut_jo.setUpdate_optid(Long.parseLong(currentUserId)); cut_jo.setUpdate_optname(currentUsername); cut_jo.setUpdate_time(DateUtil.now()); stIvtCutpointivtMapper.updateById(cut_jo); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index 9a9818b..9e416b2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -232,7 +232,7 @@ public class InCoolIvtTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { - CutConveyorTask cutConveyorTask = new CutConveyorTask(); + CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class); String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java index d13c721..4465769 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java @@ -194,19 +194,6 @@ public class InHotTask extends AbstractAcsTask { String container_name = jsonCoolIvt.getContainer_name(); // 母卷号 String workorder_id = jsonCoolIvt.getWorkorder_id(); // 母卷工单标识 - - jsonCoolIvt.setFull_point_status("01"); - jsonCoolIvt.setCool_ivt_status("01"); - jsonCoolIvt.setContainer_name(""); - jsonCoolIvt.setWorkorder_id(""); - jsonCoolIvt.setIvt_qty(BigDecimal.valueOf(0)); - jsonCoolIvt.setInstorage_time(""); - jsonCoolIvt.setUpdate_optid(currentUserId); - jsonCoolIvt.setUpdate_optname(currentUsername); - jsonCoolIvt.setUpdate_time(DateUtil.now()); - coolPointIvtMapper.updateById(jsonCoolIvt); - - // 更新烘箱区库存状态 HotPointIvt jsonHotIvt = hotPointIvtMapper.selectOne(new LambdaQueryWrapper().eq(HotPointIvt::getPoint_code, schBaseTask.getPoint_code3())); jsonHotIvt.setPoint_status("02"); @@ -219,6 +206,17 @@ public class InHotTask extends AbstractAcsTask { jsonHotIvt.setUpdate_time(DateUtil.now()); hotPointIvtMapper.updateById(jsonHotIvt); + jsonCoolIvt.setFull_point_status("01"); + jsonCoolIvt.setCool_ivt_status("01"); + jsonCoolIvt.setContainer_name(""); + jsonCoolIvt.setWorkorder_id(""); + jsonCoolIvt.setIvt_qty(BigDecimal.valueOf(0)); + jsonCoolIvt.setInstorage_time(""); + jsonCoolIvt.setUpdate_optid(currentUserId); + jsonCoolIvt.setUpdate_optname(currentUsername); + jsonCoolIvt.setUpdate_time(DateUtil.now()); + coolPointIvtMapper.updateById(jsonCoolIvt); + hot_point_code = jsonHotIvt.getExt_code(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java index 7313e9a..9835b79 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java @@ -192,7 +192,7 @@ public class OutHotTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject form) { WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task"); - CutConveyorTask cutConveyorTask = new CutConveyorTask(); + CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class); String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername();