diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index 7f7f5def2..44fc68267 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -2,6 +2,8 @@ package org.nl.b_lms.pdm.subpackagerelation.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.StopWatch; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -744,6 +746,39 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl subList = this.list(new LambdaQueryWrapper().eq(PdmBiSubpackagerelation::getContainer_name, jo.getString("container_name"))); + if (CollectionUtils.isEmpty(subList)) { + PdmBiSlittingproductionplan plan = iPdmBiSlittingproductionplanService.getOne(new LambdaQueryWrapper().eq(PdmBiSlittingproductionplan::getContainer_name, containerName)); + if (ObjectUtil.isEmpty(plan)) { + throw new BadRequestException("未查询到可用的分切计划!"); + } + PdmBiSubpackagerelation sub = new PdmBiSubpackagerelation(); + sub.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId() + ""); + sub.setContainer_name(plan.getContainer_name()); + sub.setSale_order_name(plan.getSale_order_name()); + sub.setCustomer_name("test"); + sub.setCustomer_description("临时包装关系"); + sub.setProduct_description(plan.getDescription()); + sub.setWidth(String.valueOf(plan.getSplit_breadth())); + if (StringUtils.isBlank(plan.getWeight()) || StringUtils.isBlank(plan.getPaper_weight())) { + throw new BadRequestException("该子卷分切计划中的子卷重量参数为空!"); + } + int net_weight = Integer.parseInt(plan.getWeight()) - Integer.parseInt(plan.getPaper_weight()); + sub.setNet_weight(net_weight + ""); + sub.setLength("1000"); + sub.setIs_un_plan_production("0"); + sub.setCreate_id(1L); + sub.setCreate_name("管理员"); + sub.setCreate_time(DateUtil.now()); + sub.setStatus("99"); + sub.setSap_pcsn("Test"); + sub.setExt_code("BC01"); + sub.setBox_group(null); + sub.setProduct_name("测试"); + this.saveOrUpdate(sub); + } + + } @@ -770,7 +805,8 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl 10) { throw new BadRequestException("子卷搬运任务数已达上限!"); @@ -811,7 +847,6 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl workIdList, Set containerNameList, String deviceCode, Integer maxBoxGroup, String boxType) { //均衡获取装箱对接位 - //String deviceCode = "ZXQ_1_1"; StopWatch stopWatch = new StopWatch(); stopWatch.start(); JSONObject boxInfo = new JSONObject(); @@ -823,7 +858,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name"))); if (dto == null) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java index a54ceae55..ffd2842fe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java @@ -82,7 +82,7 @@ public class AutoSendZxToDjw { return; } //装箱区有子卷且没有正在进行的装箱任务 - List zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "", "", ""); + List zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), "", "", ""); if (CollectionUtils.isEmpty(zxqPackageinfoivtList)) { return; }