From 76c50e3230cafcbdf7a16e8046c0a0d195dbb288 Mon Sep 17 00:00:00 2001 From: limy135302065 <1353020654@qq.com> Date: Fri, 10 Dec 2021 14:01:21 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=20=E7=94=9F=E4=BA=A7=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=91=98=E9=9D=A2=E6=9D=BF=EF=BC=88PDA=E3=80=81WEB?= =?UTF-8?q?=EF=BC=89=E7=82=B9=E5=87=BB=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81?= =?UTF-8?q?-=E5=88=97=E8=A1=A8-=E8=AE=A1=E5=88=92=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A2=9E=E5=8A=A08=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meapi/src/main/resources/mapper/SfcMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 678eac52..36a4db13 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/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}