修改移动端代码

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT003.xml

@@ -90,7 +90,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE = #companyCode# and b.REGISTER_DATE =  #date# and b.FACTORY_CODE = #factorycode# and b.DELETE_FLAG = 0
                 group by  a.GROUP_NAME,b.GROUP_TYPE
                 union all
@@ -107,7 +107,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE = #companyCode# and b.REGISTER_DATE =  #date# and b.FACTORY_CODE = #factorycode# and b.DELETE_FLAG = 0
                 group by  a.GROUP_NAME,b.GROUP_TYPE
                 union all
@@ -124,7 +124,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE = #companyCode# and b.REGISTER_DATE =  #date# and b.FACTORY_CODE = #factorycode# and b.DELETE_FLAG = 0
                 group by  a.GROUP_NAME) a
                 order by SORT,SORT1 asc
@@ -137,7 +137,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on a.GROUP_CODE = b.GROUP_CODE and b.REGISTER_DATE = #date# and b.DELETE_FLAG = 0
                 where  a.COMPANY_CODE = #companyCode#  and a.FACTORY_CODE = #factorycode#
                 group by a.GROUP_NAME,a.GROUP_CODE
@@ -160,7 +160,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE  = #companyCode# and b.DELETE_FLAG = 0
                 and b.REGISTER_DATE =  replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 6 day),'-','') and b.FACTORY_CODE = #factorycode#
                 group by  a.GROUP_NAME,b.REGISTER_DATE
@@ -178,7 +178,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE  = #companyCode# and b.DELETE_FLAG = 0
                 and b.REGISTER_DATE =  replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 5 day),'-','') and b.FACTORY_CODE = #factorycode#
                 group by  a.GROUP_NAME,b.REGISTER_DATE
@@ -196,7 +196,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE  = #companyCode# and b.DELETE_FLAG = 0
                 and b.REGISTER_DATE =  replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 4 day),'-','') and b.FACTORY_CODE = #factorycode#
                 group by  a.GROUP_NAME,b.REGISTER_DATE
@@ -214,7 +214,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE  = #companyCode# and b.DELETE_FLAG = 0
                 and b.REGISTER_DATE =  replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 3 day),'-','') and b.FACTORY_CODE = #factorycode#
                 group by  a.GROUP_NAME,b.REGISTER_DATE
@@ -232,7 +232,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE  = #companyCode# and b.DELETE_FLAG = 0
                 and b.REGISTER_DATE =  replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 2 day),'-','') and b.FACTORY_CODE = #factorycode#
                 group by  a.GROUP_NAME,b.REGISTER_DATE
@@ -250,7 +250,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE = #companyCode# and b.DELETE_FLAG = 0
                 and b.REGISTER_DATE =  replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 1 day),'-','') and b.FACTORY_CODE = #factorycode#
                 group by  a.GROUP_NAME,b.REGISTER_DATE
@@ -268,7 +268,7 @@
                 from iplat.TXSOG01 a
                 join iplat.TXSOG01 b on a.ORG_ID = b.PARENT_ORG_ID
                 join iplat.TXSOG01 c on b.ORG_ID = c.PARENT_ORG_ID
-                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode#) a
+                where a.ORG_TYPE = 'factory'  and b.ORG_TYPE = 'dept' and c.ORG_TYPE = 'prodGroup' and a.IS_DELETED = 0 and b.IS_DELETED =0 and c.IS_DELETED = 0 and a.ORG_ID = #factorycode# and c.ORG_ID <![CDATA[ <> ]]>  'R24050801') a
                 left join hpjx.t_hpsc009 b on b.FACTORY_CODE = a.FACTORY_CODE and b.GROUP_CODE = a.GROUP_CODE and b.COMPANY_CODE = #companyCode# and b.DELETE_FLAG = 0
                 and b.REGISTER_DATE =  #date# and b.FACTORY_CODE = #factorycode#
                 group by  a.GROUP_NAME