Merge remote-tracking branch 'origin/main'

# Conflicts:
#	XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java

XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GCalGrp.java

@@ -40,6 +40,9 @@ public class GCalGrp {
 
     //标准
     private String SG_STD;
+
+    //标准
+    private String ST_NO;
     //宽度余量
     private int Wid_Add;
     //最大轧制长度

XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GGrpOrderFir.java

@@ -20,6 +20,9 @@ public class GGrpOrderFir {
     private Integer Len;
     //标准
     private String SG_STD;
+    //内部钢种
+    private String ST_NO;
+
     //合同产线
     private String Line ;
     //合同信息

XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GPreOrder.java

@@ -35,6 +35,9 @@ public class GPreOrder {
     //厚度
     private BigDecimal Thk;
 
+    //内部钢种
+    private String ST_NO;
+
     //长度
     private int Len;
 

XG_Project1/src/main/resources/application-dev.yml

@@ -12,10 +12,7 @@ spring:
       maximum-pool-size: ${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:200}
       # 等待连接池分配连接的最大时长（毫秒）
       connection-timeout: ${SPRING_DATASOURCE_CONNECTION_TIMEOUT:30000}
-  devtools:
-    restart:
-      enabled: true  # 启用自动重启功能
-      interval: 5000  # 设置检查类路径变化的间隔时间为 5 秒（5000 毫秒）
+
   redis:
     host: ${SPRING_REDIS_HOST:172.18.15.29}
     port: ${SPRING_REDIS_PORT:6379}

XG_Project1/src/main/resources/application.yml

@@ -12,10 +12,7 @@ spring:
       maximum-pool-size: ${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:200}
       # 等待连接池分配连接的最大时长（毫秒）
       connection-timeout: ${SPRING_DATASOURCE_CONNECTION_TIMEOUT:30000}
-  devtools:
-    restart:
-      enabled: true  # 启用自动重启功能
-      interval: 5000  # 设置检查类路径变化的间隔时间为 5 秒（5000 毫秒）
+
   redis:
     host: ${SPRING_REDIS_HOST:172.18.15.29}
     port: ${SPRING_REDIS_PORT:6379}

XG_Project1/src/main/resources/mapper/SubMapper.xml

@@ -27,7 +27,7 @@
         LEFT JOIN PM_PD_SLAB PPS ON PPS.SLAB_NO = MS.SLAB_NO --PM_PD_SLAB   组板板坯表
         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.MSC_LINE_NO LIKE '%30' --5米轧线
         --           AND MS.SLAB_NO = 'C50015130500'
         --           AND MS.SLAB_NO = 'C50015130100'
         <if test="slabNo != null and slabNo != ''">AND MS.SLAB_NO = #{slabNo}</if>
@@ -53,7 +53,7 @@
         LEFT JOIN PM_PD_SLAB_INFO PPSI ON PPSI.SLAB_NO = MS.SLAB_NO --PM_PD_SLAB   组板板坯表
         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.MSC_LINE_NO LIKE '%30' --5米轧线
         --           AND MS.SLAB_NO = 'C50015130500'
         --           AND MS.SLAB_NO = 'C50015130100'
         <if test="slabNo != null and slabNo != ''">AND MS.SLAB_NO = #{slabNo}</if>
@@ -81,9 +81,9 @@
 --             AND ppc.PRO_CONT_ID = pcmt.PRO_CONT_ID
 --         AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
         WHERE 1=1
---           AND pcmt.MSC_LINE_NO = '1030' --5米轧线
+      AND pcmt.MSC_LINE_NO LIKE '%30' --5米轧线
 --         AND ppc.ORDER_NO IN ('J2502001208')
---           AND ppc.ORDER_NO IN ('52500095215','52500096023')
+          AND ppc.ORDER_NO IN ('52500095215','52500096023')
           AND  PCMT.FUR_TYPE ='C'  --加热炉类型  C   没有注解，C和S 都代表什么
           AND  ppcpa.ORDER_TYPE_CODE != 'QFH'
         AND  PPC.ON_PD_FLAG != 1 --不用验证操作者
@@ -103,8 +103,8 @@
 --             AND ppc.PRO_CONT_ID = pcmt.PRO_CONT_ID
 --         AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
         WHERE 1=1
---           AND pcmt.MSC_LINE_NO = '1030' --5米轧线
---            AND ppc.ORDER_NO IN ('52500095215','52500096023')
+          AND pcmt.MSC_LINE_NO LIKE '%30' --5米轧线
+           AND ppc.ORDER_NO IN ('52500095215','52500096023')
           AND  PCMT.FUR_TYPE ='C'  --加热炉类型  C   没有注解，C和S 都代表什么
           AND  ppcpa.ORDER_TYPE_CODE != 'QFH'
         AND  PPC.ON_PD_FLAG != 1 --不用验证操作者
@@ -118,18 +118,59 @@
     <!--生产合同产品属性表-->
     <select id="getPmProCountProdAttr" resultType="com.xisc.pm.domain.entity.PmProContProdTtr">
 
-        SELECT *
-        FROM PM_PRO_CONT_PROD_ATTR
---         WHERE ORDER_NO ='522484Q020'
+        SELECT distinct ppcpa.* FROM PM_PRO_CONT ppc
+                                       LEFT JOIN XISC_CT.CT_MAIN CM ON PPC.ORDER_NO = CM.ORDER_NO
+                                       LEFT JOIN PM_PRO_CONT_PROD_ATTR ppcpa ON ppcpa.ORDER_NO = ppc.ORDER_NO
+                                       LEFT JOIN PM_CONT_MSC_TECH PCMT ON PCMT.ORDER_NO = ppc.ORDER_NO
+
+        --             AND ppc.PRO_CONT_ID = pcmt.PRO_CONT_ID
+--         AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
+        WHERE 1=1
+          AND nvl(ppcpa.ORDER_NO,' ') !=' '
+          AND pcmt.MSC_LINE_NO LIKE '%30' --5米轧线
+--            AND ppc.ORDER_NO IN ('52500095215','52500096023')
+          AND  PCMT.FUR_TYPE ='C'  --加热炉类型  C   没有注解，C和S 都代表什么
+          AND  ppcpa.ORDER_TYPE_CODE != 'QFH'
+        AND  PPC.ON_PD_FLAG != 1 --不用验证操作者
+        AND  PPC.PD_HOLD_FLAG != 1 -- 不能封锁状态
+        AND  pcmt.ROLL_DIRECT_CODE ='L'--轧制方向代码
+         AND NVL(cm.ORDER_STATUS,0) &gt;= 40 AND NVL(cm.ORDER_STATUS,0) &lt; 67  --TODO 添加nvl处理 表中无效数字
+--         AND  PPC.PD_LACK_QTY &gt; 0  --欠量大于0 TODO 存在欠量小于0的数据
+
+--
+--         SELECT *
+--         FROM PM_PRO_CONT_PROD_ATTR
+-- --         WHERE ORDER_NO ='522484Q020'
 
     </select>
 
     <!--合同产线工艺参数表-->
     <select id="getPmContMscTech" resultType="com.xisc.pm.domain.entity.PmContMscTech">
 
-        SELECT *
-        FROM PM_CONT_MSC_TECH
---         WHERE ORDER_NO ='522484Q020'
+
+        SELECT distinct PCMT.* FROM PM_PRO_CONT ppc
+                                         LEFT JOIN XISC_CT.CT_MAIN CM ON PPC.ORDER_NO = CM.ORDER_NO
+                                         LEFT JOIN PM_PRO_CONT_PROD_ATTR ppcpa ON ppcpa.ORDER_NO = ppc.ORDER_NO
+                                         LEFT JOIN PM_CONT_MSC_TECH PCMT ON PCMT.ORDER_NO = ppc.ORDER_NO
+
+        --             AND ppc.PRO_CONT_ID = pcmt.PRO_CONT_ID
+--         AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
+        WHERE 1=1
+          AND nvl(pcmt.ORDER_NO,' ') !=' '
+          AND pcmt.MSC_LINE_NO LIKE '%30' --5米轧线
+--            AND ppc.ORDER_NO IN ('52500095215','52500096023')
+          AND  PCMT.FUR_TYPE ='C'  --加热炉类型  C   没有注解，C和S 都代表什么
+          AND  ppcpa.ORDER_TYPE_CODE != 'QFH'
+        AND  PPC.ON_PD_FLAG != 1 --不用验证操作者
+        AND  PPC.PD_HOLD_FLAG != 1 -- 不能封锁状态
+        AND  pcmt.ROLL_DIRECT_CODE ='L'--轧制方向代码
+         AND NVL(cm.ORDER_STATUS,0) &gt;= 40 AND NVL(cm.ORDER_STATUS,0) &lt; 67  --TODO 添加nvl处理 表中无效数字
+--         AND  PPC.PD_LACK_QTY &gt; 0  --欠量大于0 TODO 存在欠量小于0的数据
+
+--
+--         SELECT *
+--         FROM PM_CONT_MSC_TECH
+-- --         WHERE ORDER_NO ='522484Q020'
 
     </select>