From 57128cd56d5b569ca578b595805e683099fc6637 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Sun, 1 Feb 2026 16:23:52 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=9C=A8=E7=AE=B1=E5=88=86=E9=9A=94?= =?UTF-8?q?=E7=AC=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pda/mps/rest/FeedingController.java | 1 + .../pda/mps/service/impl/FeedingServiceImpl.java | 15 +++++++++++---- .../service/dao/mapper/CoolPointIvtMapper.xml | 4 ++-- .../java/org/nl/wms/sch/tasks/CoolCutTask.java | 7 +++++-- .../stat/service/impl/InBillQueryServiceImpl.java | 8 +++++--- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java index 7ba17c4..24ed2a5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java @@ -58,4 +58,5 @@ public class FeedingController { public ResponseEntity AGVPass(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(feedingService.AGVPass(whereJson), HttpStatus.OK); } + } 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 d7eee26..fb63a34 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 @@ -42,6 +42,7 @@ import org.nl.wms.pdm.rawfoilworkorder.service.dao.mapper.SbPointIvtMapper; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.tasks.CoolCutTask; import org.nl.wms.sch.tasks.OutHotTask; +import org.nl.wms.st.outbill.service.CheckOutBillService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -73,6 +74,12 @@ public class FeedingServiceImpl implements FeedingService { @Autowired private SchBaseTaskMapper schBaseTaskMapper; + @Autowired + private CoolCutTask coolCutTask; + + @Autowired + private CheckOutBillService checkOutBillService; + @Override public JSONObject queryMaterialInfo(JSONObject whereJson, HttpContext ctx) { @@ -291,8 +298,7 @@ public class FeedingServiceImpl implements FeedingService { param.put("point_code2", jsonCooIvt.getEmpty_point_code()); param.put("product_area", cut_jo.getProduct_area()); param.put("task_type", "010303"); - AbstractAcsTask task = new CoolCutTask(); - task.createTask(param); + coolCutTask.createTask(param); } //满轴送回 @@ -339,8 +345,7 @@ public class FeedingServiceImpl implements FeedingService { param.put("product_area", cut_jo.getProduct_area()); param.put("vehicle_code", container_name); param.put("task_type", "010304"); - AbstractAcsTask task = new CoolCutTask(); - task.createTask(param); + coolCutTask.createTask(param); } @@ -383,4 +388,6 @@ public class FeedingServiceImpl implements FeedingService { jo.put("message", "操作成功!"); return jo; } + + } 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 498ac3b..c544d95 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 @@ -134,7 +134,7 @@ ORDER BY sort_seq DESC - 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); } + + }