diff --git a/doc/设计文档/数据库设计/mes-pro.sql b/doc/设计文档/数据库设计/mes-pro.sql
index 2940f32..bf7e31b 100644
--- a/doc/设计文档/数据库设计/mes-pro.sql
+++ b/doc/设计文档/数据库设计/mes-pro.sql
@@ -6,6 +6,7 @@ create table pro_workorder (
workorder_id bigint(20) not null auto_increment comment '工单ID',
workorder_code varchar(64) not null comment '工单编码',
workorder_name varchar(255) not null comment '工单名称',
+ workorder_type varchar(64) default 'SELF' comment '工单类型',
order_source varchar(64) not null comment '来源类型',
source_code varchar(64) comment '来源单据',
product_id bigint(20) not null comment '产品ID',
@@ -20,6 +21,9 @@ create table pro_workorder (
client_id bigint(20) comment '客户ID',
client_code varchar(64) comment '客户编码',
client_name varchar(255) comment '客户名称',
+ vendor_id bigint(20) comment '供应商ID',
+ vendor_code varchar(64) comment '供应商编号',
+ vendor_name varchar(255) comment '供应商名称',
batch_code varchar(64) comment '批次号',
request_date datetime not null comment '需求日期',
parent_id bigint(20) default 0 not null comment '父工单',
@@ -564,3 +568,5 @@ create table pro_shutdown_record (
update_time datetime comment '更新时间',
primary key (record_id)
) engine=innodb auto_increment=200 comment = '停机记录记录';
+
+
diff --git a/doc/设计文档/数据库设计/数据库设计.xlsx b/doc/设计文档/数据库设计/数据库设计.xlsx
index 213aefc..2f5fa56 100644
Binary files a/doc/设计文档/数据库设计/数据库设计.xlsx and b/doc/设计文档/数据库设计/数据库设计.xlsx differ
diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java
index badb2f6..d27cf89 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java
@@ -29,6 +29,10 @@ public class ProWorkorder extends TreeEntity
@Excel(name = "工单名称")
private String workorderName;
+ /** 工单类型 */
+ @Excel(name = "工单类型")
+ private String workorderType;
+
/** 来源类型 */
@Excel(name = "来源类型")
private String orderSource;
@@ -89,6 +93,19 @@ public class ProWorkorder extends TreeEntity
@Excel(name = "客户名称")
private String clientName;
+ /** 供应商ID */
+ @Excel(name = "供应商ID")
+ private Long vendorId;
+
+ /** 供应商编号 */
+ @Excel(name = "供应商编号")
+ private String vendorCode;
+
+ /** 供应商名称 */
+ @Excel(name = "供应商名称")
+ private String vendorName;
+
+
/** 需求日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "需求日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -142,7 +159,16 @@ public class ProWorkorder extends TreeEntity
{
return workorderName;
}
- public void setOrderSource(String orderSource)
+
+ public String getWorkorderType() {
+ return workorderType;
+ }
+
+ public void setWorkorderType(String workorderType) {
+ this.workorderType = workorderType;
+ }
+
+ public void setOrderSource(String orderSource)
{
this.orderSource = orderSource;
}
@@ -268,7 +294,32 @@ public class ProWorkorder extends TreeEntity
{
return clientName;
}
- public void setRequestDate(Date requestDate)
+
+ public Long getVendorId() {
+ return vendorId;
+ }
+
+ public void setVendorId(Long vendorId) {
+ this.vendorId = vendorId;
+ }
+
+ public String getVendorCode() {
+ return vendorCode;
+ }
+
+ public void setVendorCode(String vendorCode) {
+ this.vendorCode = vendorCode;
+ }
+
+ public String getVendorName() {
+ return vendorName;
+ }
+
+ public void setVendorName(String vendorName) {
+ this.vendorName = vendorName;
+ }
+
+ public void setRequestDate(Date requestDate)
{
this.requestDate = requestDate;
}
@@ -345,6 +396,7 @@ public class ProWorkorder extends TreeEntity
"workorderId=" + workorderId +
", workorderCode='" + workorderCode + '\'' +
", workorderName='" + workorderName + '\'' +
+ ", workorderType='" + workorderType + '\'' +
", orderSource='" + orderSource + '\'' +
", sourceCode='" + sourceCode + '\'' +
", productId=" + productId +
@@ -360,6 +412,9 @@ public class ProWorkorder extends TreeEntity
", clientId=" + clientId +
", clientCode='" + clientCode + '\'' +
", clientName='" + clientName + '\'' +
+ ", vendorId=" + vendorId +
+ ", vendorCode='" + vendorCode + '\'' +
+ ", vendorName='" + vendorName + '\'' +
", requestDate=" + requestDate +
", finishDate=" + finishDate +
", status='" + status + '\'' +
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
index 5d8dcd1..c6405e5 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -23,6 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
@@ -40,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select workorder_id, workorder_code, workorder_name, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure,batch_code, quantity,quantity_produced, client_id, client_code, client_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
+ select workorder_id, workorder_code, workorder_name, workorder_type, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure,batch_code, quantity,quantity_produced, client_id, client_code, client_name, vendor_id, vendor_code, vendor_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder