diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java index 6acdff9..0ab3f3d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java @@ -109,6 +109,9 @@ public class ProFeedback extends BaseEntity @Excel(name = "不良品数量") private BigDecimal quantityUnquanlified; + @Excel(name = "待检测数量") + private BigDecimal quantityUncheck; + /** 报工用户名 */ @Excel(name = "报工用户名") private String userName; @@ -444,6 +447,14 @@ public class ProFeedback extends BaseEntity this.recordNick = recordNick; } + public BigDecimal getQuantityUncheck() { + return quantityUncheck; + } + + public void setQuantityUncheck(BigDecimal quantityUncheck) { + this.quantityUncheck = quantityUncheck; + } + @Override public String toString() { return "ProFeedback{" + @@ -470,6 +481,7 @@ public class ProFeedback extends BaseEntity ", quantityFeedback=" + quantityFeedback + ", quantityQualified=" + quantityQualified + ", quantityUnquanlified=" + quantityUnquanlified + + ", quantityUncheck=" + quantityUncheck + ", userName='" + userName + '\'' + ", nickName='" + nickName + '\'' + ", feedbackChannel='" + feedbackChannel + '\'' + diff --git a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml index 3755034..65e773a 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml @@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select record_id,feedback_type, workstation_id, workstation_code, workstation_name,process_id, process_code, process_name, workorder_id, workorder_code, workorder_name, task_id, task_code,item_id,item_code,item_name,specification,unit_of_measure, quantity, quantity_feedback, quantity_qualified, quantity_unquanlified, user_name, nick_name, feedback_channel, feedback_time,record_user,record_nick,status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_feedback + select record_id,feedback_type, workstation_id, workstation_code, workstation_name,process_id, process_code, process_name, workorder_id, workorder_code, workorder_name, task_id, task_code,item_id,item_code,item_name,specification,unit_of_measure, quantity, quantity_feedback, quantity_qualified, quantity_unquanlified,quantity_uncheck, user_name, nick_name, feedback_channel, feedback_time,record_user,record_nick,status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_feedback