From f88c07d7941a0c18bb097f20618c18b9d2418ccc Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 11 九月 2024 15:42:51 +0800
Subject: [PATCH] next node
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrProductionNodeMapper.java | 2 ++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java | 9 +++++++++
pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml | 6 ++++++
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 19 +++++++++++++++++--
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 3 +++
5 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrProductionNodeMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrProductionNodeMapper.java
index 92d49e0..3f45824 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrProductionNodeMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrProductionNodeMapper.java
@@ -23,6 +23,8 @@
PrProductionNode selectByPrimaryKey(Long id);
+ PrProductionNode selectNodeBySort(@Param("processId") Long processId , @Param("sort") Integer sort);
+
int updateByPrimaryKeySelective(PrProductionNode record);
List<PrProductionNode> selectByProcess(@Param("processId") Long processId);
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
index 38d20ca..2b182c8 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
@@ -62,6 +62,15 @@
*/
public String nodeContent;
/**
+ * 涓嬩竴涓妭鐐筰d
+ */
+ public Long nextNode;
+
+ /**
+ * 涓嬩竴涓妭鐐逛綔涓氬唴瀹�
+ */
+ public String nextNodeContent;
+ /**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
public String deviceCycleContent;
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml
index 05fdb15..cd93f4c 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml
@@ -38,6 +38,12 @@
from pr_production_node
where id = #{id,jdbcType=BIGINT}
</select>
+ <select id="selectNodeBySort" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from pr_production_node
+ where process_id = #{processId,jdbcType=BIGINT} and sort = #{sort,jdbcType=INTEGER}
+ </select>
<select id="selectNameByNodeId" parameterType="java.lang.Long" resultType="String">
select content from pr_production_node where id = #{id}
</select>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
index 1138d58..74a4b78 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -13,6 +13,8 @@
<result property="stationId" column="station_id" jdbcType="BIGINT"/>
<result property="currNode" column="curr_node" jdbcType="BIGINT"/>
<result property="nodeContent" column="node_content" jdbcType="VARCHAR"/>
+ <result property="nextNode" column="next_node" jdbcType="BIGINT"/>
+ <result property="nextNodeContent" column="next_node_content" jdbcType="VARCHAR"/>
<result property="deviceCycleContent" column="device_cycle_content" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="TINYINT"/>
@@ -69,14 +71,15 @@
insert into sta_device_last
( id,device_no,work_id
,repair_id,plan_id,station_id
- ,curr_node,node_content,device_cycle_content
+ ,curr_node,node_content,next_node,next_node_content,device_cycle_content
,status,result
,error_msg,assistants
,updated_by,in_time,out_time
,memo)
values (#{id,jdbcType=BIGINT},#{deviceNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
- ,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{deviceCycleContent,jdbcType=VARCHAR}
+ ,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{nextNode,jdbcType=BIGINT},#{nextNodeContent,jdbcType=VARCHAR}
+ ,#{deviceCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
,#{updatedBy,jdbcType=BIGINT},#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP}
@@ -94,6 +97,8 @@
<if test="stationId != null">station_id,</if>
<if test="currNode != null">curr_node,</if>
<if test="nodeContent != null and nodeContent !=''">node_content,</if>
+ <if test="nextNode != null">next_node,</if>
+ <if test="nextNodeContent != null and nextNodeContent !=''">next_node_content,</if>
<if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
@@ -115,6 +120,8 @@
<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
<if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
<if test="nodeContent != null and nodeContent !=''">#{nodeContent,jdbcType=VARCHAR},</if>
+ <if test="nextNode != null">#{nextNode,jdbcType=BIGINT},</if>
+ <if test="nextNodeContent != null and nextNodeContent !=''">#{nextNodeContent,jdbcType=VARCHAR},</if>
<if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
@@ -151,6 +158,12 @@
</if>
<if test="nodeContent != null and nodeContent !=''">
node_content = #{nodeContent,jdbcType=VARCHAR},
+ </if>
+ <if test="nextNode != null">
+ next_node = #{nextNode,jdbcType=BIGINT},
+ </if>
+ <if test="nextNodeContent != null and nextNodeContent !=''">
+ next_node_content = #{nextNodeContent,jdbcType=VARCHAR},
</if>
<if test="deviceCycleContent != null and deviceCycleContent !=''">
device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
@@ -198,6 +211,8 @@
station_id = #{stationId,jdbcType=BIGINT},
curr_node = #{currNode,jdbcType=BIGINT},
node_content = #{nodeContent,jdbcType=VARCHAR},
+ next_node = #{nextNode,jdbcType=BIGINT},
+ next_node_content = #{nextNodeContent,jdbcType=VARCHAR},
device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index 56e24e4..c9071ae 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -246,6 +246,9 @@
} else {
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
record.nodeContent = node.content;
+ PrProductionNode nextNode = nodeDao.selectNodeBySort(node.getProcessId() , (node.getSort() + 1));
+ record.nextNodeContent = nextNode.content;
+ record.nextNode = nextNode.id;
if (node.isRecord) {
record.deviceCycleContent = node.deviceCycleContent;
}
--
Gitblit v1.8.0