工艺路线配置时添加关键工序选型

This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-10-09 15:46:28 +08:00
parent e9e6402524
commit c17501d4da
7 changed files with 66 additions and 26 deletions

View File

@ -154,6 +154,7 @@ create table pro_route_process (
default_pre_time int(11) default 0 comment '准备时间', default_pre_time int(11) default 0 comment '准备时间',
default_suf_time int(11) default 0 comment '等待时间', default_suf_time int(11) default 0 comment '等待时间',
color_code char(7) default '#00AEF3' comment '甘特图显示颜色', color_code char(7) default '#00AEF3' comment '甘特图显示颜色',
update_flag varchar(64) default 'N' comment '更新工单',
remark varchar(500) default '' comment '备注', remark varchar(500) default '' comment '备注',
attr1 varchar(64) default null comment '预留字段1', attr1 varchar(64) default null comment '预留字段1',
attr2 varchar(255) default null comment '预留字段2', attr2 varchar(255) default null comment '预留字段2',

View File

@ -120,6 +120,9 @@ public class ProRouteProcessController extends BaseController
if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkProcessExists(proRouteProcess))){ if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkProcessExists(proRouteProcess))){
return AjaxResult.error("不能重复添加工序!"); return AjaxResult.error("不能重复添加工序!");
} }
if(UserConstants.NOT_UNIQUE.equals(proRouteProcessService.checkUpdateFlagUnique(proRouteProcess))){
return AjaxResult.error("当前工艺路线已经指定过关键工序");
}
ProProcess process = proProcessService.selectProProcessByProcessId(proRouteProcess.getProcessId()); ProProcess process = proProcessService.selectProProcessByProcessId(proRouteProcess.getProcessId());
proRouteProcess.setProcessCode(process.getProcessCode()); proRouteProcess.setProcessCode(process.getProcessCode());
proRouteProcess.setProcessName(process.getProcessName()); proRouteProcess.setProcessName(process.getProcessName());

View File

@ -66,6 +66,9 @@ public class ProRouteProcess extends BaseEntity
@Excel(name = "甘特图显示颜色") @Excel(name = "甘特图显示颜色")
private String colorCode; private String colorCode;
/** 是否更新生产工单进度 */
private String updateFlag;
/** 预留字段1 */ /** 预留字段1 */
private String attr1; private String attr1;
@ -195,6 +198,7 @@ public class ProRouteProcess extends BaseEntity
{ {
return colorCode; return colorCode;
} }
public void setAttr1(String attr1) public void setAttr1(String attr1)
{ {
this.attr1 = attr1; this.attr1 = attr1;
@ -209,7 +213,15 @@ public class ProRouteProcess extends BaseEntity
this.attr2 = attr2; this.attr2 = attr2;
} }
public String getAttr2() public String getUpdateFlag() {
return updateFlag;
}
public void setUpdateFlag(String updateFlag) {
this.updateFlag = updateFlag;
}
public String getAttr2()
{ {
return attr2; return attr2;
} }
@ -234,29 +246,25 @@ public class ProRouteProcess extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return "ProRouteProcess{" +
.append("recordId", getRecordId()) "recordId=" + recordId +
.append("routeId", getRouteId()) ", routeId=" + routeId +
.append("processId", getProcessId()) ", processId=" + processId +
.append("processCode", getProcessCode()) ", processCode='" + processCode + '\'' +
.append("processName", getProcessName()) ", processName='" + processName + '\'' +
.append("orderNum", getOrderNum()) ", orderNum=" + orderNum +
.append("nextProcessId", getNextProcessId()) ", nextProcessId=" + nextProcessId +
.append("nextProcessCode", getNextProcessCode()) ", nextProcessCode='" + nextProcessCode + '\'' +
.append("nextProcessName", getNextProcessName()) ", nextProcessName='" + nextProcessName + '\'' +
.append("linkType", getLinkType()) ", linkType='" + linkType + '\'' +
.append("defaultPreTime", getDefaultPreTime()) ", defaultPreTime=" + defaultPreTime +
.append("defaultSufTime", getDefaultSufTime()) ", defaultSufTime=" + defaultSufTime +
.append("colorCode", getColorCode()) ", colorCode='" + colorCode + '\'' +
.append("remark", getRemark()) ", updateFlag='" + updateFlag + '\'' +
.append("attr1", getAttr1()) ", attr1='" + attr1 + '\'' +
.append("attr2", getAttr2()) ", attr2='" + attr2 + '\'' +
.append("attr3", getAttr3()) ", attr3=" + attr3 +
.append("attr4", getAttr4()) ", attr4=" + attr4 +
.append("createBy", getCreateBy()) '}';
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
} }
} }

View File

@ -30,6 +30,7 @@ public interface ProRouteProcessMapper
public ProRouteProcess checkOrderNumExists(ProRouteProcess proRouteProcess); public ProRouteProcess checkOrderNumExists(ProRouteProcess proRouteProcess);
public ProRouteProcess checkProcessExists(ProRouteProcess proRouteProcess); public ProRouteProcess checkProcessExists(ProRouteProcess proRouteProcess);
public ProRouteProcess checkUpdateFlagUnique(ProRouteProcess proRouteProcess);
public ProRouteProcess findPreProcess(ProRouteProcess proRouteProcess); public ProRouteProcess findPreProcess(ProRouteProcess proRouteProcess);

View File

