From 6da962e288fa7ede810375f64e96b1499dc81317 Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Sun, 2 Oct 2022 15:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E8=A1=A8?=
=?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/设计文档/数据库设计/mes-pro.sql | 7 +
.../com/ktg/mes/pro/domain/ProFeedback.java | 155 ++++++++++++++----
.../mapper/pro/ProFeedbackMapper.xml | 36 +++-
3 files changed, 169 insertions(+), 29 deletions(-)
diff --git a/doc/设计文档/数据库设计/mes-pro.sql b/doc/设计文档/数据库设计/mes-pro.sql
index 76de2d7..8360af8 100644
--- a/doc/设计文档/数据库设计/mes-pro.sql
+++ b/doc/设计文档/数据库设计/mes-pro.sql
@@ -280,6 +280,7 @@ create table pro_task (
drop table if exists pro_feedback;
create table pro_feedback (
record_id bigint(20) not null auto_increment comment '记录ID',
+ feedback_type varchar(64) not null comment '报工类型',
workstation_id bigint(20) not null comment '工作站ID',
workstation_code varchar(64) comment '工作站编号',
workstation_name varchar(255) comment '工作站名称',
@@ -288,6 +289,10 @@ create table pro_feedback (
workorder_name varchar(255) comment '生产工单名称',
task_id bigint(20) comment '生产任务ID',
task_code varchar(64) comment '生产任务编号',
+ item_id bigint(20) not null comment '产品物料ID',
+ item_code varchar(64) not null comment '产品物料编码',
+ item_name varchar(255) not null comment '产品物料名称',
+ specification varchar(500) comment '规格型号',
quantity double(14,2) comment '排产数量',
quantity_feedback double(14,2) comment '本次报工数量',
quantity_qualified double(14,2) comment '合格品数量',
@@ -296,6 +301,8 @@ create table pro_feedback (
nick_name varchar(64) comment '昵称',
feedback_channel varchar(64) comment '报工途径',
feedback_time datetime comment '报工时间',
+ record_user varchar(64) comment '记录人',
+ status varchar(64) default 'PREPARE' comment '状态',
remark varchar(500) default '' comment '备注',
attr1 varchar(64) default null comment '预留字段1',
attr2 varchar(255) default null comment '预留字段2',
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 f0d1715..1ded6db 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
@@ -21,6 +21,9 @@ public class ProFeedback extends BaseEntity
/** 记录ID */
private Long recordId;
+ /** 报工类型*/
+ private String feedbackType;
+
/** 工作站ID */
@Excel(name = "工作站ID")
private Long workstationId;
@@ -53,6 +56,27 @@ public class ProFeedback extends BaseEntity
@Excel(name = "生产任务编号")
private String taskCode;
+ /** 产品物料ID */
+ @Excel(name = "产品物料ID")
+ private Long itemId;
+
+ /** 产品物料编码 */
+ @Excel(name = "产品物料编码")
+ private String itemCode;
+
+ /** 产品物料名称 */
+ @Excel(name = "产品物料名称")
+ private String itemName;
+
+ /** 规格型号 */
+ @Excel(name = "规格型号")
+ private String specification;
+
+ /** 单位 */
+ @Excel(name = "单位")
+ private String unitOfMeasure;
+
+
/** 排产数量 */
@Excel(name = "排产数量")
private BigDecimal quantity;
@@ -86,6 +110,14 @@ public class ProFeedback extends BaseEntity
@Excel(name = "报工时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date feedbackTime;
+ /** 录入人员 */
+ @Excel(name = "录入人员")
+ private String recordUser;
+
+ /** 状态 */
+ @Excel(name = "状态")
+ private String status;
+
/** 预留字段1 */
private String attr1;
@@ -288,35 +320,102 @@ public class ProFeedback extends BaseEntity
return attr4;
}
+ public String getFeedbackType() {
+ return feedbackType;
+ }
+
+ public void setFeedbackType(String feedbackType) {
+ this.feedbackType = feedbackType;
+ }
+
+ public Long getItemId() {
+ return itemId;
+ }
+
+ public void setItemId(Long itemId) {
+ this.itemId = itemId;
+ }
+
+ public String getItemCode() {
+ return itemCode;
+ }
+
+ public void setItemCode(String itemCode) {
+ this.itemCode = itemCode;
+ }
+
+ public String getItemName() {
+ return itemName;
+ }
+
+ public void setItemName(String itemName) {
+ this.itemName = itemName;
+ }
+
+ public String getSpecification() {
+ return specification;
+ }
+
+ public void setSpecification(String specification) {
+ this.specification = specification;
+ }
+
+ public String getUnitOfMeasure() {
+ return unitOfMeasure;
+ }
+
+ public void setUnitOfMeasure(String unitOfMeasure) {
+ this.unitOfMeasure = unitOfMeasure;
+ }
+
+ public String getRecordUser() {
+ return recordUser;
+ }
+
+ public void setRecordUser(String recordUser) {
+ this.recordUser = recordUser;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("recordId", getRecordId())
- .append("workstationId", getWorkstationId())
- .append("workstationCode", getWorkstationCode())
- .append("workstationName", getWorkstationName())
- .append("workorderId", getWorkorderId())
- .append("workorderCode", getWorkorderCode())
- .append("workorderName", getWorkorderName())
- .append("taskId", getTaskId())
- .append("taskCode", getTaskCode())
- .append("quantity", getQuantity())
- .append("quantityFeedback", getQuantityFeedback())
- .append("quantityQualified", getQuantityQualified())
- .append("quantityUnquanlified", getQuantityUnquanlified())
- .append("userName", getUserName())
- .append("nickName", getNickName())
- .append("feedbackChannel", getFeedbackChannel())
- .append("feedbackTime", getFeedbackTime())
- .append("remark", getRemark())
- .append("attr1", getAttr1())
- .append("attr2", getAttr2())
- .append("attr3", getAttr3())
- .append("attr4", getAttr4())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
+ return "ProFeedback{" +
+ "recordId=" + recordId +
+ ", feedbackType='" + feedbackType + '\'' +
+ ", workstationId=" + workstationId +
+ ", workstationCode='" + workstationCode + '\'' +
+ ", workstationName='" + workstationName + '\'' +
+ ", workorderId=" + workorderId +
+ ", workorderCode='" + workorderCode + '\'' +
+ ", workorderName='" + workorderName + '\'' +
+ ", taskId=" + taskId +
+ ", taskCode='" + taskCode + '\'' +
+ ", itemId=" + itemId +
+ ", itemCode='" + itemCode + '\'' +
+ ", itemName='" + itemName + '\'' +
+ ", specification='" + specification + '\'' +
+ ", unitOfMeasure='" + unitOfMeasure + '\'' +
+ ", quantity=" + quantity +
+ ", quantityFeedback=" + quantityFeedback +
+ ", quantityQualified=" + quantityQualified +
+ ", quantityUnquanlified=" + quantityUnquanlified +
+ ", userName='" + userName + '\'' +
+ ", nickName='" + nickName + '\'' +
+ ", feedbackChannel='" + feedbackChannel + '\'' +
+ ", feedbackTime=" + feedbackTime +
+ ", recordUser='" + recordUser + '\'' +
+ ", status='" + status + '\'' +
+ ", attr1='" + attr1 + '\'' +
+ ", attr2='" + attr2 + '\'' +
+ ", attr3=" + attr3 +
+ ", attr4=" + attr4 +
+ '}';
}
}
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
index ea39d27..16bff17 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
@@ -14,6 +14,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
@@ -22,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -34,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select record_id, workstation_id, workstation_code, workstation_name, workorder_id, workorder_code, workorder_name, task_id, task_code, quantity, quantity_feedback, quantity_qualified, quantity_unquanlified, user_name, nick_name, feedback_channel, feedback_time, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_feedback
+ select record_id, workstation_id, workstation_code, workstation_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,status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_feedback
@@ -75,6 +88,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
workorder_name,
task_id,
task_code,
+ item_id,
+ item_code,
+ item_name,
+ specification,
+ unit_of_measure,
quantity,
quantity_feedback,
quantity_qualified,
@@ -83,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
nick_name,
feedback_channel,
feedback_time,
+ record_user,
+ status,
remark,
attr1,
attr2,
@@ -102,6 +122,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{workorderName},
#{taskId},
#{taskCode},
+ #{itemId},
+ #{itemCode},
+ #{itemName},
+ #{specification},
+ #{unitOfMeasure},
#{quantity},
#{quantityFeedback},
#{quantityQualified},
@@ -110,6 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{nickName},
#{feedbackChannel},
#{feedbackTime},
+ #{recordUser},
+ #{status},
#{remark},
#{attr1},
#{attr2},
@@ -133,6 +160,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
workorder_name = #{workorderName},
task_id = #{taskId},
task_code = #{taskCode},
+ item_id = #{itemId},
+ item_code = #{itemCode},
+ item_name = #{itemName},
+ specification = #{specification},
+ unit_of_measure = #{unitOfMeasure},
quantity = #{quantity},
quantity_feedback = #{quantityFeedback},
quantity_qualified = #{quantityQualified},
@@ -141,6 +173,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
nick_name = #{nickName},
feedback_channel = #{feedbackChannel},
feedback_time = #{feedbackTime},
+ record_user = #{recordUser},
+ status = #{status},
remark = #{remark},
attr1 = #{attr1},
attr2 = #{attr2},