Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java

@@ -41,6 +41,8 @@ public class LabelPrintDto implements Serializable {
     private String sfc;
     //数量
     private BigDecimal qty;
+    // 特定打印的数量
+    private BigDecimal sfcQty;
     //下料尺寸
     private String blankingSize;
     //下道工序
@@ -168,6 +170,14 @@ public class LabelPrintDto implements Serializable {
         this.qty = qty;
     }
 
+    public BigDecimal getSfcQty() {
+        return sfcQty;
+    }
+
+    public void setSfcQty(BigDecimal sfcQty) {
+        this.sfcQty = sfcQty;
+    }
+
     public String getBlankingSize() {
         return blankingSize;
     }

equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml

@@ -660,7 +660,7 @@
         WHERE
         (ZG.USER_GROUP_BO IS NULL OR (ZG.USER_GROUP_BO IS NOT NULL AND UGM.USER_OR_GROUP_GBO = #{currentUser}))
         AND RIK.SITE = #{site}
-        AND TASK_CREATE_DATE <= (SELECT TO_DATE(TO_CHAR(SYSDATE,'yyyy-mm-dd') || ' 00:00:00','yyyy-MM-dd hh24:mi-ss') -4/24 FROM DUAL)
+        AND TASK_CREATE_DATE <= (SELECT TO_DATE(TO_CHAR(SYSDATE+1,'yyyy-mm-dd') || ' 00:00:00','yyyy-MM-dd hh24:mi-ss') -4/24 FROM DUAL)
         <if test="taskNo != null and taskNo != ''">
             AND RIK.TASK_NO = #{taskNo}
         </if>