计件优化

src/main/resources/mappings/modules/mes/MesProductRecordDao.xml

@@ -63,7 +63,7 @@
             r.oprno,
             CASE WHEN LEFT(r.sn, 1) = '+' THEN LEFT(r.sn, 5)
                  ELSE CONCAT('+', LEFT(r.sn, 4)) END AS productPrefix,
-            CASE WHEN TIME(r.update_date) >= '08:30:00' AND TIME(r.update_date) < '20:30:00'
+            CASE WHEN TIME(r.piecework_date) >= '08:30:00' AND TIME(r.piecework_date) < '20:30:00'
                  THEN 'day' ELSE 'night' END AS shift,
             r.content    AS result,
             COUNT(*)     AS cnt
@@ -71,8 +71,8 @@
         WHERE r.line_sn = 'XT'
           AND r.craft   = '100000'
           AND r.content IN ('OK','NG')
-          AND r.update_date >= #{params.dateStart}
-          AND r.update_date <  #{params.dateEnd}
+          AND r.piecework_date >= #{params.dateStart}
+          AND r.piecework_date <  #{params.dateEnd}
           <if test="params.prefixes != null and params.prefixes.size() > 0">
           AND (CASE WHEN LEFT(r.sn, 1) = '+' THEN LEFT(r.sn, 5)
                     ELSE CONCAT('+', LEFT(r.sn, 4)) END) IN
@@ -82,7 +82,7 @@
           </if>
         GROUP BY r.oprno, CASE WHEN LEFT(r.sn, 1) = '+' THEN LEFT(r.sn, 5)
                                ELSE CONCAT('+', LEFT(r.sn, 4)) END,
-            CASE WHEN TIME(r.update_date) &gt;= '08:30:00' AND TIME(r.update_date) &lt; '20:30:00'
+            CASE WHEN TIME(r.piecework_date) &gt;= '08:30:00' AND TIME(r.piecework_date) &lt; '20:30:00'
                  THEN 'day' ELSE 'night' END,
             r.content
         ORDER BY r.oprno ASC, productPrefix ASC
@@ -90,7 +90,7 @@
     <!-- 按小时统计今日产量，用于趋势图 -->
     <select id="pieceworkHourlyStat" resultType="java.util.HashMap">
         SELECT
-            HOUR(r.update_date) AS hour,
+            HOUR(r.piecework_date) AS hour,
             CASE WHEN LEFT(r.sn, 1) = '+' THEN LEFT(r.sn, 5)
                  ELSE CONCAT('+', LEFT(r.sn, 4)) END AS productPrefix,
             COUNT(*)            AS cnt
@@ -98,8 +98,8 @@
         WHERE r.line_sn = 'XT'
           AND r.craft   = '100000'
           AND r.content = 'OK'
-          AND r.update_date &gt;= #{params.dateStart}
-          AND r.update_date &lt;  #{params.dateEnd}
+          AND r.piecework_date &gt;= #{params.dateStart}
+          AND r.piecework_date &lt;  #{params.dateEnd}
           <if test="params.prefixes != null and params.prefixes.size() > 0">
           AND (CASE WHEN LEFT(r.sn, 1) = '+' THEN LEFT(r.sn, 5)
                     ELSE CONCAT('+', LEFT(r.sn, 4)) END) IN
@@ -107,8 +107,8 @@
                   #{p}
               </foreach>
           </if>
-        GROUP BY HOUR(r.update_date), CASE WHEN LEFT(r.sn, 1) = '+' THEN LEFT(r.sn, 5)
-                                           ELSE CONCAT('+', LEFT(r.sn, 4)) END
-        ORDER BY HOUR(r.update_date) ASC
+        GROUP BY HOUR(r.piecework_date), CASE WHEN LEFT(r.sn, 1) = '+' THEN LEFT(r.sn, 5)
+                                              ELSE CONCAT('+', LEFT(r.sn, 4)) END
+        ORDER BY HOUR(r.piecework_date) ASC
     </select>
 </mapper>