From a610909797d4db7a7bb3b7ed842fd4025193e2a0 Mon Sep 17 00:00:00 2001 From: sunhao <479527147@qq.com> Date: Thu, 16 Jan 2025 18:40:30 +0800 Subject: [PATCH] =?UTF-8?q?BUG=20=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shopmanager/controller/SubController.java | 14 +++++++++++--- .../src/main/resources/mapper/SubMapper.xml | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java index b6ca8db..be790f0 100644 --- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java +++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java @@ -473,7 +473,7 @@ public class SubController { GCalGrp GCG = new GCalGrp(); GCG.setLtInfoGPreOrder(new ArrayList<>()); - e.getLtInfoGPreOrder().forEach(f -> { + e.getLtInfoGPreOrder().parallelStream().forEach(f -> { //化学成分 chemical composition if (!ChkChemical(SInfo, f)) { @@ -574,8 +574,16 @@ public class SubController { //订单要求化学成分 // logger.info("化学成分订单号：" + GrpOrd.getOrderNo()); List ltLrc = new ArrayList<>(); -// int i =plistQdToLineupResultCheDO.stream().filter(p->p.getCheType().equals(null)).collect(Collectors.toList()).size(); -// logger.info("化学成分订单号：{}-{}" , GrpOrd.getOrderNo(),i); + int intOrd =plistQdToLineupResultCheDO.stream().filter(p->p.getOrderNo().equals(null)).collect(Collectors.toList()).size(); + int intRX =plistQdToLineupResultCheDO.stream().filter(p->p.getCheType().equals(null)).collect(Collectors.toList()).size(); + if (intOrd>0 || intRX>0) + { + logger.info("*************************化学成分订单号：{}-{}-{}" , GrpOrd.getOrderNo(),intOrd,intRX); + } +if (plistQdToLineupResultCheDO==null) +{ + logger.info("*************************化学成分订单号：{}-{}-{}" , GrpOrd.getOrderNo(),intOrd,intRX); +} if (plistQdToLineupResultCheDO.stream().anyMatch(p -> p.getOrderNo().equals(GrpOrd.getOrderNo()) && p.getCheType().equals("RX"))) { ltLrc = plistQdToLineupResultCheDO.stream().filter(p -> p.getOrderNo().equals(SInfo.getOrderNo()) && p.getCheType().equals("RX")).collect(Collectors.toList()); } diff --git a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml index 2368abd..ea32176 100644 --- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml +++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml @@ -28,7 +28,7 @@ LEFT JOIN PM_PD_CONST_BT PPCB ON PPCB.ROLL_LINE_NO = SUBSTR(MS.MSC_LINE_NO,3,2) WHERE 1=1 AND MS.MSC_LINE_NO='1030' --5米轧线 --- AND MS.SLAB_NO = 'C50000230200' +-- AND MS.SLAB_NO = 'C40022070500' -- AND ((SELECT SUM(NVL(P1.NEED_SLAB_WT,0)) FROM PM_PD_SLAB P1 WHERE P1.SLAB_NO = MS.SLAB_NO)= MS.SLAB_ACT_WGT -- OR (SELECT SUM(NVl(P1.NEED_SLAB_WT,0)) FROM PM_PD_SLAB P1 WHERE P1.SLAB_NO = MS.SLAB_NO) = 0)--重量相同 -- AND SUBSTR(MS.NEXT_WHOLE_BACKLOG_CODE,2,1) !='B' --全程工序代码第二位不能是B，不嫩是火切工序