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 71e598f..1235b9c 100644
--- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
+++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
@@ -32,18 +32,18 @@
-- AND MS.SLAB_NO = 'C50015130500'
-- 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，不嫩是火切工序
--- AND MS.SLAB_STATUS ='29' --在制余材
--- AND MS.COMPLEX_DECIDE_CODE !='4'--废品
--- AND SUBSTR(MS.SLAB_NO,1,1) NOT IN ('F','E') --复合/叠轧坯，不能组板
--- AND NVL(MS.PONO,' ')=' '
--- AND NVL(MS.ST_NO,' ')=' '
--- AND NVL(MS.SLAB_ACT_THK,0.001)>0.001
--- AND NVL(MS.SLAB_ACT_WID,0.001)>0.001
--- AND NVL(MS.SLAB_ACT_LEN,0.001)>0.001
--- AND (NVL(MS.SLAB_ACT_WGT,0.001)>0.001 OR NVL(MS.SLAB_GROSS_WGT,0.001)>0.001)
+ AND MS.SLAB_STATUS ='29' --在制余材
+ AND SUBSTR(MS.SLAB_NO,1,1) NOT IN ('F','E') --复合/叠轧坯，不能组板
+ AND NVL(MS.PONO,' ') != ' '
+ AND NVL(MS.ST_NO,' ') != ' '
+ AND NVL(MS.SLAB_ACT_THK,0.001) > 0.001
+ AND NVL(MS.SLAB_ACT_WID,0.001) > 0.001
+ AND NVL(MS.SLAB_ACT_LEN,0.001) > 0.001
+ AND (NVL(MS.SLAB_ACT_WGT,0.001) > 0.001 OR NVL(MS.SLAB_GROSS_WGT,0.001) > 0.001)
+ AND SUBSTR(NVL(MS.NEXT_WHOLE_BACKLOG_CODE,'123'),2,1) !='B' --全程工序代码第二位不能是B，不嫩是火切工序 TODO NEXT_WHOLE_BACKLOG_CODE字段值为null 用nvl处理
+ AND NVL(MS.COMPLEX_DECIDE_CODE,' ') !='4'--废品 TODO COMPLEX_DECIDE_CODE字段值为null 用nvl处理
+-- 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)--重量相同 TODO 此条件加上只能查到一条数据
@@ -58,18 +58,18 @@
-- AND MS.SLAB_NO = 'C50015130500'
-- 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，不嫩是火切工序
--- AND MS.SLAB_STATUS ='29' --在制余材
--- AND MS.COMPLEX_DECIDE_CODE !='4'--废品
--- AND SUBSTR(MS.SLAB_NO,1,1) NOT IN ('F','E') --复合/叠轧坯，不能组板
--- AND NVL(MS.PONO,' ')=' '
--- AND NVL(MS.ST_NO,' ')=' '
--- AND NVL(MS.SLAB_ACT_THK,0.001)>0.001
--- AND NVL(MS.SLAB_ACT_WID,0.001)>0.001
--- AND NVL(MS.SLAB_ACT_LEN,0.001)>0.001
--- AND (NVL(MS.SLAB_ACT_WGT,0.001)>0.001 OR NVL(MS.SLAB_GROSS_WGT,0.001)>0.001)
+ AND MS.SLAB_STATUS ='29' --在制余材
+ AND SUBSTR(MS.SLAB_NO,1,1) NOT IN ('F','E') --复合/叠轧坯，不能组板
+ AND NVL(MS.PONO,' ') != ' '
+ AND NVL(MS.ST_NO,' ') != ' '
+ AND NVL(MS.SLAB_ACT_THK,0.001) > 0.001
+ AND NVL(MS.SLAB_ACT_WID,0.001) > 0.001
+ AND NVL(MS.SLAB_ACT_LEN,0.001) > 0.001
+ AND (NVL(MS.SLAB_ACT_WGT,0.001) > 0.001 OR NVL(MS.SLAB_GROSS_WGT,0.001) > 0.001)
+ AND SUBSTR(NVL(MS.NEXT_WHOLE_BACKLOG_CODE,'123'),2,1) !='B' --全程工序代码第二位不能是B，不嫩是火切工序 TODO NEXT_WHOLE_BACKLOG_CODE字段值为null 用nvl处理
+ AND NVL(MS.COMPLEX_DECIDE_CODE,' ') !='4'--废品 TODO COMPLEX_DECIDE_CODE字段值为null 用nvl处理
+-- 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)--重量相同 TODO 此条件加上只能查到一条数据
@@ -82,14 +82,14 @@
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 ppc.ORDER_NO='522484Q020'
-
-
-
-
-
-
-
+-- AND ppc.ORDER_NO='522484Q020'
+ 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) >=40 AND NVL(cm.ORDER_STATUS,0) < 67 --TODO 添加nvl处理 表中无效数字
+-- AND PPC.PD_LACK_QTY > 0 --欠量大于0 TODO 存在欠量小于0的数据
@@ -104,13 +104,13 @@
AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
WHERE 1=1
-- AND ppc.ORDER_NO='522484Q020'
-
-
-
-
-
-
-
+ 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) >=40 AND NVL(cm.ORDER_STATUS,0) < 67 --TODO 添加nvl处理 表中无效数字
+-- AND PPC.PD_LACK_QTY > 0 --欠量大于0 TODO 存在欠量小于0的数据