From ec8c1e98dfcd50037386a3d174e2c34fd24570b3 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Tue, 14 Feb 2023 18:21:00 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=A5=E8=A1=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/anomaly/utils/yunBpmConfig.java | 35 +++++-------------- .../main/resources/mapper/ReportMapper.xml | 5 ++- .../mapper/LogisticsTurnoverMapper.xml | 17 +++++++-- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java index de870e84..94a26f71 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java @@ -1,22 +1,20 @@ package com.foreverwin.mesnac.anomaly.utils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - /** * @Author YinQ * @create 2022-08-02 10:36 */ -@Component public class yunBpmConfig { - public static String userName; - - public static String passWord; +// public static final String userName = "zhangzy";//测试 +// public static final String passWord = "123456";//测试 +// public static final String apiBaseUrl = "http://172.16.77.181:8080";//测试 +// public static final String yunBpmUrl = "http://yunbpmcs.mesnac.com:8080";//测试 - public static String apiBaseUrl; - - public static String yunBpmUrl; + public static final String userName = "bpm_mes";//正式 + public static final String passWord = "mesnac@2022";//正式 + public static final String apiBaseUrl = "http://172.16.77.182:8080";//正式 + public static final String yunBpmUrl = "http://yunbpm.mesnac.com:8080";//正式 public static final String apiBaseToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiYXBpIl0sImNvcnBJZCI6bnVsbCwidXNlcl9pZCI6ImU1MGVmMDE2NzhkZDQ2MGViZWUwNmYwZjE5OTU4M2JjIiwidXNlcl9uYW1lIjoiMjYyMjI2MTY0NTcwMzE3MCIsInNjb3BlIjpbInJlYWQiXSwibW9iaWxlIjpmYWxzZSwiaXNBZG1pbiI6dHJ1ZSwiZXhwIjoxNjYyNjI3MTM3LCJpc0FwcEFkbWluIjpmYWxzZSwiYXV0aG9yaXRpZXMiOlsiVVNFUiIsIkFVVEhfU1lTVEVNX01BTkFHRSJdLCJqdGkiOiI1YmJhNjQ3Yy0yNWNkLTRhZTMtYmRlMC0zYjE4NDYyZGI5YmYiLCJjbGllbnRfaWQiOiJhcGkifQ.NiQUUBapr9K5Tx3xIJzRaRfk426Rwl9bUiRCRpsF_fIQp19wot9FXJQWMTKF7mLkjbKxo6IBAfo-mGkpQRC_WLjaRnMGzVxalwXojN95KR1NAvAgSyiEsgwFDdatW_Yiwan4orHZHUc1Q_eyr_8AmZ-OIWrhFhS9hosky4FQx-v7M_L065a5xW8MDeuMOUSSoVWcxZP1Obo12PAMGHMBl36TJR4C7XanBSLw0kW7K3Ab6fhlJ6QLLC8SOb3dC4LTJToxFmXRNU7REKIs5Vu6087hJM7eSttZNu4aaSwqxeigWulHMFJGktSzQKl50l8breWXyb7AxcgvI0wG-FmA6g";//测试 @@ -61,21 +59,4 @@ public class yunBpmConfig { public static String getClientId() { return clientId; } - - @Value("${yunBpmConfig.userName}") - public void setUserName(String userName) { - yunBpmConfig.userName = userName; - } - @Value("${yunBpmConfig.passWord}") - public void setPassWord(String passWord) { - yunBpmConfig.passWord = passWord; - } - @Value("${yunBpmConfig.apiBaseUrl}") - public void setApiBaseUrl(String apiBaseUrl) { - yunBpmConfig.apiBaseUrl = apiBaseUrl; - } - @Value("${yunBpmConfig.yunBpmUrl}") - public void setYunBpmUrl(String yunBpmUrl) { - yunBpmConfig.yunBpmUrl = yunBpmUrl; - } } diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 35b65311..1e9ebb3a 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -814,7 +814,10 @@ INNER JOIN OPERATION o ON o.OPERATION = zsd.OPERATION AND o.CURRENT_REVISION = 'true' AND o.SITE = zsd.SITE LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE AND ot.LOCALE = 'zh' - LEFT JOIN Z_INSPECTION_TASK zit ON zit.SFC_DISPATCH_BO = zsd.HANDLE + LEFT JOIN (SELECT zzit.SFC_DISPATCH_BO, MAX(zzit.HANDLE) HANDLE + FROM Z_INSPECTION_TASK zzit + WHERE zzit.SFC_DISPATCH_BO IS NOT NULL + GROUP BY zzit.SFC_DISPATCH_BO) zit ON zit.SFC_DISPATCH_BO = zsd.HANDLE LEFT JOIN Z_ABNORMAL_BILL zab ON zab.OBJECT_BO = zit.HANDLE LEFT JOIN (SELECT NST.SITE, NST.SFC, diff --git a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml index 66f3a874..49cbed24 100644 --- a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml +++ b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml @@ -813,13 +813,24 @@ AND O.CURRENT_REVISION = 'true' LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh' - LEFT JOIN (SELECT PZSD.HANDLE, PZSD.NEXT_NEXT_OPERATION, NNOT.DESCRIPTION + LEFT JOIN (SELECT PZSD.HANDLE, + PZSD.NEXT_NEXT_OPERATION, + CASE + WHEN NNOT.DESCRIPTION = '虚拟工序' AND PZSD.XN_DESCRIPTION IS NOT NULL + THEN concat(NNOT.DESCRIPTION, '(' || PZSD.XN_DESCRIPTION || ')') + ELSE NNOT.DESCRIPTION END DESCRIPTION FROM ( SELECT OZSD.HANDLE, OZSD.OPERATION, LEAD(OZSD.OPERATION, 2) - OVER ( PARTITION BY OZSD.SFC ORDER BY OZSD.SFC,OZSD.DISPATCH_NO ) NEXT_NEXT_OPERATION - FROM Z_SFC_DISPATCH OZSD) PZSD + OVER ( PARTITION BY OZSD.SFC ORDER BY OZSD.SFC,OZSD.DISPATCH_NO ) NEXT_NEXT_OPERATION, + LEAD(CF.VALUE, 2) + OVER ( PARTITION BY OZSD.SFC ORDER BY OZSD.SFC,OZSD.DISPATCH_NO ) XN_DESCRIPTION + FROM Z_SFC_DISPATCH OZSD + LEFT JOIN CUSTOM_FIELDS CF + ON CF.HANDLE = + 'RouterOperationBO:RouterStepBO:' || OZSD.ROUTER_BO || ',' || OZSD.STEP_ID AND + CF.ATTRIBUTE = 'SOURCE_DESCRIPTION') PZSD INNER JOIN OPERATION NNO ON NNO.OPERATION = PZSD.NEXT_NEXT_OPERATION AND NNO.CURRENT_REVISION = 'true' LEFT JOIN OPERATION_T NNOT ON NNOT.OPERATION_BO = NNO.HANDLE AND NNOT.LOCALE = 'zh') NNOD