diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java index 9ac7a2cfd..6caabfa53 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java @@ -55,4 +55,12 @@ public interface IPdmBiSlittingproductionplanService extends IService getByQzzNo(String qzzNo); + + /** + * 根据气胀轴数组获取分切计划 + * @param qzzNo / + * @param status 状态 + * @return / + */ + List getByQzzNos(List qzzNo, String status); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java index 62baec6cf..a54cb40de 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java @@ -90,4 +90,15 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl getByQzzNos(List qzzNo, String status) { + LambdaQueryWrapper lam = new QueryWrapper().lambda(); + lam.in(PdmBiSlittingproductionplan::getQzzno, qzzNo) + .eq(PdmBiSlittingproductionplan::getIs_delete, "0") + .eq(PdmBiSlittingproductionplan::getStatus, status); + return pdmBiSlittingproductionplanMapper.selectList(lam); + } + + + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 66cb5cb9b..d945b3b5a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -315,7 +315,7 @@ public class SlitterServiceImpl implements SlitterService { @SneakyThrows @Override - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public JSONObject mesSlittingMachineSendMaterial(JSONObject param) { JSONObject res = new JSONObject(); // todo: 获取子卷号数组 @@ -611,7 +611,7 @@ public class SlitterServiceImpl implements SlitterService { @Override public JSONArray slitterDevices() { - String prefix = "B2_"; + String prefix = "B6"; List list = cutpointivtService.getListByStartsWith(prefix, false); JSONArray jsonArray = list.stream() .map(item -> { @@ -629,8 +629,13 @@ public class SlitterServiceImpl implements SlitterService { // param: device_code String device_code = param.getString("device_code"); StIvtCutpointivt deviceCode = cutpointivtService.getPintByExtCode(device_code, false); - List collect = Stream.of(deviceCode.getUp_qzzno(), deviceCode.getDown_qzzno()) + List qzzNo = Stream.of(deviceCode.getUp_qzzno(), deviceCode.getDown_qzzno()) .filter(ObjectUtil::isNotEmpty).collect(Collectors.toList()); + List list = slittingproductionplanService.getByQzzNos(qzzNo, "05"); + if (list.size() == 0) { + throw new BadRequestException("分切机" + device_code + " 的分切计划 " + qzzNo + " 不存在"); + } + List collect = list.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()); param.put("container", collect); log.info("手持调用分切机{}下卷, 参数:{}", device_code, param); mesSlittingMachineSendMaterial(param);