rev:数字孪生接口查询优化

lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/AUTO_QUERYTASK.wql

@@ -94,7 +94,7 @@
 	IF 输入.flag = "4"
         QUERY
             SELECT
-            	MAX( a.bill_type ) AS bill_type,
+            	(case when MAX( a.bill_type ) = '1001' then '发货出库' else '调拨出库' end ) AS bill_type,
             	SUM( sub.box_weight ) AS total_qty,
             	MAX( a.bill_code ) AS bill_code,
             	MAX( a.estimated_freight ) AS estimated_freight,
@@ -133,16 +133,16 @@
     IF 输入.flag = "5"
         QUERY
             SELECT
-                date_of_FG_inbound,
+                date_of_production AS date_of_FG_inbound,
                 sum( net_weight ) AS qty
             FROM
                 pdm_bi_subpackagerelation sub
             WHERE
-                DATE_FORMAT( sub.date_of_FG_inbound, '%Y-%m' ) = DATE_FORMAT( NOW(), '%Y-%m' )
+                DATE_FORMAT( sub.date_of_production, '%Y-%m' ) = DATE_FORMAT( NOW(), '%Y-%m' )
             GROUP BY
-                date_of_FG_inbound
+                date_of_production
             ORDER BY
-                date_of_FG_inbound
+                date_of_production
             ENDSELECT
         ENDQUERY
     ENDIF
@@ -150,15 +150,15 @@
     IF 输入.flag = "6"
         QUERY
             SELECT
-                DATE_FORMAT( mst.input_time, '%Y-%m-%d' ) date,
+                DATE_FORMAT( mst.confirm_time, '%Y-%m-%d' ) date,
-                sum( mst.total_qty ) total_qty
+                sum( mst.total_qty ) qty
             FROM
                 ST_IVT_IOStorInv mst
                 WHERE mst.bill_type IN ( '1001', '1004' )
                 AND substr( mst.confirm_time, 1, 7 )<> ''
-                AND DATE_FORMAT( mst.input_time, '%Y-%m' ) = DATE_FORMAT( NOW(), '%Y-%m' )
+                AND DATE_FORMAT( mst.confirm_time, '%Y-%m' ) = DATE_FORMAT( NOW(), '%Y-%m' )
             GROUP BY
-                DATE_FORMAT( mst.input_time, '%Y-%m-%d' )
+                DATE_FORMAT( mst.confirm_time, '%Y-%m-%d' )
             ORDER BY
                 date
             ENDSELECT