Merge remote-tracking branch 'origin/master'

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

@@ -947,7 +947,7 @@
         ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME,
         ZNU.FULL_NAME CREATED_USER,
         ZAB.NC_CODE NC_CODE,ZAB.PB_DESCRIPTION PB_DESCRIPTION,
-        SUBSTR(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO),0,LENGTH(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO))-1) NC_CODE_DESCRIPTION
+        LISTAGG(NCT.DESCRIPTION , ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO) NC_CODE_DESCRIPTION
         FROM Z_ABNORMAL_BILL ZAB
         LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO = ZAB.HANDLE
         LEFT JOIN ITEM I ON ZAB.ITEM_BO = I.HANDLE
@@ -982,7 +982,7 @@
                 <if test="abnormalBill.status == 'COMP'.toString()">
                     AND zab.PROGRAM = 'true' AND zab.CORRECTION = 'true' AND zab.status != 'G'
                 </if>
-                <if test="abnormalBill.status == ''">
+                <if test="abnormalBill.status == '' and abnormalBill.type == 'Z'.toString()">
                     AND zab.STATUS != 'Q' AND zab.STATUS != 'G'
                 </if>
                 <if test="abnormalBill.startDateTime != null ">

common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java

@@ -49,7 +49,7 @@ public class ExportAspect {
         String exportCode = "";
         //-------------------------------------------------------------------------------------------------------------------
         if (paramtes == null || args == null || args.length == 0) return joinPoint.proceed();
-        Boolean isDuoDuo = (args != null && (args.length == 1 && args[0].getClass() != String.class)) ? false : true;
+        Boolean isDuoDuo = (args != null && (args.length == 1 && args[0] != null && args[0].getClass() != String.class)) ? false : true;
         //-------------------------------------------------------------------------------------------------------------------
         request.setCharacterEncoding("UTF-8");
         //-------------------------------------------------------------------------------------------------------------------

common/src/main/resources/mapper/ReportDataMapper.xml

@@ -58,9 +58,14 @@
         SELECT  ZSD.PLANNED_COMP_DATE ,ZSD.PLANNED_START_DATE ,ZSD.RESRCE
         FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS IN ('START','COMPLETE','RELEASE')
         )
-        SELECT RDT.* ,  SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT) ) )   PLAN_HOUR
+        SELECT RDT.* ,  SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
+        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
+        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) ) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT) ) * RDT.CAPACITY_MAN_HOUR / 8   PLAN_HOUR
         ,CASE WHEN RDT.CAPACITY_MAN_HOUR = 0 THEN '0%'
-                   ELSE ROUND(SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT) ) ) / RDT.CAPACITY_MAN_HOUR , 4) * 100 || '%'
+        ELSE ROUND(SUM( ( DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)
+        + DECODE(E.CNT,NULL,0,E.CNT) + DECODE(F.CNT,NULL,0,F.CNT) + DECODE(G.CNT,NULL,0,G.CNT) + DECODE(H.CNT,NULL,0,H.CNT)
+        + DECODE(I.CNT,NULL,0,I.CNT) + DECODE(J.CNT,NULL,0,J.CNT) + DECODE(K.CNT,NULL,0,K.CNT) + DECODE(L.CNT,NULL,0,L.CNT)
+        ) ) / 8 , 4) * 100 || '%'
         END RATE_DATA
         FROM
         ( SELECT R.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION, DATE_TIME, DECODE(CF.VALUE,NULL,0,CF.VALUE) CAPACITY_MAN_HOUR ,  WCA.WORK_CENTER CENTER ,
@@ -88,24 +93,55 @@
         </if>
         <if test="resourceType != null and resourceType != ''" >
             AND RT.RESOURCE_TYPE = #{resourceType}
-                </if>
+        </if>) RDT
-            ) RDT
         LEFT JOIN
-            (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PLANNED_COMP_DATE - START_DATE_TIME)*24, 4) ) CNT FROM Z_REPORT_DATE_TIME
+        (SELECT  DATE_TIME ,RESRCE , COUNT(*) * 8 CNT  FROM Z_REPORT_DATE_TIME
-                                                                                                                LEFT JOIN TEMP ON PLANNED_START_DATE &lt; START_DATE_TIME AND PLANNED_COMP_DATE &gt; START_DATE_TIME AND PLANNED_COMP_DATE &lt; END_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &lt;= AM_START_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_END_DATE_TIME
         GROUP BY RESRCE , DATE_TIME ) A ON A.DATE_TIME = RDT.DATE_TIME   AND A.RESRCE = RDT.RESRCE
         LEFT JOIN
