From 7a21a1ebdd562ed51f9cab6a697d247674feafba Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Tue, 15 Nov 2022 22:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=96=99=E9=A2=86=E6=96=99=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/设计文档/数据库设计/mes-wm.sql | 4 +
.../com/ktg/mes/wm/domain/WmIssueHeader.java | 114 +++++++++++++-----
.../mapper/wm/WmIssueHeaderMapper.xml | 22 +++-
.../mapper/wm/WmMaterialStockMapper.xml | 2 +-
4 files changed, 107 insertions(+), 35 deletions(-)
diff --git a/doc/设计文档/数据库设计/mes-wm.sql b/doc/设计文档/数据库设计/mes-wm.sql
index a6466fe..6d62e8f 100644
--- a/doc/设计文档/数据库设计/mes-wm.sql
+++ b/doc/设计文档/数据库设计/mes-wm.sql
@@ -333,6 +333,10 @@ create table wm_issue_header (
workorder_code varchar(64) comment '生产工单编码',
task_id bigint(20) comment '生产任务ID',
task_code varchar(64) comment '生产任务编码',
+ client_id bigint(20) comment '客户ID',
+ client_code varchar(64) comment '客户编码',
+ client_name varchar(255) comment '客户名称',
+ client_nick varchar(255) comment '客户简称',
warehouse_id bigint(20) comment '仓库ID',
warehouse_code varchar(64) comment '仓库编码',
warehouse_name varchar(255) comment '仓库名称',
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java
index 329b0b0..7e93fdb 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java
@@ -54,6 +54,22 @@ public class WmIssueHeader extends BaseEntity
@Excel(name = "生产任务编码")
private String taskCode;
+ /** 客户ID */
+ @Excel(name = "客户ID")
+ private Long clientId;
+
+ /** 客户编码 */
+ @Excel(name = "客户编码")
+ private String clientCode;
+
+ /** 客户名称 */
+ @Excel(name = "客户名称")
+ private String clientName;
+
+ /** 客户简称 */
+ @Excel(name = "客户简称")
+ private String clientNick;
+
/** 仓库ID */
@Excel(name = "仓库ID")
private Long warehouseId;
@@ -200,7 +216,40 @@ public class WmIssueHeader extends BaseEntity
{
return taskCode;
}
- public void setWarehouseId(Long warehouseId)
+
+ public Long getClientId() {
+ return clientId;
+ }
+
+ public void setClientId(Long clientId) {
+ this.clientId = clientId;
+ }
+
+ public String getClientCode() {
+ return clientCode;
+ }
+
+ public void setClientCode(String clientCode) {
+ this.clientCode = clientCode;
+ }
+
+ public String getClientName() {
+ return clientName;
+ }
+
+ public void setClientName(String clientName) {
+ this.clientName = clientName;
+ }
+
+ public String getClientNick() {
+ return clientNick;
+ }
+
+ public void setClientNick(String clientNick) {
+ this.clientNick = clientNick;
+ }
+
+ public void setWarehouseId(Long warehouseId)
{
this.warehouseId = warehouseId;
}
@@ -338,37 +387,36 @@ public class WmIssueHeader extends BaseEntity
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("issueId", getIssueId())
- .append("issueCode", getIssueCode())
- .append("issueName", getIssueName())
- .append("workstationId", getWorkstationId())
- .append("workstationCode", getWorkstationCode())
- .append("workstationName", getWorkstationName())
- .append("workorderId", getWorkorderId())
- .append("workorderCode", getWorkorderCode())
- .append("taskId", getTaskId())
- .append("taskCode", getTaskCode())
- .append("warehouseId", getWarehouseId())
- .append("warehouseCode", getWarehouseCode())
- .append("warehouseName", getWarehouseName())
- .append("locationId", getLocationId())
- .append("locationCode", getLocationCode())
- .append("locationName", getLocationName())
- .append("areaId", getAreaId())
- .append("areaCode", getAreaCode())
- .append("areaName", getAreaName())
- .append("issueDate", getIssueDate())
- .append("status", getStatus())
- .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 "WmIssueHeader{" +
+ "issueId=" + issueId +
+ ", issueCode='" + issueCode + '\'' +
+ ", issueName='" + issueName + '\'' +
+ ", workstationId=" + workstationId +
+ ", workstationCode='" + workstationCode + '\'' +
+ ", workstationName='" + workstationName + '\'' +
+ ", workorderId=" + workorderId +
+ ", workorderCode='" + workorderCode + '\'' +
+ ", taskId=" + taskId +
+ ", taskCode='" + taskCode + '\'' +
+ ", clientId=" + clientId +
+ ", clientCode='" + clientCode + '\'' +
+ ", clientName='" + clientName + '\'' +
+ ", clientNick='" + clientNick + '\'' +
+ ", warehouseId=" + warehouseId +
+ ", warehouseCode='" + warehouseCode + '\'' +
+ ", warehouseName='" + warehouseName + '\'' +
+ ", locationId=" + locationId +
+ ", locationCode='" + locationCode + '\'' +
+ ", locationName='" + locationName + '\'' +
+ ", areaId=" + areaId +
+ ", areaCode='" + areaCode + '\'' +
+ ", areaName='" + areaName + '\'' +
+ ", issueDate=" + issueDate +
+ ", status='" + status + '\'' +
+ ", attr1='" + attr1 + '\'' +
+ ", attr2='" + attr2 + '\'' +
+ ", attr3=" + attr3 +
+ ", attr4=" + attr4 +
+ '}';
}
}
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml
index 7ba44b1..bf2abd0 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml
@@ -15,6 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
@@ -72,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"