From eead3af59c94c35422463fbbd19d26dffcbacc06 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 05 七月 2024 09:35:28 +0800
Subject: [PATCH] edit work last
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 11 +
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 26 +++
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 341 +++++++++++++++++++++++++++---------------------
3 files changed, 221 insertions(+), 157 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index 1e78c77..7608e42 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import com.dy.pmsGlobal.pojoBa.BaUser;
-import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import jakarta.validation.constraints.NotNull;
import lombok.*;
@@ -58,6 +57,12 @@
@TableField(exist = false)
public String stationName;
+ @TableField(exist = false)
+ public String proName;
+
+ @TableField(exist = false)
+ public String devicePrefix;
+
/**
* 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
*/
@@ -89,8 +94,8 @@
public Integer nodeType;
- @TableField(exist = false)
- public PrAssemblyPlan plan;
+
+
/**
* 浠诲姟璁ら鏃堕棿
*/
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index 40a0fb3..c50c2d3 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -5,27 +5,35 @@
<mapper namespace="com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper">
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="userId" column="user_id" jdbcType="BIGINT"/>
- <result property="lineId" column="line_id" jdbcType="BIGINT"/>
- <result property="stationId" column="station_id" jdbcType="BIGINT"/>
- <result property="planId" column="plan_id" jdbcType="BIGINT"/>
- <result property="processId" column="process_id" jdbcType="BIGINT"/>
- <result property="nodeId" column="node_id" jdbcType="BIGINT"/>
- <result property="nodeType" column="node_type" jdbcType="TINYINT"/>
- <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
- <result property="status" column="status" jdbcType="TINYINT"/>
- <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
- <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
- <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
- <association property="userName" column="user_id" javaType="java.lang.Long"
- select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
- <association property="stationName" column="station_id" javaType="java.lang.Long"
- select="com.dy.pmsGlobal.daoPlt.PltStationMapper.selectNameByStationId" fetchType="eager" />
- <association property="lineName" column="line_id" javaType="java.lang.Long"
- select="com.dy.pmsGlobal.daoPlt.PltProductionLineMapper.selectNameByLineId" fetchType="eager" />
- <collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
- select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager" column="assistants" />
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="userId" column="user_id" jdbcType="BIGINT"/>
+ <result property="lineId" column="line_id" jdbcType="BIGINT"/>
+ <result property="stationId" column="station_id" jdbcType="BIGINT"/>
+ <result property="planId" column="plan_id" jdbcType="BIGINT"/>
+ <result property="processId" column="process_id" jdbcType="BIGINT"/>
+ <result property="nodeId" column="node_id" jdbcType="BIGINT"/>
+ <result property="nodeType" column="node_type" jdbcType="TINYINT"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="status" column="status" jdbcType="TINYINT"/>
+ <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
+ <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
+ <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
+ <association property="userName" column="user_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager"/>
+ <!-- <association property="stationName" column="station_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltStationMapper.selectNameByStationId" fetchType="eager"/>
+ <association property="planName" column="plan_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.selectNameByPlanId" fetchType="eager"/>
+ <association property="processName" column="process_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectProcessNameById" fetchType="eager"/>
+ <association property="nodeName" column="node_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPr.PrProductionNodeMapper.selectNameByNodeId" fetchType="eager"/>-->
+
+ <association property="lineName" column="line_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductionLineMapper.selectNameByLineId" fetchType="eager"/>
+ <collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager"
+ column="assistants"/>
</resultMap>
<resultMap id="SelectResultMap" type="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
@@ -49,40 +57,69 @@
<result property="nodeName" column="node_name" jdbcType="VARCHAR"/>
<result property="lineName" column="line_name" jdbcType="VARCHAR"/>
<collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
- select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager" column="assistants" />
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager"
+ column="assistants"/>
</resultMap>
<sql id="Base_Column_List">
- id,user_id,line_id,
+ id
+ ,user_id,line_id,
station_id,plan_id,process_id,
node_id,node_type,dt,status,
start_time,end_time,assistants
</sql>
<sql id="part_Column_List">
- ${alias}.id,
- ${alias}.user_id,
- ${alias}.line_id,
- ${alias}.station_id,
- ${alias}.plan_id,
- ${alias}.process_id,
- ${alias}.node_id,
- ${alias}.node_type,
- ${alias}.dt,
- ${alias}.status,
- ${alias}.start_time,
- ${alias}.end_time,
- ${alias}.assistants
+ ${alias}
+ .
+ id
+ ,
+ ${alias}
+ .
+ user_id,
+ ${alias}
+ .
+ line_id,
+ ${alias}
+ .
+ station_id,
+ ${alias}
+ .
+ plan_id,
+ ${alias}
+ .
+ process_id,
+ ${alias}
+ .
+ node_id,
+ ${alias}
+ .
+ node_type,
+ ${alias}
+ .
+ dt,
+ ${alias}
+ .
+ status,
+ ${alias}
+ .
+ start_time,
+ ${alias}
+ .
+ end_time,
+ ${alias}
+ .
+ assistants
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" />
+ <include refid="Base_Column_List"/>
from sta_assembly_work_last
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectByUserAndStation" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" />
+ <include refid="Base_Column_List"/>
from plt_station where status ==1
<trim prefix="and" suffixOverrides="and">
<if test="id != null and id !=''">
@@ -92,7 +129,7 @@
code = #{code,jdbcType=VARCHAR} and
</if>
<if test="name != null and name !=''">
- name like concat('%', #{name}, '%') and
+ name like concat('%', #{name}, '%') and
</if>
<if test="disabled != null and disabled !=''">
disabled = #{disabled,jdbcType=TINYINT} and
@@ -106,35 +143,35 @@
<select id="selectList" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" />
+ <include refid="Base_Column_List"/>
from sta_assembly_work_last
<where>
<if test="userId != null and userId !=''">
- and user_id = #{userId,jdbcType=BIGINT}
+ and user_id = #{userId,jdbcType=BIGINT}
</if>
<if test="lineId != null and lineId !=''">
- and line_id = #{lineId,jdbcType=BIGINT}
+ and line_id = #{lineId,jdbcType=BIGINT}
</if>
<if test="stationId != null and stationId !=''">
- and station_id = #{stationId,jdbcType=BIGINT}
+ and station_id = #{stationId,jdbcType=BIGINT}
</if>
<if test="planId != null and planId !=''">
- and plan_id = #{planId,jdbcType=BIGINT}
+ and plan_id = #{planId,jdbcType=BIGINT}
</if>
<if test="processId != null and processId !=''">
- and process_id = #{processId,jdbcType=BIGINT}
+ and process_id = #{processId,jdbcType=BIGINT}
</if>
<if test="nodeId != null and nodeId !=''">
- and node_id = #{nodeId,jdbcType=BIGINT}
+ and node_id = #{nodeId,jdbcType=BIGINT}
</if>
<if test="status != null and status !=''">
- and status = #{status,jdbcType=TINYINT}
+ and status = #{status,jdbcType=TINYINT}
</if>
<if test="startTime != null and startTime !=''">
and start_time = #{startTime,jdbcType=TIMESTAMP},
</if>
<if test="endTime != null and endTime !=''">
- and end_time = #{endTime,jdbcType=TIMESTAMP},
+ and end_time = #{endTime,jdbcType=TIMESTAMP},
</if>
<if test="assistants != null and assistants !=''">
and assistants = #{assistants,jdbcType=VARCHAR}
@@ -144,15 +181,16 @@
</select>
<select id="selectSome" resultMap="SelectResultMap">
select
- <include refid="part_Column_List" >
+ <include refid="part_Column_List">
<property name="alias" value="l"/>
- </include>,
- u.name as user_name,
- s.name as station_name,
- p.name as plan_name,
- pp.name as process_name,
- n.content as node_name,
- ll.name as line_name
+ </include>
+ ,
+ u.name as user_name,
+ s.name as station_name,
+ p.name as plan_name,
+ pp.name as process_name,
+ n.content as node_name,
+ ll.name as line_name
from sta_assembly_work_last l
left join ba_user u on l.user_id = u.id
left join plt_station s on l.station_id = s.id
@@ -168,7 +206,7 @@
and s.name like concat('%', #{stationName}, '%')
</if>
<if test="planName != null and planName != '' ">
- and p.name like concat('%', #{planName}, '%')
+ and p.name like concat('%', #{planName}, '%')
</if>
<if test="processName != null and processName != '' ">
and pp.name like concat('%', #{processName}, '%')
@@ -211,7 +249,7 @@
</if>
</where>
order by id desc
- <trim prefix="limit " >
+ <trim prefix="limit ">
<if test="start != null and count != null">
#{start}, #{count}
</if>
@@ -235,7 +273,7 @@
and s.name like concat('%', #{stationName}, '%')
</if>
<if test="planName != null and planName != '' ">
- and p.name like concat('%', #{planName}, '%')
+ and p.name like concat('%', #{planName}, '%')
</if>
<if test="processName != null and processName != '' ">
and pp.name like concat('%', #{processName}, '%')
@@ -280,112 +318,113 @@
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from sta_assembly_work_last
- where id = #{id,jdbcType=BIGINT}
+ delete
+ from sta_assembly_work_last
+ where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast"
+ useGeneratedKeys="true">
insert into sta_assembly_work_last
- ( id,user_id,line_id
- ,station_id,plan_id,process_id
- ,node_id,node_type,dt,status
- ,start_time,end_time,assistants
- )
- values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{lineId,jdbcType=BIGINT}
- ,#{stationId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{processId,jdbcType=BIGINT}
- ,#{nodeId,jdbcType=BIGINT},#{nodeType,jdbcType=TINYINT},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
- ,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
- )
+ ( id, user_id, line_id
+ , station_id, plan_id, process_id
+ , node_id, node_type, dt, status
+ , start_time, end_time, assistants)
+ values ( #{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{lineId,jdbcType=BIGINT}
+ , #{stationId,jdbcType=BIGINT}, #{planId,jdbcType=BIGINT}, #{processId,jdbcType=BIGINT}
+ , #{nodeId,jdbcType=BIGINT}, #{nodeType,jdbcType=TINYINT}, #{dt,jdbcType=TIMESTAMP}
+ , #{status,jdbcType=TINYINT}
+ , #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{assistants,jdbcType=VARCHAR})
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
+ <insert id="insertSelective" keyColumn="id" keyProperty="id"
+ parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
insert into sta_assembly_work_last
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="userId != null">user_id,</if>
- <if test="lineId != null">line_id,</if>
- <if test="stationId != null">station_id,</if>
- <if test="planId != null">plan_id,</if>
- <if test="processId != null">process_id,</if>
- <if test="nodeId != null">node_id,</if>
- <if test="nodeType != null">node_Type,</if>
- <if test="dt != null">dt,</if>
- <if test="status != null">status,</if>
- <if test="startTime != null">start_time,</if>
- <if test="endTime != null">end_time,</if>
- <if test="assistants != null">assistants,</if>
+ <if test="id != null">id,</if>
+ <if test="userId != null">user_id,</if>
+ <if test="lineId != null">line_id,</if>
+ <if test="stationId != null">station_id,</if>
+ <if test="planId != null">plan_id,</if>
+ <if test="processId != null">process_id,</if>
+ <if test="nodeId != null">node_id,</if>
+ <if test="nodeType != null">node_Type,</if>
+ <if test="dt != null">dt,</if>
+ <if test="status != null">status,</if>
+ <if test="startTime != null">start_time,</if>
+ <if test="endTime != null">end_time,</if>
+ <if test="assistants != null">assistants,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
- <if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
- <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
- <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
- <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
- <if test="nodeId != null">#{nodeId,jdbcType=BIGINT},</if>
- <if test="nodeType != null">#{nodeType,jdbcType=TINYINT},</if>
- <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
- <if test="status != null">#{status,jdbcType=TINYINT},</if>
- <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
- <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
- <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
+ <if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
+ <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
+ <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
+ <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
+ <if test="nodeId != null">#{nodeId,jdbcType=BIGINT},</if>
+ <if test="nodeType != null">#{nodeType,jdbcType=TINYINT},</if>
+ <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="status != null">#{status,jdbcType=TINYINT},</if>
+ <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
+ <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
+ <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
update sta_assembly_work_last
<set>
- <if test="userId != null">
- user_id = #{userId,jdbcType=BIGINT},
- </if>
- <if test="lineId != null">
- line_id = #{lineId,jdbcType=BIGINT},
- </if>
- <if test="stationId != null">
- station_id = #{stationId,jdbcType=BIGINT},
- </if>
- <if test="planId != null">
- plan_id = #{planId,jdbcType=BIGINT},
- </if>
- <if test="processId != null">
- process_id = #{processId,jdbcType=BIGINT},
- </if>
- <if test="nodeId != null">
- node_id = #{nodeId,jdbcType=BIGINT},
- </if>
- <if test="nodeType != null">
- node_type = #{nodeType,jdbcType=TINYINT},
- </if>
- <if test="dt != null">
- dt = #{dt,jdbcType=TIMESTAMP},
- </if>
- <if test="status != null">
- status = #{status,jdbcType=TINYINT},
- </if>
- <if test="startTime != null">
- start_time = #{startTime,jdbcType=TIMESTAMP},
- </if>
- <if test="endTime != null">
- end_time = #{endTime,jdbcType=TIMESTAMP},
- </if>
- <if test="assistants != null">
- assistants = #{assistants,jdbcType=VARCHAR},
- </if>
+ <if test="userId != null">
+ user_id = #{userId,jdbcType=BIGINT},
+ </if>
+ <if test="lineId != null">
+ line_id = #{lineId,jdbcType=BIGINT},
+ </if>
+ <if test="stationId != null">
+ station_id = #{stationId,jdbcType=BIGINT},
+ </if>
+ <if test="planId != null">
+ plan_id = #{planId,jdbcType=BIGINT},
+ </if>
+ <if test="processId != null">
+ process_id = #{processId,jdbcType=BIGINT},
+ </if>
+ <if test="nodeId != null">
+ node_id = #{nodeId,jdbcType=BIGINT},
+ </if>
+ <if test="nodeType != null">
+ node_type = #{nodeType,jdbcType=TINYINT},
+ </if>
+ <if test="dt != null">
+ dt = #{dt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="status != null">
+ status = #{status,jdbcType=TINYINT},
+ </if>
+ <if test="startTime != null">
+ start_time = #{startTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="endTime != null">
+ end_time = #{endTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="assistants != null">
+ assistants = #{assistants,jdbcType=VARCHAR},
+ </if>
</set>
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
update sta_assembly_work_last
- set
- user_id = #{userId,jdbcType=BIGINT},
- line_id = #{lineId,jdbcType=BIGINT},
- station_id = #{stationId,jdbcType=BIGINT},
- plan_id = #{planId,jdbcType=BIGINT},
- process_id = #{processId,jdbcType=BIGINT},
- node_id = #{nodeId,jdbcType=BIGINT},
- node_type = #{nodeType,jdbcType=TINYINT},
- dt = #{dt,jdbcType=TIMESTAMP},
- status = #{status,jdbcType=TINYINT},
- start_time = #{startTime,jdbcType=TIMESTAMP},
- end_time = #{endTime,jdbcType=TIMESTAMP},
- assistants = #{assistants,jdbcType=VARCHAR}
- where id = #{id,jdbcType=BIGINT}
+ set user_id = #{userId,jdbcType=BIGINT},
+ line_id = #{lineId,jdbcType=BIGINT},
+ station_id = #{stationId,jdbcType=BIGINT},
+ plan_id = #{planId,jdbcType=BIGINT},
+ process_id = #{processId,jdbcType=BIGINT},
+ node_id = #{nodeId,jdbcType=BIGINT},
+ node_type = #{nodeType,jdbcType=TINYINT},
+ dt = #{dt,jdbcType=TIMESTAMP},
+ status = #{status,jdbcType=TINYINT},
+ start_time = #{startTime,jdbcType=TIMESTAMP},
+ end_time = #{endTime,jdbcType=TIMESTAMP},
+ assistants = #{assistants,jdbcType=VARCHAR}
+ where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index b01da47..feabcb0 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -9,6 +9,7 @@
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkHistoryMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.pojoBa.BaUser;
+import com.dy.pmsGlobal.pojoPlt.PltProduct;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
@@ -146,7 +147,17 @@
//鐩存帴鍒犻櫎璁板綍
logout(workLasts.get(0).getId().toString());
} else {
- result.setPlan(assyPlan);
+ result.setPlanName(assyPlan.getName());
+ result.setProcessName(assyPlan.getProcessName());
+ result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
+ //鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
+ PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
+ if (product == null) {
+ throw new RuntimeException("浜у搧淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇风櫥褰曠鐞嗙郴缁熸煡鐪嬩换鍔″叧鑱斾骇鍝両D涓�:" + assyPlan.getProId());
+ }
+ result.setProName(product.getName());
+ String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
+ result.setDevicePrefix(devicePrefix);
}
}
result.setStationId(stationInfo.getId());
@@ -249,8 +260,17 @@
StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(staLast.getId());
List<PrProductionNode> nodeInfo = assyPlan.getProcess().getNodes().stream()
.filter(node -> node.id.equals(vo.getNodeId())).collect(Collectors.toList());
- assyPlan.getProcess().setNodes(nodeInfo);
- result.setPlan(assyPlan);
+ result.setPlanName(assyPlan.getName());
+ result.setProcessName(assyPlan.getProcessName());
+ result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
+ //鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
+ PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
+ if (product == null) {
+ throw new RuntimeException("浜у搧淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇风櫥褰曠鐞嗙郴缁熸煡鐪嬩换鍔″叧鑱斾骇鍝両D涓�:" + assyPlan.getProId());
+ }
+ result.setProName(product.getName());
+ String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
+ result.setDevicePrefix(devicePrefix);
return result;
}
--
Gitblit v1.8.0