-            (SELECT  DATE_TIME ,RESRCE , COUNT(*) * 24 CNT  FROM Z_REPORT_DATE_TIME
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PLANNED_COMP_DATE - AM_START_DATE_TIME)*24, 4) ) CNT FROM Z_REPORT_DATE_TIME
-                                                                     LEFT JOIN TEMP ON PLANNED_START_DATE &lt; START_DATE_TIME AND PLANNED_COMP_DATE &gt; END_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &lt;= AM_START_DATE_TIME AND PLANNED_COMP_DATE &gt;= AM_START_DATE_TIME AND PLANNED_COMP_DATE &lt;= AM_END_DATE_TIME
         GROUP BY RESRCE , DATE_TIME ) B ON B.DATE_TIME = RDT.DATE_TIME  AND B.RESRCE = RDT.RESRCE
         LEFT JOIN
-            (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PLANNED_COMP_DATE - PLANNED_START_DATE)*24 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        (SELECT  DATE_TIME ,RESRCE , COUNT(*)*4 CNT FROM Z_REPORT_DATE_TIME
-                                                                                                                    LEFT JOIN TEMP ON PLANNED_START_DATE &gt; START_DATE_TIME AND PLANNED_COMP_DATE &lt; END_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &lt;= AM_START_DATE_TIME AND PLANNED_COMP_DATE &gt;= AM_END_DATE_TIME AND PLANNED_COMP_DATE &lt; PM_START_DATE_TIME
         GROUP BY RESRCE , DATE_TIME ) C ON C.DATE_TIME = RDT.DATE_TIME  AND C.RESRCE = RDT.RESRCE
         LEFT JOIN
-            (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((END_DATE_TIME - PLANNED_START_DATE)*24 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PLANNED_COMP_DATE - AM_START_DATE_TIME)*24 - 1 , 4) ) CNT FROM Z_REPORT_DATE_TIME
-                                                                                                                LEFT JOIN TEMP ON PLANNED_START_DATE &gt; START_DATE_TIME AND PLANNED_START_DATE &lt; END_DATE_TIME AND PLANNED_COMP_DATE &gt; END_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &lt;= AM_START_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_START_DATE_TIME AND PLANNED_COMP_DATE &lt;= PM_END_DATE_TIME
         GROUP BY RESRCE , DATE_TIME ) D ON D.DATE_TIME = RDT.DATE_TIME  AND D.RESRCE = RDT.RESRCE
+        LEFT JOIN
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PLANNED_COMP_DATE - PLANNED_START_DATE)*24 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &gt; AM_START_DATE_TIME AND PLANNED_COMP_DATE &lt;= AM_END_DATE_TIME
+        GROUP BY RESRCE , DATE_TIME ) E ON E.DATE_TIME = RDT.DATE_TIME  AND E.RESRCE = RDT.RESRCE
+        LEFT JOIN
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((AM_END_DATE_TIME - PLANNED_START_DATE)*24 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &gt; AM_START_DATE_TIME AND PLANNED_START_DATE &lt;= AM_END_DATE_TIME AND PLANNED_COMP_DATE &gt;= AM_END_DATE_TIME AND PLANNED_COMP_DATE &lt;= PM_START_DATE_TIME
+        GROUP BY RESRCE , DATE_TIME ) F ON F.DATE_TIME = RDT.DATE_TIME  AND F.RESRCE = RDT.RESRCE
+        LEFT JOIN
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PLANNED_COMP_DATE - PLANNED_START_DATE)*24 - 1 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &gt; AM_START_DATE_TIME AND PLANNED_START_DATE &lt;= AM_END_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_START_DATE_TIME AND PLANNED_COMP_DATE &lt; PM_END_DATE_TIME
+        GROUP BY RESRCE , DATE_TIME ) G ON G.DATE_TIME = RDT.DATE_TIME  AND G.RESRCE = RDT.RESRCE
+        LEFT JOIN
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PM_END_DATE_TIME - PLANNED_START_DATE)*24 - 1 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &gt; AM_START_DATE_TIME AND PLANNED_START_DATE &lt;= AM_END_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_END_DATE_TIME
+        GROUP BY RESRCE , DATE_TIME ) H ON H.DATE_TIME = RDT.DATE_TIME  AND H.RESRCE = RDT.RESRCE
+        LEFT JOIN
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PLANNED_COMP_DATE - PM_START_DATE_TIME)*24 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &gt; AM_END_DATE_TIME AND PLANNED_START_DATE &lt;= PM_START_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_START_DATE_TIME AND PLANNED_COMP_DATE &lt; PM_END_DATE_TIME
+        GROUP BY RESRCE , DATE_TIME ) I ON I.DATE_TIME = RDT.DATE_TIME  AND I.RESRCE = RDT.RESRCE
+        LEFT JOIN
+        (SELECT  DATE_TIME ,RESRCE , COUNT(*)*4 CNT FROM Z_REPORT_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &gt; AM_END_DATE_TIME AND PLANNED_START_DATE &lt; PM_START_DATE_TIME AND PLANNED_COMP_DATE &gt; PM_END_DATE_TIME
+        GROUP BY RESRCE , DATE_TIME ) J ON J.DATE_TIME = RDT.DATE_TIME  AND J.RESRCE = RDT.RESRCE
+        LEFT JOIN
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PLANNED_COMP_DATE - PLANNED_START_DATE)*24 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &gt; PM_START_DATE_TIME AND PLANNED_COMP_DATE &lt; PM_END_DATE_TIME
+        GROUP BY RESRCE , DATE_TIME ) K ON K.DATE_TIME = RDT.DATE_TIME  AND K.RESRCE = RDT.RESRCE
+        LEFT JOIN
+        (SELECT  DATE_TIME ,RESRCE , SUM( ROUND((PM_END_DATE_TIME - PLANNED_START_DATE)*24 , 4) ) CNT FROM Z_REPORT_DATE_TIME
+        LEFT JOIN TEMP ON PLANNED_START_DATE &gt; PM_START_DATE_TIME AND PLANNED_START_DATE &lt; PM_END_DATE_TIME AND PLANNED_COMP_DATE &gt;= PM_END_DATE_TIME
+        GROUP BY RESRCE , DATE_TIME ) L ON L.DATE_TIME = RDT.DATE_TIME  AND L.RESRCE = RDT.RESRCE
         GROUP BY RDT.RESRCE, RDT.RESOURCE_DESCRIPTION, RDT.DATE_TIME ,RDT.CAPACITY_MAN_HOUR , RDT.CENTER ,RDT.CENTER_DESCRIPTION ,RDT.WORK_CENTER ,RDT.WORK_CENTER_DESCRIPTION ,RDT.RESOURCE_TYPE ,RDT.RESOURCE_TYPE_DESCRIPTION
         ORDER BY RDT.WORK_CENTER ,RDT.RESRCE, RDT.DATE_TIME
     </select>
