aps-大屏

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProductionOrderDao.xml

@@ -375,7 +375,7 @@
         where
         apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
         and apd.DELETED='0' and apoom.DELETED='0'
-        and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
         and abo.PRODUCTSTATUS in ('30','40','50')
         and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
         and apoom.PLANPRODROLLNUM>0
@@ -399,7 +399,7 @@
         where
             apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
           and apd.DELETED='0' and arr.deleted='0' and aro.DELETED='0'
-          and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+          and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
           and arr.CHECKSTATUS='已检验'
           and aro.QUALIFIED='是'
           and apoom.PLANPRODROLLNUM>0
@@ -446,12 +446,11 @@
         join aps_blank_order abo on apo.BLANKID = abo.id
         join aps_production_order apro on apro.ID = abo.PRODUCTIONORDERID
         join aps_product_detail apd on apoom.ORDERDETAILID = apd.id -- 订单产品明细
-        left join aps_product_specs aps on apoom.THICKNESS > aps.THICKSTR and apoom.THICKNESS <= aps.THICKEND and aps.DELETED='0'
         left join aps_production_merge_order apmd on apmd.ID = apd.MERGEORDERNUMBER and apmd.DELETED='0'
         where
         apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
         and apd.DELETED='0' and apoom.DELETED='0'
-        and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
         and abo.PRODUCTSTATUS in ('30','40','50')
         and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
         and apoom.PLANPRODROLLNUM>0
@@ -476,7 +475,7 @@
         where
             apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
           and apd.DELETED='0' and arr.deleted='0' and aro.DELETED='0'
-          and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+          and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
           and arr.CHECKSTATUS='已检验'
           and aro.QUALIFIED='是'
           and apoom.PLANPRODROLLNUM>0
@@ -498,12 +497,11 @@
         join aps_blank_order abo on apo.BLANKID = abo.id
         join aps_production_order apro on apro.ID = abo.PRODUCTIONORDERID
         join aps_product_detail apd on apoom.ORDERDETAILID = apd.id -- 订单产品明细
-        left join aps_product_specs aps on apoom.THICKNESS > aps.THICKSTR and apoom.THICKNESS <= aps.THICKEND and aps.DELETED='0'
         left join aps_production_merge_order apmd on apmd.ID = apd.MERGEORDERNUMBER and apmd.DELETED='0'
         where
         apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
         and apd.DELETED='0' and apoom.DELETED='0'
-        and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
         and abo.PRODUCTSTATUS in ('30','40','50')
         and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
         and apoom.PLANPRODROLLNUM>0
@@ -535,7 +533,7 @@
         where
         apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
         and apd.DELETED='0' and arr.deleted='0' and aro.DELETED='0'
-        and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
         and arr.CHECKSTATUS='已检验'
         and aro.QUALIFIED='是'
         and apoom.PLANPRODROLLNUM>0
@@ -584,12 +582,11 @@
         join aps_blank_order abo on apo.BLANKID = abo.id
         join aps_production_order apro on apro.ID = abo.PRODUCTIONORDERID
         join aps_product_detail apd on apoom.ORDERDETAILID = apd.id -- 订单产品明细
-        left join aps_product_specs aps on apoom.THICKNESS > aps.THICKSTR and apoom.THICKNESS <= aps.THICKEND and aps.DELETED='0'
         left join aps_production_merge_order apmd on apmd.ID = apd.MERGEORDERNUMBER and apmd.DELETED='0'
         where
         apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
         and apd.DELETED='0' and apoom.DELETED='0'
-        and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
         and abo.PRODUCTSTATUS in ('30','40','50')
         and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
         and apoom.PLANPRODROLLNUM>0
@@ -616,7 +613,7 @@
         where
         apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
         and apd.DELETED='0' and arr.deleted='0' and aro.DELETED='0'
-        and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
         and arr.CHECKSTATUS='已检验'
         and aro.QUALIFIED='是'
         and apoom.PLANPRODROLLNUM>0
@@ -652,12 +649,11 @@
         join aps_blank_order abo on apo.BLANKID = abo.id
         join aps_production_order apro on apro.ID = abo.PRODUCTIONORDERID
         join aps_product_detail apd on apoom.ORDERDETAILID = apd.id -- 订单产品明细
-        left join aps_product_specs aps on apoom.THICKNESS > aps.THICKSTR and apoom.THICKNESS <= aps.THICKEND and aps.DELETED='0'
         left join aps_production_merge_order apmd on apmd.ID = apd.MERGEORDERNUMBER and apmd.DELETED='0'
         where
         apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
         and apd.DELETED='0' and apoom.DELETED='0'
-        and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
         and abo.PRODUCTSTATUS in ('30','40','50')
         and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
         and apoom.PLANPRODROLLNUM>0
@@ -684,7 +680,7 @@
         where
         apope.deleted='0' and apo.DELETED='0' and abo.DELETED='0' and apro.deleted='0'
         and apd.DELETED='0' and arr.deleted='0' and aro.DELETED='0'
-        and (ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) in ('客户订单','')) -- 订单类型为空默认为客户订单
+        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
         and arr.CHECKSTATUS='已检验'
         and aro.QUALIFIED='是'
         and apoom.PLANPRODROLLNUM>0