From 2e20507052f3b07c0aba1c3dc33ca05e581648c7 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 8 Jul 2024 10:28:08 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E7=BB=91=E5=AE=9A=E5=AD=90?= =?UTF-8?q?=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/service/impl/SlitterServiceImpl.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) 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 4553aaae9..4934fc1bf 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 @@ -545,19 +545,6 @@ public class SlitterServiceImpl implements SlitterService { PdmBiSlittingproductionplan nextUpPlan = nextPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null); PdmBiSlittingproductionplan nextDownPlan = nextPlans.stream().filter(p -> "2".equals(p.getUp_or_down())).findFirst().orElse(null); // 找到该分切计划的点位 -// LambdaQueryWrapper newCutLam = new QueryWrapper().lambda(); -// newCutLam.eq(BstIvtCutpointivt::getPoint_type, "3").eq(BstIvtCutpointivt::getPoint_status, "2") -// .eq(BstIvtCutpointivt::getIs_used, "1"); -// if (nextUpPlan != null) { -// newCutLam.eq(BstIvtCutpointivt::getQzz_no1, nextUpPlan.getQzzno()); -// } -// if (nextDownPlan != null) { -// newCutLam.eq(BstIvtCutpointivt::getQzz_no2, nextDownPlan.getQzzno()); -// } -// BstIvtCutpointivt newCutPoint = bcutpointivtService.getOne(newCutLam, false); -// if (ObjectUtil.isEmpty(newCutPoint)) { -// throw new BadRequestException("分切机【" + device.getExt_code() + "】的下一组分切计划未配送完毕!😊"); -// } BstIvtCutpointivt newCutPoint = cutPointList.get(0); String binaryExpress = TaskUtils.binaryConvertExpress(currentUpPlan, currentDownPlan, nextUpPlan, nextDownPlan); switch (binaryExpress) { @@ -1143,6 +1130,7 @@ public class SlitterServiceImpl implements SlitterService { pointCode.setQzz_no2(qzzNo); } }); + pointCode.setPoint_status("3"); slittingproductionplanService.updateBatchById(plans); bcutpointivtService.updateById(pointCode); JSONObject res = new JSONObject();