aps-大屏

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

@@ -366,19 +366,19 @@
         IFNULL(ROUND(sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apoom.PLANPRODROLLNUM/apo.PLANPROCESSRALL*apoom.SINGLEROLLWEIGHT),2),0) AS 'actualordernumyear' -- 实际接单量
         from
         aps_process_operation_process_equ apope
-        join aps_process_operation apo on apo.ID = apope.PROCESSID
-        join aps_process_operation_out_mater apoom on apo.id=apoom.MAINID-- 作业输出物料
-        join aps_blank_order abo on apo.BLANKID = abo.id
-        join aps_production_order apro on apro.ID = abo.PRODUCTIONORDERID
-        left join aps_product_detail apd on apoom.ORDERDETAILID = apd.id and apd.DELETED='0' -- 订单产品明细
-        left join aps_production_merge_order apmd on apmd.ORDERNO = apd.MERGEORDERNUMBER and apmd.DELETED='0'
-        where
-        apope.deleted='0' and abo.DELETED='0' and apro.deleted='0'
-        and apo.DELETED='0' and apoom.DELETED='0'
-        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
-        and abo.PRODUCTSTATUS in ('30','40','50')
-        and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
-        and apoom.PLANPRODROLLNUM>0
+            join aps_process_operation apo on apo.ID = apope.PROCESSID
+            join aps_process_operation_out_mater apoom on apo.id=apoom.MAINID
+            join aps_blank_order abo on apo.BLANKID = abo.id
+            join aps_production_order apro on apro.ID = abo.PRODUCTIONORDERID
+            left join aps_product_detail apd on apoom.ORDERDETAILID = apd.id and apd.DELETED='0'
+            left join aps_product_specs aps on aps.TENANTID=apro.TENANTID and aps.DELETED='0'
+            left join aps_production_merge_order apmd on apmd.ORDERNO = apd.MERGEORDERNUMBER and apmd.DELETED='0'
+        where apope.DELETED='0' and apo.DELETED='0' and abo.DELETED='0' and apro.DELETED='0' and apoom.DELETED='0'
+                  and apoom.THICKNESS > IFNULL(aps.THICKSTR,0) and apoom.THICKNESS <= IFNULL(aps.THICKEND,99999)
+                  and IFNULL(apmd.ORDERTYPE, apro.ORDERTYPE)='客户订单'
+                  and abo.PRODUCTSTATUS in ('30','40','50')
+                  and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
+                  and apoom.PLANPRODROLLNUM>0
         and YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE)
         GROUP BY apro.TENANTID
     </select>
@@ -442,15 +442,15 @@
         from
         aps_process_operation_process_equ apope
         join aps_process_operation apo on apo.ID = apope.PROCESSID
-        join aps_process_operation_out_mater apoom on apo.id=apoom.MAINID-- 作业输出物料
+        join aps_process_operation_out_mater apoom on apo.id=apoom.MAINID
         join aps_blank_order abo on apo.BLANKID = abo.id
         join aps_production_order apro on apro.ID = abo.PRODUCTIONORDERID
-        left join aps_product_detail apd on apoom.ORDERDETAILID = apd.id  and apo.DELETED='0'-- 订单产品明细
+        left join aps_product_detail apd on apoom.ORDERDETAILID = apd.id and apd.DELETED='0'
+        left join aps_product_specs aps on aps.TENANTID=apro.TENANTID and aps.DELETED='0'
         left join aps_production_merge_order apmd on apmd.ORDERNO = apd.MERGEORDERNUMBER and apmd.DELETED='0'
-        where
-        apope.deleted='0' and abo.DELETED='0' and apro.deleted='0'
-        and apd.DELETED='0' and apoom.DELETED='0'
-        and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
+        where apope.DELETED='0' and apo.DELETED='0' and abo.DELETED='0' and apro.DELETED='0' and apoom.DELETED='0'
+        and apoom.THICKNESS > IFNULL(aps.THICKSTR,0) and apoom.THICKNESS &lt;= IFNULL(aps.THICKEND,99999)
+        and IFNULL(apmd.ORDERTYPE, apro.ORDERTYPE)='客户订单'
         and abo.PRODUCTSTATUS in ('30','40','50')
         and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
         and apoom.PLANPRODROLLNUM>0
@@ -1497,15 +1497,15 @@
         from
             aps_process_operation_process_equ apope
                 join aps_process_operation apo on apo.ID = apope.PROCESSID
-                join aps_process_operation_out_mater apoom on apo.id=apoom.MAINID-- 作业输出物料
+                join aps_process_operation_out_mater apoom on apo.id=apoom.MAINID
                 join aps_blank_order abo on apo.BLANKID = abo.id
                 join aps_production_order apro on apro.ID = abo.PRODUCTIONORDERID
-                left join aps_product_detail apd on apoom.ORDERDETAILID = apd.id  and apo.DELETED='0'-- 订单产品明细
+                left join aps_product_detail apd on apoom.ORDERDETAILID = apd.id and apd.DELETED='0'
+                left join aps_product_specs aps on aps.TENANTID=apro.TENANTID and aps.DELETED='0'
                 left join aps_production_merge_order apmd on apmd.ORDERNO = apd.MERGEORDERNUMBER and apmd.DELETED='0'
-        where
-            apope.deleted='0' and abo.DELETED='0' and apro.deleted='0'
-                and apd.DELETED='0' and apoom.DELETED='0'
-                and ifnull(apmd.ORDERTYPE, apro.ORDERTYPE) = '客户订单' -- 订单类型为空默认为客户订单
+            where apope.DELETED='0' and apo.DELETED='0' and abo.DELETED='0' and apro.DELETED='0' and apoom.DELETED='0'
+                and apoom.THICKNESS > IFNULL(aps.THICKSTR,0) and apoom.THICKNESS &lt;= IFNULL(aps.THICKEND,99999)
+                and IFNULL(apmd.ORDERTYPE, apro.ORDERTYPE)='客户订单'
                 and abo.PRODUCTSTATUS in ('30','40','50')
                 and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
                 and apoom.PLANPRODROLLNUM>0