From b3aedfa29c1fa6423e99914e243faebe0b2f1b0f Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Tue, 11 Oct 2022 00:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E5=8D=95=E6=B7=BB=E5=8A=A0st?=
=?UTF-8?q?atus=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/设计文档/数据库设计/mes-wm.sql | 1 +
.../java/com/ktg/mes/wm/domain/WmPackage.java | 80 ++++++++++---------
.../resources/mapper/wm/WmPackageMapper.xml | 8 +-
3 files changed, 52 insertions(+), 37 deletions(-)
diff --git a/doc/设计文档/数据库设计/mes-wm.sql b/doc/设计文档/数据库设计/mes-wm.sql
index 39ef654..3b93235 100644
--- a/doc/设计文档/数据库设计/mes-wm.sql
+++ b/doc/设计文档/数据库设计/mes-wm.sql
@@ -900,6 +900,7 @@ create table wm_package (
weight_unit varchar(64) comment '重量单位',
inspector varchar(64) comment '检查员用户名',
inspector_name varchar(64) comment '检查员名称',
+ status varchar(64) default 'PREPARE' comment '状态',
enable_flag char(1) default 'Y' comment '是否生效',
remark varchar(500) default '' comment '备注',
attr1 varchar(64) default null comment '预留字段1',
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackage.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackage.java
index cd53f39..d274053 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackage.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackage.java
@@ -114,6 +114,9 @@ public class WmPackage extends BaseEntity
@Excel(name = "是否生效")
private String enableFlag;
+ /** 状态 */
+ private String status;
+
/** 预留字段1 */
private String attr1;
@@ -342,7 +345,16 @@ public class WmPackage extends BaseEntity
{
return enableFlag;
}
- public void setAttr1(String attr1)
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public void setAttr1(String attr1)
{
this.attr1 = attr1;
}
@@ -381,40 +393,36 @@ public class WmPackage extends BaseEntity
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("packageId", getPackageId())
- .append("parentId", getParentId())
- .append("ancestors", getAncestors())
- .append("packageCode", getPackageCode())
- .append("barcodeId", getBarcodeId())
- .append("barcodeContent", getBarcodeContent())
- .append("barcodeUrl", getBarcodeUrl())
- .append("packageDate", getPackageDate())
- .append("soCode", getSoCode())
- .append("invoiceCode", getInvoiceCode())
- .append("clientId", getClientId())
- .append("clientCode", getClientCode())
- .append("clientName", getClientName())
- .append("clientNick", getClientNick())
- .append("packageLength", getPackageLength())
- .append("packageWidth", getPackageWidth())
- .append("packageHeight", getPackageHeight())
- .append("sizeUnit", getSizeUnit())
- .append("netWeight", getNetWeight())
- .append("crossWeight", getCrossWeight())
- .append("weightUnit", getWeightUnit())
- .append("inspector", getInspector())
- .append("inspectorName", getInspectorName())
- .append("enableFlag", getEnableFlag())
- .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 "WmPackage{" +
+ "packageId=" + packageId +
+ ", parentId=" + parentId +
+ ", ancestors='" + ancestors + '\'' +
+ ", packageCode='" + packageCode + '\'' +
+ ", barcodeId=" + barcodeId +
+ ", barcodeContent='" + barcodeContent + '\'' +
+ ", barcodeUrl='" + barcodeUrl + '\'' +
+ ", packageDate=" + packageDate +
+ ", soCode='" + soCode + '\'' +
+ ", invoiceCode='" + invoiceCode + '\'' +
+ ", clientId=" + clientId +
+ ", clientCode='" + clientCode + '\'' +
+ ", clientName='" + clientName + '\'' +
+ ", clientNick='" + clientNick + '\'' +
+ ", packageLength=" + packageLength +
+ ", packageWidth=" + packageWidth +
+ ", packageHeight=" + packageHeight +
+ ", sizeUnit='" + sizeUnit + '\'' +
+ ", netWeight=" + netWeight +
+ ", crossWeight=" + crossWeight +
+ ", weightUnit='" + weightUnit + '\'' +
+ ", inspector='" + inspector + '\'' +
+ ", inspectorName='" + inspectorName + '\'' +
+ ", enableFlag='" + enableFlag + '\'' +
+ ", status='" + status + '\'' +
+ ", attr1='" + attr1 + '\'' +
+ ", attr2='" + attr2 + '\'' +
+ ", attr3=" + attr3 +
+ ", attr4=" + attr4 +
+ '}';
}
}
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmPackageMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmPackageMapper.xml
index 3699309..d761e6f 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmPackageMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmPackageMapper.xml
@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select package_id, parent_id, ancestors, package_code, barcode_id, barcode_content, barcode_url, package_date, so_code, invoice_code, client_id, client_code, client_name, client_nick, package_length, package_width, package_height, size_unit, net_weight, cross_weight, weight_unit, inspector, inspector_name, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_package
+ select package_id, parent_id, ancestors, package_code, barcode_id, barcode_content, barcode_url, package_date, so_code, invoice_code, client_id, client_code, client_name, client_nick, package_length, package_width, package_height, size_unit, net_weight, cross_weight, weight_unit, inspector, inspector_name, enable_flag, status,remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_package
@@ -109,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
inspector,
inspector_name,
enable_flag,
+ status,
remark,
attr1,
attr2,
@@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{inspector},
#{inspectorName},
#{enableFlag},
+ #{status},
#{remark},
#{attr1},
#{attr2},
@@ -181,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
inspector = #{inspector},
inspector_name = #{inspectorName},
enable_flag = #{enableFlag},
+ status = #{status},
remark = #{remark},
attr1 = #{attr1},
attr2 = #{attr2},