|
@@ -371,10 +371,8 @@
|
|
|
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
|
|
@@ -446,10 +444,8 @@
|
|
|
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
|
|
@@ -1528,10 +1524,8 @@
|
|
|
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
|