Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工单字段更改(isEnd->endFlag)

Browse Source
highway
wws 1 year ago
parent ca123c873b
commit 0c792e7856
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

20
op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrderWorkorder.java
Unescape Escape View File

@ -121,7 +121,15 @@ public class ProOrderWorkorder extends TreeEntity {
/** 是否为底层节点 1是 0不是 */
@Excel(name = "是否为底层节点")
private Integer isEnd;
private Integer endFlag;
public Integer getEndFlag() {
return endFlag;
}
public void setEndFlag(Integer endFlag) {
this.endFlag = endFlag;
}
/** 班次名称（数据库无该字段，需自行查询） */
private String shiftDesc;
@ -211,14 +219,6 @@ public class ProOrderWorkorder extends TreeEntity {
this.shiftDesc = shiftDesc;
}
public Integer getIsEnd() {
return isEnd;
}
public void setIsEnd(Integer isEnd) {
this.isEnd = isEnd;
}
/** 批次号 */
private List<StringBuilder> batchCodeList;
@ -460,7 +460,7 @@ public class ProOrderWorkorder extends TreeEntity {
.append("prodType", getProdType())
.append("factoryCode", getFactoryCode())
.append("batchCodeList",getBatchCodeList())
.append("isEnd",getIsEnd())
.append("endFlag",getEndFlag())
.append("shiftDesc",getShiftDesc())
.append("bucketId",getBucketId())
.append("bucketCode",getBucketCode())

4
op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml
Unescape Escape View File

@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="prodType" column="prod_type" />
<result property="factoryCode" column="factory_code" />
<result property="isEnd" column="is_end" />
<result property="endFlag" column="end_flag" />
<result property="materialId" column="material_id"/>
</resultMap>
@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
quantity_produced, quantity_split, route_code, prod_line_code,
product_date, shift_id, parent_order, ancestors, status, remark, attr1,
attr2, attr3, attr4, create_by, create_time, update_by, update_time,
prod_type, factory_code , is_end from pro_order_workorder
prod_type, factory_code , eng_flag from pro_order_workorder
</select>
<!--&lt;!&ndash; 查询所有（物料）&ndash;&gt;-->

20
op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java
Unescape Escape View File

@ -111,7 +111,15 @@ public class ProOrderWorkorder extends TreeEntity {
private String prodType;
/** 是否为底层节点 1是 0不是 */
private Integer isEnd;
private Integer endFlag;
public Integer getEndFlag() {
return endFlag;
}
public void setEndFlag(Integer endFlag) {
this.endFlag = endFlag;
}
/** 班次名称（数据库无该字段，需自行查询） */
private String shiftDesc;
@ -211,14 +219,6 @@ public class ProOrderWorkorder extends TreeEntity {
this.shiftDesc = shiftDesc;
}
public Integer getIsEnd() {
return isEnd;
}
public void setIsEnd(Integer isEnd) {
this.isEnd = isEnd;
}
/** 批次号 */
private List<StringBuilder> batchCodeList;
@ -459,7 +459,7 @@ public class ProOrderWorkorder extends TreeEntity {
.append("prodType", getProdType())
.append("factoryCode", getFactoryCode())
.append("batchCodeList",getBatchCodeList())
.append("isEnd",getIsEnd())
.append("endFlag",getEndFlag())
.append("shiftDesc",getShiftDesc())
.append("bucketId",getBucketId())
.append("bucketCode",getBucketCode())

4
op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
Unescape Escape View File

@ -134,8 +134,8 @@ public class ProOrderServiceImpl implements IProOrderService {
// code自增
endCode++;
} else {
// 设置子节点is_end字段信息
workOrder.setIsEnd(1);
// 设置子节点end_flag字段信息
workOrder.setEndFlag(1);
// 更新数据库记录信息
proOrderWorkorderMapper.updateProOrderWorkorder(workOrder);
// 结束循环

14
op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
Unescape Escape View File

@ -35,14 +35,14 @@
<result property="updateTime" column="update_time" />
<result property="prodType" column="prod_type" />
<result property="factoryCode" column="factory_code" />
<result property="isEnd" column="is_end" />
<result property="endFlag" column="end_flag" />
</resultMap>
<sql id="selectProOrderWorkorderVo">
select workorder_id, workorder_code, workorder_name, order_id, order_code, product_id, product_code, product_name,
product_spc, unit, quantity_produced, quantity_split, route_code, prod_line_code, product_date,
shift_id, parent_order, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time,
update_by, update_time, prod_type, factory_code , is_end
update_by, update_time, prod_type, factory_code , end_flag
from pro_order_workorder
</sql>
@ -73,7 +73,7 @@
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
<if test="prodType != null and prodType != ''"> and prod_type = #{prodType}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="isEnd != null and isEnd != ''"> and is_end = #{isEnd}</if>
<if test="endFlag != null and endFlag != ''"> and end_flag = #{endFlag}</if>
<if test="productDateStart != null "> and CONVERT(varchar(10),product_date, 120) >= '${productDateStart}'</if>
<if test="productDateEnd != null "> and '${productDateEnd}%' >= CONVERT(varchar(10),product_date, 120)</if>
</where>
@ -133,7 +133,7 @@
select workorder_id, workorder_code, workorder_name, order_id, order_code, product_id, product_code, product_name,
product_spc, unit, quantity_produced, quantity_split, route_code, prod_line_code, product_date,
shift_id, parent_order, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time,
update_by, update_time, prod_type, factory_code , is_end
update_by, update_time, prod_type, factory_code , end_flag
from pro_order_workorder where workorder_id in
<foreach item="ids" collection="array" open="(" separator="," close=")">
#{ids}
@ -184,7 +184,7 @@
<if test="updateTime != null">update_time,</if>
<if test="prodType != null">prod_type,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="isEnd != null">is_end,</if>
<if test="endFlag != null">end_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workorderId != null">#{workorderId},</if>
@ -217,7 +217,7 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="prodType != null">#{prodType},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="isEnd != null">#{isEnd},</if>
<if test="endFlag != null">#{endFlag},</if>
</trim>
</insert>
<insert id="createPrepare">
@ -363,7 +363,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="prodType != null">prod_type = #{prodType},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="isEnd != null">is_end = #{isEnd},</if>
<if test="endFlag != null">end_flag = #{endFlag},</if>
</trim>
where workorder_id = #{workorderId}
</update>

Write Preview
Loading…
Cancel
Save