From 13513dc4c18dcebdf815171da7e8b4edd68e1ec6 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 24 Sep 2021 09:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=91=98=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=BA=E5=91=98=E5=89=8D=E9=9D=A2=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E6=AD=A5=E9=AA=A4=E6=A0=87=E8=AF=86=E3=80=81=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/foreverwin/mesnac/meapi/dto/SfcDto.java | 9 +++++++++ meapi/src/main/resources/mapper/SfcMapper.xml | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java index e2bd9138..fb855522 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java @@ -16,6 +16,7 @@ public class SfcDto extends Sfc { private String dispatchNo; private String abnormalNo; private String stepId; + private String currentStepId; private String plannedStartDate; private String plannedCompDate; private String stepSequence; @@ -24,6 +25,14 @@ public class SfcDto extends Sfc { private String employeeDescription; private String lastOperationStatus; + public String getCurrentStepId() { + return currentStepId; + } + + public void setCurrentStepId(String currentStepId) { + this.currentStepId = currentStepId; + } + public String getStepSequence() { return stepSequence; } diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 1dda6858..45a7dcfe 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -665,15 +665,15 @@ WHERE SC.SITE = #{site} AND SC.SFC = #{sfc} - + SELECT PREZSD.EMPLOYEE_DESCRIPTION, + CASE WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成' + ELSE '未完成' END LAST_OPERATION_STATUS,SS.STEP_ID CURRENT_STEP_ID,zsd.STEP_ID, S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION,S.ITEM_BO,S.SHOP_ORDER_BO 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 - LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1 + LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1 AND zsd.ROUTER_BO=PREZSD.ROUTER_BO JOIN Z_PROD_READY_TASK zprt ON ZPRT.SFC_DISPATCH_BO=zsd.HANDLE JOIN SFC S ON S.SFC=ZSD.SFC AND S.SITE=ZSD.SITE JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE