From 8526ff07244b9eee7d8c7a02b4b5f8897e3b2d47 Mon Sep 17 00:00:00 2001 From: sunhao <479527147@qq.com> Date: Thu, 20 Feb 2025 09:51:03 +0800 Subject: [PATCH] 2025-02-19 --- .../shopmanager/controller/SubController.java | 44 ++++++++++++++----- .../xdclass/shopmanager/mapper/SubMapper.java | 2 +- .../shopmanager/service/SubService.java | 2 +- .../service/impl/SubServiceImpl.java | 4 +- .../src/main/resources/mapper/SubMapper.xml | 5 ++- 5 files changed, 40 insertions(+), 17 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 9f746cd..5cae1e4 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 @@ -221,11 +221,11 @@ public class SubController { public JsonData SubData(String strSlab) { SubParams subParams = new SubParams(); subParams.setSlabNo(strSlab); - - if (strSlab==null || strSlab=="") - { - return null; - } +// +// if (strSlab==null || strSlab=="") +// { +// return null; +// } //获取所有数据 GetDataInfo(subParams); @@ -279,6 +279,32 @@ public class SubController { logger.info("***二次分组数量*** " + gltGCalGrp.size()); + gltGGrpCalRslt = new ArrayList<>(); + + gltSelGGrpCalRslt = new ArrayList<>(); + + plistpmSubHisDO= new ArrayList<>(); + + plistpmSubOrdDO = new ArrayList<>(); + + pmPdSlabDOList = new ArrayList<>(); + + pmPdPlateCutDOList = new ArrayList<>(); + + pmPdBlockPosDOList = new ArrayList<>(); + + pmPdContSumDOList = new ArrayList<>(); + + pmSmallPltPosDOList = new ArrayList<>(); + + pmCmdSlabDOList = new ArrayList<>(); + + pmCmdLargePltDOList = new ArrayList<>(); + + pmCmdContDOList = new ArrayList<>(); + + pmCmdSmallPltDOList = new ArrayList<>(); + if (gltGCalGrp.size() > 0) { //板坯长度和宽度调换 @@ -291,10 +317,6 @@ public class SubController { p.setRemWid(p.getSlabActWid()); } - gltGGrpCalRslt = new ArrayList<>(); - - gltSelGGrpCalRslt = new ArrayList<>(); - SetGroupCalRslt(p); logger.info("结果数据板坯号：{}；数量：{}", p.getSlabNo(), gltGGrpCalRslt.size()); @@ -625,7 +647,7 @@ public class SubController { //30板坯信息 tasks.add(() -> { - plistPmPdSlabInfoDO = subService.getPmPdSlabInfo(); + plistPmPdSlabInfoDO = subService.getPmPdSlabInfo( subParams); return null; }); @@ -740,7 +762,7 @@ public class SubController { e.getLtInfoGPreOrder().parallelStream().forEach(f -> { try { - //化学成分 chemical composition +// 化学成分 chemical composition if (!ChkChemical(SInfo, f)) { return; } diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java index 5a4d031..541d2df 100644 --- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java +++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java @@ -98,7 +98,7 @@ public interface SubMapper extends BaseMapper { List getPmRetainStack(); - List getPmPdSlabInfo(); + List getPmPdSlabInfo(SubParams subParams); List getQdToPoOrder(); diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java index 46d82fb..33015f0 100644 --- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java +++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java @@ -94,7 +94,7 @@ public interface SubService { List getPmRetainStack(); - List getPmPdSlabInfo(); + List getPmPdSlabInfo(SubParams subParams); List getQdToPoOrder(); diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java index 9b009b8..3bf5e41 100644 --- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java +++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java @@ -235,8 +235,8 @@ public class SubServiceImpl implements SubService { } @Override - public List getPmPdSlabInfo() { - return subMapper.getPmPdSlabInfo(); + public List getPmPdSlabInfo(SubParams subParams) { + return subMapper.getPmPdSlabInfo(subParams); } @Override 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 32a2dbd..71e598f 100644 --- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml +++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml @@ -47,7 +47,7 @@ - SELECT DISTINCT PPSI.* FROM XISC_MM.MM_SLAB MS --MM_SLAB 板坯表 LEFT JOIN PM_PD_SLAB PPS ON PPS.SLAB_NO = MS.SLAB_NO --PM_PD_SLAB 组板板坯表 @@ -56,7 +56,8 @@ WHERE 1 = 1 AND MS.MSC_LINE_NO = '1030' --5米轧线 -- AND MS.SLAB_NO = 'C50015130500' - AND MS.SLAB_NO = 'C50015130100' +-- AND MS.SLAB_NO = 'C50015130100' + AND MS.SLAB_NO = #{slabNo} -- 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，不嫩是火切工序