From ea5bfbf40e1170627189d0db0eb6762914070f8c Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 1 Jul 2024 13:53:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?rev=EF=BC=9A=E6=8D=86=E6=89=8E=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/TwoLashTask.java | 24 +++++++++-- .../nl/b_lms/sch/tasks/TwoSendOutTask.java | 42 +++++++++++++++++-- .../util/impl/LashManageServiceImpl.java | 30 +++++++++---- .../util/impl/SendOutManageServiceImpl.java | 11 +++-- 4 files changed, 88 insertions(+), 19 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java index 6fa312241..bd9c8f11d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java @@ -17,8 +17,10 @@ import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.service.IschBasePointService; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxlashboundService; +import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; @@ -54,6 +56,12 @@ public class TwoLashTask extends AbstractAcsTask { @Autowired private IBstIvtBoxinfoService iBstIvtBoxinfoService; + /** + * 木箱类型信息服务 + */ + @Autowired + private IMdpbBoxtypeService iMdpbBoxtypeService; + @Override public List addTask() { /* @@ -86,15 +94,23 @@ public class TwoLashTask extends AbstractAcsTask { throw new BadRequestException("未查询到相关木箱信息!"); } + // 查询木箱类型信息 + MdpbBoxtype boxTypeDao = iMdpbBoxtypeService.getById(dao.get(0).getMaterial_code()); + if (ObjectUtil.isEmpty(boxTypeDao)) { + throw new BadRequestException("木箱类型信息不存在!木箱料号为："+dao.get(0).getMaterial_code()); + } + JSONObject interaction_json = new JSONObject(); interaction_json.put("isLeave", json.getString("is_auto_issue")); interaction_json.put("length", dao.get(0).getBox_length()); interaction_json.put("weight", dao.get(0).getBox_width()); interaction_json.put("height", dao.get(0).getBox_high()); - interaction_json.put("template", dao.get(0).getLash_num()); - //第二次捆扎次数 - interaction_json.put("bindingTimes", "3"); - interaction_json.put("isBinding", IOSEnum.IS_SEND.code("是")); + // 捆扎模版 + interaction_json.put("template", boxTypeDao.getLash_num()); + // 第二次捆扎次数 + interaction_json.put("bindingTimes", boxTypeDao.getLash_num_tow()); + // 是否二次捆扎 + interaction_json.put("isBinding", boxTypeDao.getNeed_lash_two()); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java index ed44e9ed7..065a7faa8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java @@ -7,8 +7,15 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; +import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; +import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; +import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; +import org.nl.b_lms.storage_manage.database.service.dao.mapper.MdpbBoxtypeMapper; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; @@ -21,9 +28,11 @@ import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.tasks.CutConveyorTask; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -35,6 +44,18 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode; public class TwoSendOutTask extends AbstractAcsTask { private final String THIS_CLASS = TwoSendOutTask.class.getName(); + /** + * 木箱信息服务 + */ + @Resource + private BstIvtBoxinfoMapper iBstIvtBoxinfoService; + + /** + * 木箱类型信息服务 + */ + @Resource + private MdpbBoxtypeMapper iMdpbBoxtypeService; + @Override public List addTask() { /* @@ -43,15 +64,28 @@ public class TwoSendOutTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); 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); - // 获取系统参数 - String expandWidthLength = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("expandWidthLength").getValue(); - JSONObject param = new JSONObject(); - param.put("expandWidthLength",expandWidthLength); + JSONObject param = new JSONObject(); ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); + // 根据木箱号查询木箱信息 + BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.selectOne( + new QueryWrapper().lambda() + .eq(BstIvtBoxinfo::getBox_no, json.getString("vehicle_code")) + ); + if (ObjectUtil.isEmpty(boxDao)) { + throw new BadRequestException("未查询到相关木箱信息!"); + } + + // 查询木箱类型信息 + MdpbBoxtype boxTypeDao = iMdpbBoxtypeService.selectById(boxDao.getMaterial_code()); + if (ObjectUtil.isEmpty(boxTypeDao)) { + throw new BadRequestException("木箱类型信息不存在!木箱料号为："+boxDao.getMaterial_code()); + } + param.put("expandWidthLength",boxTypeDao.getExpend_width()); + char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index 58af8a8da..fbdc25e06 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -16,8 +16,10 @@ import org.nl.b_lms.sch.tasks.TwoLashTask; import org.nl.b_lms.sch.tasks.TwoOutHeapTask; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxlashboundService; +import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.LashManageService; import org.nl.common.utils.IdUtil; @@ -65,6 +67,11 @@ public class LashManageServiceImpl implements LashManageService { */ private final TwoLashTask twoLashTask; + /** + * 木箱类型信息服务 + */ + private final IMdpbBoxtypeService iMdpbBoxtypeService; + @Override @Transactional public void createLashTask(JSONObject whereJson) { @@ -245,22 +252,31 @@ public class LashManageServiceImpl implements LashManageService { .eq(BstIvtBoxinfo::getBox_no, whereJson.getString("vehicle_code")) ); + // 根据木箱料号查询木箱类型信息 + MdpbBoxtype boxTypeDao = iMdpbBoxtypeService.getById(boxDao.getMaterial_code()); + if (ObjectUtil.isEmpty(boxTypeDao)) { + throw new BadRequestException("木箱类型信息不存在!木箱料号为："+boxDao.getMaterial_code()); + } + // 返回参数 result.put("length", boxDao.getBox_length()); result.put("width", boxDao.getBox_width()); result.put("height", boxDao.getBox_high()); result.put("case", boxDao.getMaterial_code()); - result.put("isBinding", IOSEnum.IS_SEND.code("是")); + // 是否捆扎 + result.put("isBinding", boxTypeDao.getNeed_lash_one()); + // TODO 是否贴标 result.put("isLabeling", IOSEnum.IS_SEND.code("否")); - + // TODO 贴标模版 result.put("labelingTemplate", boxDao.getLash_num()); - //捆扎模板 - result.put("bindingTemplate", boxDao.getLash_num()); + // 捆扎模板 + result.put("bindingTemplate", boxTypeDao.getLash_num()); + // TODO 打印机 result.put("printDevice", "1"); - + // TODO 贴标数量 result.put("printQty", "1"); - //第一次捆扎次数 - result.put("bundleTimes", "3"); + // 第一次捆扎次数 + result.put("bundleTimes", boxTypeDao.getLash_num_one()); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java index 29c231f95..afb714354 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java @@ -49,6 +49,11 @@ public class SendOutManageServiceImpl implements SendOutManageService { */ private final SchBasePointMapper schBasePointMapper; + /** + * 发货服务 + */ + private final TwoSendOutTask twoSendOutTask; + @Override @Transactional public void createSendOutTask(JSONObject whereJson) { @@ -196,8 +201,7 @@ public class SendOutManageServiceImpl implements SendOutManageService { task_jo.put("point_code2", point_code); task_jo.put("vehicle_code", vehicleCode); task_jo.put("task_type", "010708"); - TwoSendOutTask taskBean = new TwoSendOutTask(); - taskBean.createTask(task_jo); + twoSendOutTask.createTask(task_jo); // 锁住点位 ischBasePointService.update( @@ -366,8 +370,7 @@ public class SendOutManageServiceImpl implements SendOutManageService { task_jo.put("point_code4", point_code); task_jo.put("vehicle_code", vehicleCode); task_jo.put("task_type", "010708"); - TwoSendOutTask taskBean = new TwoSendOutTask(); - taskBean.createTask(task_jo); + twoSendOutTask.createTask(task_jo); // 锁住点位 ischBasePointService.update( From b00a5a23ef5d0b2a9b6b3444fe8dbebcf2c5836d Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 1 Jul 2024 09:28:02 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E6=B0=94=E8=83=80=E8=BD=B4=E4=BB=A3?= =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C=E4=BD=8D=E7=BD=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/BstIvtCutpointivtMapper.xml | 3 +-- .../PdmBiSlittingproductionplanMapper.xml | 18 +++--------------- .../slitter/auto/AutoCallAirShaftTask.java | 4 ++-- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index 3a4c9555e..cdc0e3841 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -31,11 +31,10 @@ FROM `bst_ivt_cutpointivt` bc LEFT JOIN pdm_bi_slittingproductionplan pp ON pp.qzzno = bc.qzz_no1 OR pp.qzzno = bc.qzz_no2 - LEFT JOIN st_ivt_cutpointivt sc ON sc.ext_code = pp.resource_name WHERE bc.point_type = #{type} AND pp.qzz_size = #{size} - AND sc.qzz_generation = #{generation} + AND pp.qzz_generation = #{generation} AND bc.is_used = '1' AND bc.point_status = '3' diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml index b1c9dced2..456468995 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml @@ -10,7 +10,7 @@ p.split_group, p.up_or_down, p.qzz_size, - sc.qzz_generation, + p.qzz_generation, COALESCE ( count_table.num, 0 ) num, COALESCE ( ct1.cn, 0 ) AS cn, COALESCE ( ct2.cnn, 0 ) AS cnn @@ -60,8 +60,6 @@ AND p.parent_container_name = ct2.parent_container_name AND p.split_group = ct2.split_group AND p.up_or_down ]]> ct2.up_or_down - LEFT JOIN st_ivt_cutpointivt sc - ON sc.ext_code = p.resource_name WHERE p.`status` = '01' AND p.is_child_tz_ok = '0' @@ -75,7 +73,7 @@ p.split_group, p.up_or_down, p.qzz_size, - sc.qzz_generation, + p.qzz_generation, num, cn, cnn @@ -97,7 +95,7 @@ p1.up_or_down, '1' AS num, p1.qzz_size, - c.qzz_generation, + p1.qzz_generation, ROW_NUMBER() OVER ( PARTITION BY p1.parent_container_name, p1.split_group ORDER BY p1.resource_name @@ -124,16 +122,6 @@ AND p1.up_or_down ]]> p2.up_or_down AND p1.is_delete = '0' AND p1.is_paper_ok = '1' - LEFT JOIN - st_ivt_cutpointivt c - ON - c.ext_code = p1.resource_name - WHERE - p1.qzzno NOT IN - - #{item} - - OR p1.qzzno IS NULL ) SELECT resource_name, diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index 3bce7b377..c73817030 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -89,7 +89,7 @@ public class AutoCallAirShaftTask { // 标箔：1，锂电：2 改：大小：4代5代 String specification = empty.getQzz_generation(); String location = empty.getPoint_location(); - // 2、获取分切计划数据 + // 2、获取分切计划数据 校验代数 List plans = slittingproductionplanService.getAllCutPlan(); if (plans.size() == 0) { // 如果不需要套轴，就只做拔轴 @@ -113,7 +113,7 @@ public class AutoCallAirShaftTask { makePullShaft(empty, specification); return; } - // 从寻查找分切计划，并放在plans, 没有考虑区域问题 + // 从寻查找分切计划，并放在plans, 没有考虑区域问题， 里面会考虑代数 plans = slittingproductionplanService.getAllHalfPlan(qzzs); if (plans.size() == 0) { // 如果不需要套轴，就只做拔轴 From a546856fda8aa7a558e5db4b114720bdfdaccf7f Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 1 Jul 2024 09:38:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E6=B0=94=E8=83=80=E8=BD=B4=E4=BB=A3?= =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C=E4=BD=8D=E7=BD=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92=E8=A1=A82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index cdc0e3841..cfcc15e46 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -45,11 +45,10 @@