@@ -218,8 +254,11 @@
     <!---->
     <insert id="insertReportDateTimeByStartToDate"  >
         INSERT INTO Z_REPORT_DATE_TIME
-        SELECT #{site} ,TO_CHAR(TO_DATE(#{startFromDate},'YYYY-MM-DD') + ROWNUM -1, 'YYYY-MM-DD') , TO_DATE(#{startFromDate} || '16:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -2 ,
+        SELECT '1000' ,TO_CHAR(TO_DATE(#{startFromDate},'YYYY-MM-DD') + ROWNUM -1, 'YYYY-MM-DD') DATE_TIME,
-               TO_DATE(#{startFromDate} || '16:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1
+        TO_DATE(#{startFromDate} || '00:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_START_DATE_TIME,
+        TO_DATE(#{startFromDate} || '04:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_END_DATE_TIME,
+        TO_DATE(#{startFromDate} || '05:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 PM_START_DATE_TIME ,
+        TO_DATE(#{startFromDate} || '09:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 PM_END_DATE_TIME
         FROM dual CONNECT BY rownum &lt;= to_date( #{startToDate}, 'yyyy-mm-dd') - to_date( #{startFromDate}, 'yyyy-mm-dd') + 1
     </insert>
 

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

@@ -31,6 +31,8 @@ public class InspectionTaskManage implements Serializable {
     private LocalDateTime modifiedDateTime;
     private String fullName;
     private String resrceDescription;
+    private String operationDescription;
+    private String sfcQty;
 
     private List<InspectionTaskManageDetail> inspectionTaskDetailList;
 
@@ -233,4 +235,20 @@ public class InspectionTaskManage implements Serializable {
     public void setResrceDescription(String resrceDescription) {
         this.resrceDescription = resrceDescription;
     }
+
+    public String getOperationDescription() {
+        return operationDescription;
+    }
+
+    public void setOperationDescription(String operationDescription) {
+        this.operationDescription = operationDescription;
+    }
+
+    public String getSfcQty() {
+        return sfcQty;
+    }
+
+    public void setSfcQty(String sfcQty) {
+        this.sfcQty = sfcQty;
+    }
 }

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

@@ -17,6 +17,7 @@
         <result column="ITEM" property="item" />
         <result column="ITEM_DESCRIPTION" property="itemDescription" />
         <result column="OPERATION" property="operation" />
+        <result column="OPERATION_DESCRIPTION" property="operationDescription" />
         <result column="STEP_ID" property="stepId" />
         <result column="RESRCE" property="resrce" />
         <result column="RESULT" property="result" />
@@ -27,13 +28,19 @@
         <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
         <result column="FULL_NAME" property="fullName"/>
         <result column="RESRCE_DESCRIPTION" property="resrceDescription"/>
+        <result column="SFC_QTY" property="sfcQty" />
+
     </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
+                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
         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
+        LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh'
+        INNER JOIN SFC S ON S.SFC = B.SFC AND S.SITE = B.SITE
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = RS.HANDLE AND CF.ATTRIBUTE = 'CHECK_USR'
         INNER JOIN SFC S ON S.SITE = B.SITE AND S.SFC = B.SFC
         INNER JOIN SHOP_ORDER P ON P.HANDLE = S.SHOP_ORDER_BO