生料领料修改
This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu
parent
4f8d393539
commit
7a21a1ebdd
@ -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 '仓库名称',
|
||||
|
||||
@ -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 +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,6 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="workorderCode" column="workorder_code" />
|
||||
<result property="taskId" column="task_id" />
|
||||
<result property="taskCode" column="task_code" />
|
||||
<result property="clientId" column="client_id" />
|
||||
<result property="clientCode" column="client_code" />
|
||||
<result property="clientName" column="client_name" />
|
||||
<result property="clientNick" column="client_nick" />
|
||||
<result property="warehouseId" column="warehouse_id" />
|
||||
<result property="warehouseCode" column="warehouse_code" />
|
||||
<result property="warehouseName" column="warehouse_name" />
|
||||
@ -72,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectWmIssueHeaderVo">
|
||||
select issue_id, issue_code, issue_name, workstation_id, workstation_code,workstation_name, workorder_id, workorder_code, task_id, task_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, issue_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_header
|
||||
select issue_id, issue_code, issue_name, workstation_id, workstation_code,workstation_name, workorder_id, workorder_code, task_id, task_code, client_id, client_code, client_name, client_nick, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, issue_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_header
|
||||
</sql>
|
||||
|
||||
<select id="selectWmIssueHeaderList" parameterType="WmIssueHeader" resultMap="WmIssueHeaderResult">
|
||||
@ -87,6 +91,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
|
||||
<if test="taskId != null "> and task_id = #{taskId}</if>
|
||||
<if test="taskCode != null and taskCode != ''"> and task_code = #{taskCode}</if>
|
||||
<if test="clientId != null "> and client_id = #{clientId}</if>
|
||||
<if test="clientCode != null and clientCode != ''"> and client_code = #{clientCode}</if>
|
||||
<if test="clientName != null and clientName != ''"> and client_name like concat('%', #{clientName}, '%')</if>
|
||||
<if test="clientNick != null and clientNick != ''"> and client_nick = #{clientNick}</if>
|
||||
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
|
||||
<if test="warehouseCode != null and warehouseCode != ''"> and warehouse_code = #{warehouseCode}</if>
|
||||
<if test="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
|
||||
@ -135,6 +143,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="workorderCode != null">workorder_code,</if>
|
||||
<if test="taskId != null">task_id,</if>
|
||||
<if test="taskCode != null">task_code,</if>
|
||||
<if test="clientId != null">client_id,</if>
|
||||
<if test="clientCode != null">client_code,</if>
|
||||
<if test="clientName != null">client_name,</if>
|
||||
<if test="clientNick != null">client_nick,</if>
|
||||
<if test="warehouseId != null">warehouse_id,</if>
|
||||
<if test="warehouseCode != null">warehouse_code,</if>
|
||||
<if test="warehouseName != null">warehouse_name,</if>
|
||||
@ -166,6 +178,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="workorderCode != null">#{workorderCode},</if>
|
||||
<if test="taskId != null">#{taskId},</if>
|
||||
<if test="taskCode != null">#{taskCode},</if>
|
||||
<if test="clientId != null">#{clientId},</if>
|
||||
<if test="clientCode != null">#{clientCode},</if>
|
||||
<if test="clientName != null">#{clientName},</if>
|
||||
<if test="clientNick != null">#{clientNick},</if>
|
||||
<if test="warehouseId != null">#{warehouseId},</if>
|
||||
<if test="warehouseCode != null">#{warehouseCode},</if>
|
||||
<if test="warehouseName != null">#{warehouseName},</if>
|
||||
@ -201,6 +217,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="workorderCode != null">workorder_code = #{workorderCode},</if>
|
||||
<if test="taskId != null">task_id = #{taskId},</if>
|
||||
<if test="taskCode != null">task_code = #{taskCode},</if>
|
||||
<if test="clientId != null">client_id = #{clientId},</if>
|
||||
<if test="clientCode != null">client_code = #{clientCode},</if>
|
||||
<if test="clientName != null">client_name = #{clientName},</if>
|
||||
<if test="clientNick != null">client_nick = #{clientNick},</if>
|
||||
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
|
||||
<if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>
|
||||
<if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
|
||||
|
||||
@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="attr3 != null "> and attr3 = #{attr3}</if>
|
||||
<if test="attr4 != null "> and attr4 = #{attr4}</if>
|
||||
and quantity_onhand != 0
|
||||
order by create_time asc
|
||||
order by recpt_date asc
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user