装箱单添加status字段

This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-10-11 00:33:17 +08:00
parent 87f20a6be8
commit b3aedfa29c
3 changed files with 52 additions and 37 deletions

View File

@ -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',

View File

@ -114,6 +114,9 @@ public class WmPackage extends BaseEntity
@Excel(name = "是否生效")
private String enableFlag;
/** 状态 */
private String status;
/** 预留字段1 */
private String attr1;
@ -342,6 +345,15 @@ public class WmPackage extends BaseEntity
{
return enableFlag;
}
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 +
'}';
}
}

View File

@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="weightUnit" column="weight_unit" />
<result property="inspector" column="inspector" />
<result property="inspectorName" column="inspector_name" />
<result property="status" column="status"></result>
<result property="enableFlag" column="enable_flag" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmPackageVo">
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
</sql>
<select id="selectWmPackageList" parameterType="WmPackage" resultMap="WmPackageResult">
@ -70,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inspector != null and inspector != ''"> and inspector = #{inspector}</if>
<if test="inspectorName != null and inspectorName != ''"> and inspector_name like concat('%', #{inspectorName}, '%')</if>
<if test="enableFlag != null and enableFlag != ''"> and enable_flag = #{enableFlag}</if>
<if test="status !=null and status !=''"> and status = #{status}</if>
</where>
</select>
@ -109,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inspector != null">inspector,</if>
<if test="inspectorName != null">inspector_name,</if>
<if test="enableFlag != null">enable_flag,</if>
<if test="status !=null">status,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inspector != null">#{inspector},</if>
<if test="inspectorName != null">#{inspectorName},</if>
<if test="enableFlag != null">#{enableFlag},</if>
<if test="status !=null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
@ -181,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inspector != null">inspector = #{inspector},</if>
<if test="inspectorName != null">inspector_name = #{inspectorName},</if>
<if test="enableFlag != null">enable_flag = #{enableFlag},</if>
<if test="status !=null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>