外协工单
This commit is contained in:
parent
d987d92183
commit
d750b4f255
@ -6,6 +6,7 @@ create table pro_workorder (
|
|||||||
workorder_id bigint(20) not null auto_increment comment '工单ID',
|
workorder_id bigint(20) not null auto_increment comment '工单ID',
|
||||||
workorder_code varchar(64) not null comment '工单编码',
|
workorder_code varchar(64) not null comment '工单编码',
|
||||||
workorder_name varchar(255) not null comment '工单名称',
|
workorder_name varchar(255) not null comment '工单名称',
|
||||||
|
workorder_type varchar(64) default 'SELF' comment '工单类型',
|
||||||
order_source varchar(64) not null comment '来源类型',
|
order_source varchar(64) not null comment '来源类型',
|
||||||
source_code varchar(64) comment '来源单据',
|
source_code varchar(64) comment '来源单据',
|
||||||
product_id bigint(20) not null comment '产品ID',
|
product_id bigint(20) not null comment '产品ID',
|
||||||
@ -20,6 +21,9 @@ create table pro_workorder (
|
|||||||
client_id bigint(20) comment '客户ID',
|
client_id bigint(20) comment '客户ID',
|
||||||
client_code varchar(64) comment '客户编码',
|
client_code varchar(64) comment '客户编码',
|
||||||
client_name varchar(255) 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 '批次号',
|
batch_code varchar(64) comment '批次号',
|
||||||
request_date datetime not null comment '需求日期',
|
request_date datetime not null comment '需求日期',
|
||||||
parent_id bigint(20) default 0 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 '更新时间',
|
update_time datetime comment '更新时间',
|
||||||
primary key (record_id)
|
primary key (record_id)
|
||||||
) engine=innodb auto_increment=200 comment = '停机记录记录';
|
) engine=innodb auto_increment=200 comment = '停机记录记录';
|
||||||
|
|
||||||
|
|
||||||
|
Binary file not shown.
@ -29,6 +29,10 @@ public class ProWorkorder extends TreeEntity
|
|||||||
@Excel(name = "工单名称")
|
@Excel(name = "工单名称")
|
||||||
private String workorderName;
|
private String workorderName;
|
||||||
|
|
||||||
|
/** 工单类型 */
|
||||||
|
@Excel(name = "工单类型")
|
||||||
|
private String workorderType;
|
||||||
|
|
||||||
/** 来源类型 */
|
/** 来源类型 */
|
||||||
@Excel(name = "来源类型")
|
@Excel(name = "来源类型")
|
||||||
private String orderSource;
|
private String orderSource;
|
||||||
@ -89,6 +93,19 @@ public class ProWorkorder extends TreeEntity
|
|||||||
@Excel(name = "客户名称")
|
@Excel(name = "客户名称")
|
||||||
private String clientName;
|
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")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@Excel(name = "需求日期", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "需求日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
@ -142,7 +159,16 @@ public class ProWorkorder extends TreeEntity
|
|||||||
{
|
{
|
||||||
return workorderName;
|
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;
|
this.orderSource = orderSource;
|
||||||
}
|
}
|
||||||
@ -268,7 +294,32 @@ public class ProWorkorder extends TreeEntity
|
|||||||
{
|
{
|
||||||
return clientName;
|
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;
|
this.requestDate = requestDate;
|
||||||
}
|
}
|
||||||
@ -345,6 +396,7 @@ public class ProWorkorder extends TreeEntity
|
|||||||
"workorderId=" + workorderId +
|
"workorderId=" + workorderId +
|
||||||
", workorderCode='" + workorderCode + '\'' +
|
", workorderCode='" + workorderCode + '\'' +
|
||||||
", workorderName='" + workorderName + '\'' +
|
", workorderName='" + workorderName + '\'' +
|
||||||
|
", workorderType='" + workorderType + '\'' +
|
||||||
", orderSource='" + orderSource + '\'' +
|
", orderSource='" + orderSource + '\'' +
|
||||||
", sourceCode='" + sourceCode + '\'' +
|
", sourceCode='" + sourceCode + '\'' +
|
||||||
", productId=" + productId +
|
", productId=" + productId +
|
||||||
@ -360,6 +412,9 @@ public class ProWorkorder extends TreeEntity
|
|||||||
", clientId=" + clientId +
|
", clientId=" + clientId +
|
||||||
", clientCode='" + clientCode + '\'' +
|
", clientCode='" + clientCode + '\'' +
|
||||||
", clientName='" + clientName + '\'' +
|
", clientName='" + clientName + '\'' +
|
||||||
|
", vendorId=" + vendorId +
|
||||||
|
", vendorCode='" + vendorCode + '\'' +
|
||||||
|
", vendorName='" + vendorName + '\'' +
|
||||||
", requestDate=" + requestDate +
|
", requestDate=" + requestDate +
|
||||||
", finishDate=" + finishDate +
|
", finishDate=" + finishDate +
|
||||||
", status='" + status + '\'' +
|
", status='" + status + '\'' +
|
||||||
|
@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="workorderId" column="workorder_id" />
|
<result property="workorderId" column="workorder_id" />
|
||||||
<result property="workorderCode" column="workorder_code" />
|
<result property="workorderCode" column="workorder_code" />
|
||||||
<result property="workorderName" column="workorder_name" />
|
<result property="workorderName" column="workorder_name" />
|
||||||
|
<result property="workorderType" column="workorder_type" />
|
||||||
<result property="orderSource" column="order_source" />
|
<result property="orderSource" column="order_source" />
|
||||||
<result property="sourceCode" column="source_code" />
|
<result property="sourceCode" column="source_code" />
|
||||||
<result property="productId" column="product_id" />
|
<result property="productId" column="product_id" />
|
||||||
@ -23,6 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="clientId" column="client_id" />
|
<result property="clientId" column="client_id" />
|
||||||
<result property="clientCode" column="client_code" />
|
<result property="clientCode" column="client_code" />
|
||||||
<result property="clientName" column="client_name" />
|
<result property="clientName" column="client_name" />
|
||||||
|
<result property="vendorId" column="vendor_id"/>
|
||||||
|
<result property="vendorCode" column="vendor_code"/>
|
||||||
|
<result property="vendorName" column="vendor_name"/>
|
||||||
<result property="requestDate" column="request_date" />
|
<result property="requestDate" column="request_date" />
|
||||||
<result property="parentId" column="parent_id" />
|
<result property="parentId" column="parent_id" />
|
||||||
<result property="ancestors" column="ancestors" />
|
<result property="ancestors" column="ancestors" />
|
||||||
@ -40,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectProWorkorderVo">
|
<sql id="selectProWorkorderVo">
|
||||||
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
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectProWorkorderList" parameterType="ProWorkorder" resultMap="ProWorkorderResult">
|
<select id="selectProWorkorderList" parameterType="ProWorkorder" resultMap="ProWorkorderResult">
|
||||||
@ -48,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<where>
|
<where>
|
||||||
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
|
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
|
||||||
<if test="workorderName != null and workorderName != ''"> and workorder_name like concat('%', #{workorderName}, '%')</if>
|
<if test="workorderName != null and workorderName != ''"> and workorder_name like concat('%', #{workorderName}, '%')</if>
|
||||||
|
<if test="workorderType != null and workorderType !=''"> and workorder_type = #{workorderType}</if>
|
||||||
<if test="orderSource != null and orderSource != ''"> and order_source = #{orderSource}</if>
|
<if test="orderSource != null and orderSource != ''"> and order_source = #{orderSource}</if>
|
||||||
<if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode}</if>
|
<if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode}</if>
|
||||||
<if test="productId != null "> and product_id = #{productId}</if>
|
<if test="productId != null "> and product_id = #{productId}</if>
|
||||||
@ -63,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="clientId != null "> and client_id = #{clientId}</if>
|
<if test="clientId != null "> and client_id = #{clientId}</if>
|
||||||
<if test="clientCode != null and clientCode != ''"> and client_code = #{clientCode}</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="clientName != null and clientName != ''"> and client_name like concat('%', #{clientName}, '%')</if>
|
||||||
|
<if test="vendorId != null"> and vendor_id = #{vendorId}</if>
|
||||||
|
<if test="vendorCode != null and vendorCode !=''"> and vendor_code = #{vendorCode}</if>
|
||||||
|
<if test="vendorName != null and vendorName !=''"> and vendor_name like concat('%',#{vendorName},'%')</if>
|
||||||
<if test="requestDate != null "> and request_date = #{requestDate}</if>
|
<if test="requestDate != null "> and request_date = #{requestDate}</if>
|
||||||
<if test="finishDate != null "> and finish_date = #{finishDate}</if>
|
<if test="finishDate != null "> and finish_date = #{finishDate}</if>
|
||||||
<if test="parentId != null "> and parent_id = #{parentId}</if>
|
<if test="parentId != null "> and parent_id = #{parentId}</if>
|
||||||
@ -87,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="workorderCode != null and workorderCode != ''">workorder_code,</if>
|
<if test="workorderCode != null and workorderCode != ''">workorder_code,</if>
|
||||||
<if test="workorderName != null and workorderName != ''">workorder_name,</if>
|
<if test="workorderName != null and workorderName != ''">workorder_name,</if>
|
||||||
|
<if test="workorderType != null and workorderType != ''">workorder_type,</if>
|
||||||
<if test="orderSource != null and orderSource != ''">order_source,</if>
|
<if test="orderSource != null and orderSource != ''">order_source,</if>
|
||||||
<if test="sourceCode != null">source_code,</if>
|
<if test="sourceCode != null">source_code,</if>
|
||||||
<if test="productId != null">product_id,</if>
|
<if test="productId != null">product_id,</if>
|
||||||
@ -102,6 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="clientId != null">client_id,</if>
|
<if test="clientId != null">client_id,</if>
|
||||||
<if test="clientCode != null">client_code,</if>
|
<if test="clientCode != null">client_code,</if>
|
||||||
<if test="clientName != null">client_name,</if>
|
<if test="clientName != null">client_name,</if>
|
||||||
|
<if test="vendorId !=null">vendor_id,</if>
|
||||||
|
<if test="vendorCode !=null">vendor_code,</if>
|
||||||
|
<if test="vendorName !=null">vendor_name,</if>
|
||||||
<if test="requestDate != null">request_date,</if>
|
<if test="requestDate != null">request_date,</if>
|
||||||
<if test="finishDate != null">finish_date,</if>
|
<if test="finishDate != null">finish_date,</if>
|
||||||
<if test="parentId != null">parent_id,</if>
|
<if test="parentId != null">parent_id,</if>
|
||||||
@ -120,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="workorderCode != null and workorderCode != ''">#{workorderCode},</if>
|
<if test="workorderCode != null and workorderCode != ''">#{workorderCode},</if>
|
||||||
<if test="workorderName != null and workorderName != ''">#{workorderName},</if>
|
<if test="workorderName != null and workorderName != ''">#{workorderName},</if>
|
||||||
|
<if test="workorderType != null and workorderType != ''">#{workorderType},</if>
|
||||||
<if test="orderSource != null and orderSource != ''">#{orderSource},</if>
|
<if test="orderSource != null and orderSource != ''">#{orderSource},</if>
|
||||||
<if test="sourceCode != null">#{sourceCode},</if>
|
<if test="sourceCode != null">#{sourceCode},</if>
|
||||||
<if test="productId != null">#{productId},</if>
|
<if test="productId != null">#{productId},</if>
|
||||||
@ -135,6 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="clientId != null">#{clientId},</if>
|
<if test="clientId != null">#{clientId},</if>
|
||||||
<if test="clientCode != null">#{clientCode},</if>
|
<if test="clientCode != null">#{clientCode},</if>
|
||||||
<if test="clientName != null">#{clientName},</if>
|
<if test="clientName != null">#{clientName},</if>
|
||||||
|
<if test="vendorId !=null">#{vendorId},</if>
|
||||||
|
<if test="vendorCode !=null">#{vendorCode},</if>
|
||||||
|
<if test="vendorName !=null">#{vendorName},</if>
|
||||||
<if test="requestDate != null">#{requestDate},</if>
|
<if test="requestDate != null">#{requestDate},</if>
|
||||||
<if test="finishDate != null">#{finishDate},</if>
|
<if test="finishDate != null">#{finishDate},</if>
|
||||||
<if test="parentId != null">#{parentId},</if>
|
<if test="parentId != null">#{parentId},</if>
|
||||||
@ -157,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<trim prefix="SET" suffixOverrides=",">
|
<trim prefix="SET" suffixOverrides=",">
|
||||||
<if test="workorderCode != null and workorderCode != ''">workorder_code = #{workorderCode},</if>
|
<if test="workorderCode != null and workorderCode != ''">workorder_code = #{workorderCode},</if>
|
||||||
<if test="workorderName != null and workorderName != ''">workorder_name = #{workorderName},</if>
|
<if test="workorderName != null and workorderName != ''">workorder_name = #{workorderName},</if>
|
||||||
|
<if test="workorderType != null and workorderType != ''">workorder_type = #{workorderType},</if>
|
||||||
<if test="orderSource != null and orderSource != ''">order_source = #{orderSource},</if>
|
<if test="orderSource != null and orderSource != ''">order_source = #{orderSource},</if>
|
||||||
<if test="sourceCode != null">source_code = #{sourceCode},</if>
|
<if test="sourceCode != null">source_code = #{sourceCode},</if>
|
||||||
<if test="productId != null">product_id = #{productId},</if>
|
<if test="productId != null">product_id = #{productId},</if>
|
||||||
@ -172,6 +189,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="clientId != null">client_id = #{clientId},</if>
|
<if test="clientId != null">client_id = #{clientId},</if>
|
||||||
<if test="clientCode != null">client_code = #{clientCode},</if>
|
<if test="clientCode != null">client_code = #{clientCode},</if>
|
||||||
<if test="clientName != null">client_name = #{clientName},</if>
|
<if test="clientName != null">client_name = #{clientName},</if>
|
||||||
|
<if test="vendorId !=null">vendor_id = #{vendorId},</if>
|
||||||
|
<if test="vendorCode !=null">vendor_code = #{vendorCode},</if>
|
||||||
|
<if test="vendorName !=null">vendor_name = #{vendorName},</if>
|
||||||
<if test="requestDate != null">request_date = #{requestDate},</if>
|
<if test="requestDate != null">request_date = #{requestDate},</if>
|
||||||
<if test="finishDate != null">finish_date = #{finishDate},</if>
|
<if test="finishDate != null">finish_date = #{finishDate},</if>
|
||||||
<if test="parentId != null">parent_id = #{parentId},</if>
|
<if test="parentId != null">parent_id = #{parentId},</if>
|
||||||
|
Loading…
Reference in New Issue
Block a user