检验任务待办事项 新增不合格数量列

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -993,11 +993,8 @@
         GROUP BY S.SFC) WIP ON WIP.SFC = s.SFC
         INNER JOIN OPERATION o ON o.SITE = zsd.SITE AND o.OPERATION = zsd.OPERATION AND o.CURRENT_REVISION = 'true'
         LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE
-        LEFT JOIN (SELECT zit.HANDLE, zit.SHOP_ORDER, zit.MODIFY_USER
+        LEFT JOIN Z_INSPECTION_TASK zit ON zsd.HANDLE = zit.SFC_DISPATCH_BO
-        FROM Z_INSPECTION_TASK zit
+        LEFT JOIN Z_NWA_USER znu ON znu.USER_NAME = zit.MODIFY_USER
-        WHERE ROWID IN (SELECT MAX(ROWID) FROM Z_INSPECTION_TASK zit GROUP BY zit.SHOP_ORDER)) ZITK
-        ON zsd.SHOP_ORDER = ZITK.SHOP_ORDER
-        LEFT JOIN Z_NWA_USER znu ON znu.USER_NAME = ZITK.MODIFY_USER
         <where>
             zsd.DISPATCH_STATUS = 'COMPLETE'
             AND zsd.SITE = #{site}

quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java

@@ -35,6 +35,15 @@ public class InspectionTaskManage implements Serializable {
     private String sfcQty;
     private String dispatchUser;
     private String sfcdispatchBo;
+    private String ncQty;
+
+    public String getNcQty() {
+        return ncQty;
+    }
+
+    public void setNcQty(String ncQty) {
+        this.ncQty = ncQty;
+    }
 
     public String getSfcdispatchBo() {
         return sfcdispatchBo;

quality/src/main/resources/mapper/InspectionTaskManageMapper.xml

@@ -31,13 +31,14 @@
         <result column="SFC_QTY" property="sfcQty" />
         <result column="DISPATCH_USER" property="dispatchUser"/>
         <result column="SFC_DISPATCH_BO" property="sfcdispatchBo"/>
+        <result column="NC_QTY" property="ncQty"/>
     </resultMap>
 
     <select id="findInspectionTask" resultMap="BaseResultMap">
         SELECT  B.HANDLE, B.SITE, B.CATEGORY, B.TASK_NO, B.DESCRIPTION, B.STATUS, B.INSPECTION_ITEM_BO, B.WORK_CENTER, B.SHOP_ORDER, B.SFC, B.OPERATION, B.STEP_ID, B.RESRCE, B.RESULT, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
                 M.ITEM, Z.DESCRIPTION  ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME,RS.DESCRIPTION RESRCE_DESCRIPTION,
                O.OPERATION OPERATION,OT.DESCRIPTION OPERATION_DESCRIPTION,S.QTY SFC_QTY,B.COMMENTS COMMENTS,
-               ZSD.EMPLOYEE_DESCRIPTION DISPATCH_USER,P.SHOP_ORDER,B.SFC_DISPATCH_BO
+               ZSD.EMPLOYEE_DESCRIPTION DISPATCH_USER,P.SHOP_ORDER,NVL(ZAB.NC_QTY, 0)       NC_QTY,B.SFC_DISPATCH_BO
         FROM Z_INSPECTION_TASK B
         INNER JOIN RESRCE RS ON B.SITE = RS.SITE AND RS.RESRCE = B.RESRCE
         INNER JOIN OPERATION O ON O.OPERATION = B.OPERATION AND O.SITE = B.SITE
@@ -50,6 +51,7 @@
         INNER JOIN ITEM M ON M.HANDLE = P.ITEM_BO
         LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = B.CREATE_USER
         LEFT JOIN ITEM_T Z ON Z.ITEM_BO = M.HANDLE AND Z.LOCALE = 'zh'
+        LEFT JOIN Z_ABNORMAL_BILL ZAB ON B.HANDLE = ZAB.OBJECT_BO
         WHERE B.SITE = #{site}
         <if test="workCenter != null and workCenter != ''">
             AND B.WORK_CENTER = #{workCenter}