@ -41,6 +41,13 @@ public interface IProRouteProcessService
*/ */
public String checkProcessExists(ProRouteProcess proRouteProcess); public String checkProcessExists(ProRouteProcess proRouteProcess);
/**
* 检查当前工艺路线中是否已经有某个工序配置了update_flag=Y
* @param proRouteProcess
* @return
*/
public String checkUpdateFlagUnique(ProRouteProcess proRouteProcess);
/** /**
* 查找上一个工序 * 查找上一个工序
* @param proRouteProcess * @param proRouteProcess

View File

@ -67,6 +67,16 @@ public class ProRouteProcessServiceImpl implements IProRouteProcessService
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
} }
@Override
public String checkUpdateFlagUnique(ProRouteProcess proRouteProcess) {
ProRouteProcess process = proRouteProcessMapper.checkUpdateFlagUnique(proRouteProcess);
Long recordId = proRouteProcess.getRecordId()==null?-1L:proRouteProcess.getRecordId();
if(StringUtils.isNotNull(process) && process.getRecordId().longValue() != recordId.longValue()){
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
@Override @Override
public ProRouteProcess findPreProcess(ProRouteProcess proRouteProcess) { public ProRouteProcess findPreProcess(ProRouteProcess proRouteProcess) {
return proRouteProcessMapper.findPreProcess(proRouteProcess); return proRouteProcessMapper.findPreProcess(proRouteProcess);

View File

@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="defaultPreTime" column="default_pre_time" /> <result property="defaultPreTime" column="default_pre_time" />
<result property="defaultSufTime" column="default_suf_time" /> <result property="defaultSufTime" column="default_suf_time" />
<result property="colorCode" column="color_code" /> <result property="colorCode" column="color_code" />
<result property="updateFlag" column="update_flag" ></result>
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="attr1" column="attr1" /> <result property="attr1" column="attr1" />
<result property="attr2" column="attr2" /> <result property="attr2" column="attr2" />
@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectProRouteProcessVo"> <sql id="selectProRouteProcessVo">
select record_id, route_id, process_id, process_code, process_name, order_num, next_process_id, next_process_code, next_process_name, link_type, default_pre_time, default_suf_time, color_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_process select record_id, route_id, process_id, process_code, process_name, order_num, next_process_id, next_process_code, next_process_name, link_type, default_pre_time, default_suf_time, color_code,update_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_process
</sql> </sql>
@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="defaultPreTime != null "> and default_pre_time = #{defaultPreTime}</if> <if test="defaultPreTime != null "> and default_pre_time = #{defaultPreTime}</if>
<if test="defaultSufTime != null "> and default_suf_time = #{defaultSufTime}</if> <if test="defaultSufTime != null "> and default_suf_time = #{defaultSufTime}</if>
<if test="colorCode != null and colorCode != ''"> and color_code = #{colorCode}</if> <if test="colorCode != null and colorCode != ''"> and color_code = #{colorCode}</if>
<if test="updateFlag !=null and updateFlag !=''"> and update_flag = #{updateFlag}</if>
</where> </where>
order by order_num asc order by order_num asc
</select> </select>
@ -68,6 +70,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where route_id = #{routeId} and process_id = #{processId} limit 1 where route_id = #{routeId} and process_id = #{processId} limit 1
</select> </select>
<select id="checkUpdateFlagUnique" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult">
<include refid="selectProRouteProcessVo"/>
where route_id = #{routeId} and update_flag = 'Y' limit 1
</select>
<select id="findPreProcess" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult"> <select id="findPreProcess" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult">
<include refid="selectProRouteProcessVo"/> <include refid="selectProRouteProcessVo"/>
where route_id = #{routeId} where route_id = #{routeId}
@ -115,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="defaultPreTime != null">default_pre_time,</if> <if test="defaultPreTime != null">default_pre_time,</if>
<if test="defaultSufTime != null">default_suf_time,</if> <if test="defaultSufTime != null">default_suf_time,</if>
<if test="colorCode != null">color_code,</if> <if test="colorCode != null">color_code,</if>
<if test="updateFlag !=null">update_flag,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if> <if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if> <if test="attr2 != null">attr2,</if>
@ -138,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="defaultPreTime != null">#{defaultPreTime},</if> <if test="defaultPreTime != null">#{defaultPreTime},</if>
<if test="defaultSufTime != null">#{defaultSufTime},</if> <if test="defaultSufTime != null">#{defaultSufTime},</if>
<if test="colorCode != null">#{colorCode},</if> <if test="colorCode != null">#{colorCode},</if>
<if test="updateFlag !=null">#{updateFlag},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if> <if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if> <if test="attr2 != null">#{attr2},</if>
@ -164,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="linkType != null">link_type = #{linkType},</if> <if test="linkType != null">link_type = #{linkType},</if>
<if test="defaultPreTime != null">default_pre_time = #{defaultPreTime},</if> <if test="defaultPreTime != null">default_pre_time = #{defaultPreTime},</if>
<if test="defaultSufTime != null">default_suf_time = #{defaultSufTime},</if> <if test="defaultSufTime != null">default_suf_time = #{defaultSufTime},</if>
<if test="updateFlag !=null">update_flag = #{updateFlag},</if>
<if test="colorCode != null">color_code = #{colorCode},</if> <if test="colorCode != null">color_code = #{colorCode},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if> <if test="attr1 != null">attr1 = #{attr1},</if>