增加上工序的完成状态(是否完成)、完成人员名称

meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java

@@ -20,6 +20,24 @@ public class SfcDto extends Sfc {
     private String plannedCompDate;
     //工作令号
     private String workOrder;
+    private String employeeDescription;
+    private String lastOperationStatus;
+
+    public String getEmployeeDescription() {
+        return employeeDescription;
+    }
+
+    public void setEmployeeDescription(String employeeDescription) {
+        this.employeeDescription = employeeDescription;
+    }
+
+    public String getLastOperationStatus() {
+        return lastOperationStatus;
+    }
+
+    public void setLastOperationStatus(String lastOperationStatus) {
+        this.lastOperationStatus = lastOperationStatus;
+    }
 
     public String getAbnormalNo() {
         return abnormalNo;

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

@@ -44,6 +44,9 @@
         <result column="OPERATION_DESCRIPTION" property="operationDescription" />
         <result column="PREPOSITION_OPERATION" property="prepositionOperation" />
         <result column="RESRCE" property="resrce" />
+        <result column="EMPLOYEE_DESCRIPTION" property="employeeDescription" />
+        <result column="LAST_OPERATION_STATUS" property="lastOperationStatus" />
+
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -636,7 +639,7 @@
         SELECT IW.DATE_STARTED
          FROM  SFC S
         INNER JOIN SFC_ROUTING SR ON  SR.SFC_BO = S.HANDLE
-        INNER JOIN SFC_ROUTER SRO ON SRO.SFC_ROUTING_BO = SR.HANDLE
+        INNER JOIN SFC_ROUTER SRO ON SRO.SFC_ROUTING_BO = SR.HANDLE AND SRSRO.IN_USE = 'true'
         INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = SRO.HANDLE
         INNER JOIN SFC_IN_WORK IW ON SS.HANDLE = IW.SFC_STEP_BO
         INNER JOIN STATUS ST ON ST.HANDLE = S.STATUS_BO AND ST.STATUS ='403'
@@ -663,10 +666,18 @@
     </select>
 
     <select id="pageByResrce" resultMap="FullResultMap">
-        SELECT S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION FROM SFC S
+        SELECT PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
+        WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成'
+        ELSE '未完成' END LAST_OPERATION_STATUS,
+         S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION 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
         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
+        JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO  AND SR2.IN_USE = 'true'
+        LEFT JOIN  SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0)
         WHERE S.SITE=#{ew.entity.site}  AND ZSD.RESRCE=#{ew.entity.resrce}  AND ZSD.DISPATCH_STATUS!='CANCEL' AND ZSD.DISPATCH_STATUS!='COMPLETE'
         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'