Merge remote-tracking branch 'origin/master'

meapi/src/main/resources/mapper/SfcMapper.xml

@@ -674,7 +674,8 @@
         ELSE '未完成' END LAST_OPERATION_STATUS,
         CASE WHEN ZIT.RESULT='OK' THEN '合格' WHEN ZIT.RESULT='NG' THEN '不合格' ELSE '未检验' END PRE_WORKORDER_RESULT
         ,SS.STEP_ID CURRENT_STEP_ID,OT.DESCRIPTION OPERATION_DESCRIPTION,zsd.STEP_ID,
-         S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION,S.ITEM_BO,S.SHOP_ORDER_BO,zsd.PLANNED_COMP_DATE
+         S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION,S.ITEM_BO,S.SHOP_ORDER_BO,
+         TO_CHAR(zsd.PLANNED_COMP_DATE+INTERVAL '8' HOUR,'YYYY-MM-DD HH24:MI:SS') PLANNED_COMP_DATE
         FROM SFC S
         LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.ITEM_BO AND IT.LOCALE=#{locale}
         JOIN Z_SFC_DISPATCH zsd ON S.SFC=zsd.SFC AND S.SITE=zsd.SITE
@@ -692,7 +693,7 @@
         WHERE S.SITE=#{ew.entity.site}  AND ZSD.RESRCE=#{ew.entity.resrce}  AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START')
         AND S.STATUS_BO  IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404')
         AND zprt.STATUS='FINISH' AND  ZPRT."RESULT"='OK'
-        order by zsd.PLANNED_COMP_DATE asc
+        order by PLANNED_COMP_DATE asc
          ) T
         WHERE T.SITE = #{ew.entity.site}
         <if test="globalQuery!=null and globalQuery!=''">