Merge remote-tracking branch 'origin/master'

src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java

@@ -245,6 +245,18 @@ public class QcFAIRecordData extends QueryPage {
 
     private String invdefinetype;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date submitDate;
+
+    public Date getSubmitDate() {
+        return submitDate;
+    }
+
+    public void setSubmitDate(Date submitDate) {
+        this.submitDate = submitDate;
+    }
+
     public String getInvdefinetype() {
         return invdefinetype;
     }

src/main/resources/mapper/pms/QcMapper.xml

@@ -1730,7 +1730,8 @@
             inspector_date = getDate(),
             sampling_qty = #{samplingQty,jdbcType=DECIMAL},
             roll_qty = #{rollQty,jdbcType=DECIMAL},
-            unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL}
+            unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL},
+            submit_date = getDate()
         WHERE site = #{site} AND inspection_no = #{inspectionNo} and bu_no = #{buNo}
     </update>
 
@@ -1774,7 +1775,8 @@
     <update id="updateFAIMasterSubmitFlag" parameterType="QcFAIRecordData">
         UPDATE qc_fai_record
         SET submit_flag = 'Y',
-            state = '已完成'
+            state = '已完成',
+            submit_date = getDate()
         WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
     </update>
 
@@ -2076,7 +2078,8 @@
             inspector_date = getDate(),
             sampling_qty = #{samplingQty,jdbcType=DECIMAL},
             roll_qty = #{rollQty,jdbcType=DECIMAL},
-            unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL}
+            unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL},
+            submit_date = getDate()
         WHERE site = #{site} and inspection_no = #{inspectionNo} and bu_no = #{buNo}
     </update>
 
@@ -2095,7 +2098,8 @@
     <update id="updateIPQCMasterSubmitFlag" parameterType="QcFAIRecordData">
         UPDATE qc_ipqc_record
         SET submit_flag = 'Y',
-            state = '已完成'
+            state = '已完成',
+            submit_date = getDate()
         WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
     </update>
 
@@ -2466,7 +2470,8 @@
             inspector_date = getDate(),
             roll_count = #{rollCount,jdbcType=DECIMAL},
             sampling_qty = #{samplingQty,jdbcType=DECIMAL},
-            unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL}
+            unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL},
+            submit_date = getDate()
         WHERE site = #{site} and inspection_no = #{inspectionNo} and bu_no = #{buNo}
     </update>
 
@@ -2516,7 +2521,8 @@
     <update id="updateIQCMasterSubmitFlag" parameterType="QcFAIRecordData">
         UPDATE qc_iqc_record
         SET submit_flag = 'Y',
-            state = '已完成'
+            state = '已完成',
+            submit_date = getDate()
         WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
     </update>
 
@@ -2814,7 +2820,8 @@
             inspector_date = getDate(),
             sampling_qty = #{samplingQty,jdbcType=DECIMAL},
             roll_qty = #{rollQty,jdbcType=DECIMAL},
-            unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL}
+            unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL},
+            submit_date = getDate()
         WHERE site = #{site} and inspection_no = #{inspectionNo} and bu_no = #{buNo}
     </update>
 
@@ -2833,7 +2840,8 @@
     <update id="updateFQCMasterSubmitFlag" parameterType="QcFAIRecordData">
         UPDATE qc_fqc_record
         SET submit_flag = 'Y',
-            state = '已完成'
+            state = '已完成',
+            submit_date = getDate()
         WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
     </update>