diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java index 5b7a37d4..31e385b3 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java +++ b/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; } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 80546395..6f284cc6 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/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} @@ -1774,7 +1775,8 @@ UPDATE qc_fai_record SET submit_flag = 'Y', - state = '已完成' + state = '已完成', + submit_date = getDate() WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} @@ -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} @@ -2095,7 +2098,8 @@ UPDATE qc_ipqc_record SET submit_flag = 'Y', - state = '已完成' + state = '已完成', + submit_date = getDate() WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} @@ -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} @@ -2516,7 +2521,8 @@ UPDATE qc_iqc_record SET submit_flag = 'Y', - state = '已完成' + state = '已完成', + submit_date = getDate() WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} @@ -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} @@ -2833,7 +2840,8 @@ UPDATE qc_fqc_record SET submit_flag = 'Y', - state = '已完成' + state = '已完成', + submit_date = getDate() WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}