2025-02-19

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;
                     }

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java

@@ -98,7 +98,7 @@ public interface SubMapper extends BaseMapper<Map> {
 
     List<PmRetainStackDO> getPmRetainStack();
 
-    List<PmPdSlabInfoDO> getPmPdSlabInfo();
+    List<PmPdSlabInfoDO> getPmPdSlabInfo(SubParams subParams);
 
     List<QdToPoOrderDO> getQdToPoOrder();
 

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java

@@ -94,7 +94,7 @@ public interface SubService  {
 
     List<PmRetainStackDO> getPmRetainStack();
 
-    List<PmPdSlabInfoDO> getPmPdSlabInfo();
+    List<PmPdSlabInfoDO> getPmPdSlabInfo(SubParams subParams);
 
     List<QdToPoOrderDO> getQdToPoOrder();
 

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<PmPdSlabInfoDO> getPmPdSlabInfo() {
-        return  subMapper.getPmPdSlabInfo();
+    public List<PmPdSlabInfoDO> getPmPdSlabInfo(SubParams subParams) {
+        return  subMapper.getPmPdSlabInfo(subParams);
     }
 
     @Override

1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml

@@ -47,7 +47,7 @@
 
     </select>
 
-    <select id="getPmPdSlabInfo" resultType="net.xdclass.shopmanager.model.PmPdSlabInfoDO">
+    <select id="getPmPdSlabInfo" resultType="net.xdclass.shopmanager.model.PmPdSlabInfoDO" parameterType="net.xdclass.shopmanager.model.SubParams">
         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'
+        <if test="slabNo != null and slabNo != ''">AND MS.SLAB_NO = #{slabNo}</if>
         --         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，不嫩是火切工序