From 9000814f7ceba006c7d36c51d06666ba6dfddf6c Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 09 七月 2024 11:33:08 +0800
Subject: [PATCH] change equip to device
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java | 4
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java | 2
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java | 5 -
pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java | 6
pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml | 22 ++--
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java | 12 +++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java | 2
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java | 4
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 40 +++++-----
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java | 2
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml | 40 +++++-----
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java | 4
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 46 +++++------
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 11 +-
14 files changed, 102 insertions(+), 98 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java
index c9539da..1a5ae15 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java
@@ -26,5 +26,5 @@
int updateByPrimaryKey(StaDeviceLife record);
- List<StaDeviceLife> selectByEquipNo(String deviceNo);
+ List<StaDeviceLife> selectByDeviceNo(String deviceNo);
}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java
index 9631ca3..c997bc0 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java
@@ -22,7 +22,7 @@
StaDeviceProductionLog selectByPrimaryKey(Long id);
- List<StaDeviceProductionLog> selectByEquipNo(String equipNo);
+ List<StaDeviceProductionLog> selectByDeviceNo(String deviceNo);
int updateByPrimaryKeySelective(StaDeviceProductionLog record);
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java
index cb50d78..7e6c48f 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java
@@ -26,5 +26,5 @@
int updateByPrimaryKey(StaRepairInfo record);
- List<StaRepairInfo> selectByEquipNo(String equipNo);
+ List<StaRepairInfo> selectByDeviceNo(String equipNo);
}
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 ccf0308..7103427 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
@@ -31,7 +31,7 @@
* 璁惧鐮�
*/
@NotBlank(message="璁惧鐮佷笉鑳戒负绌�")
- public String equipNo;
+ public String deviceNo;
/**
* 鐢熶骇鐧诲綍id
*/
@@ -64,7 +64,7 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
/**
* 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
index d0a23e4..2df3032 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
@@ -31,7 +31,7 @@
* 璁惧鐮�
*/
@NotBlank(message="璁惧鐮佷笉鑳戒负绌�")
- public String equipNo;
+ public String deviceNo;
/**
* 鐢熶骇鐧诲綍id
*/
@@ -64,7 +64,7 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
/**
* 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
index db96c8e..c29613d 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
@@ -31,7 +31,7 @@
* 璁惧鐮�
*/
@NotBlank(message="璁惧鐮佷笉鑳戒负绌�")
- public String equipNo;
+ public String deviceNo;
/**
* 鐢熶骇鐧诲綍id
*/
@@ -64,7 +64,7 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
/**
* 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java
index e69c07c..c1432d7 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java
@@ -4,10 +4,7 @@
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
-import jakarta.validation.constraints.NotNull;
import lombok.*;
-
-
import java.util.Date;
@@ -28,7 +25,7 @@
/**
* 璁惧鐮�
*/
- public String equipNo;
+ public String deviceNo;
/**
* 鐢熶骇鐧诲綍id
*/
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 66f08c4..8386033 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -6,14 +6,14 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
<id property="id" column="id" jdbcType="BIGINT"/>
- <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
+ <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
<result property="workId" column="work_id" jdbcType="BIGINT"/>
<result property="repairId" column="repair_id" jdbcType="BIGINT"/>
<result property="planId" column="plan_id" jdbcType="BIGINT"/>
<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="equipCycleContent" column="equip_cycle_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"/>
<result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
@@ -32,15 +32,15 @@
</resultMap>
<sql id="Base_Column_List">
- id,equip_no,work_id,
+ id,device_no,work_id,
repair_id,plan_id,station_id,
- curr_node,node_content,equip_cycle_content,
+ curr_node,node_content,device_cycle_content,
status,result,
error_msg,assistants,
updated_by,in_time,out_time,
memo
</sql>
- <select id="selectByEquipNo" parameterType="java.lang.String" resultMap="joinResultMap">
+ <select id="selectByDeviceNo" parameterType="java.lang.String" resultMap="joinResultMap">
select
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
@@ -48,7 +48,7 @@
left join pr_assembly_plan p on t.plan_id=p.id
left join plt_station s on s.id = t.station_id
left JOIN ba_user u on u.id=t.updated_by
- where t.equip_no = #{equipNo,jdbcType=VARCHAR}
+ where t.device_no = #{deviceNo,jdbcType=VARCHAR}
ORDER BY t.id DESC
</select>
@@ -58,12 +58,6 @@
from sta_device_last
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectByDeviceNo" resultType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
- select
- <include refid="Base_Column_List" />
- from sta_device_last
- where equip_no = #{equipNo,jdbcType=VARCHAR}
- </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from sta_device_last
@@ -71,16 +65,16 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
insert into sta_device_last
- ( id,equip_no,work_id
+ ( id,device_no,work_id
,repair_id,plan_id,station_id
- ,curr_node,node_content,equip_cycle_content
+ ,curr_node,node_content,device_cycle_content
,status,result
,error_msg,assistants
,updated_by,in_time,out_time
,memo)
- values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
+ 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},#{equipCycleContent,jdbcType=VARCHAR}
+ ,#{currNode,jdbcType=BIGINT},#{nodeContent,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}
@@ -90,14 +84,14 @@
insert into sta_device_last
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="equipNo != null">equip_no,</if>
+ <if test="deviceNo != null">device_no,</if>
<if test="workId != null">work_id,</if>
<if test="repairId != null">repair_id,</if>
<if test="planId != null">plan_id,</if>
<if test="stationId != null">station_id,</if>
<if test="currNode != null">curr_node,</if>
<if test="nodeContent != null">node_content,</if>
- <if test="equipCycleContent != null">equip_cycle_content,</if>
+ <if test="deviceCycleContent != null">device_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
<if test="errorMsg != null">error_msg,</if>
@@ -109,14 +103,14 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
+ <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
<if test="workId != null">#{workId,jdbcType=BIGINT},</if>
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
<if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
<if test="nodeContent != null">#{nodeContent,jdbcType=VARCHAR},</if>
- <if test="equipCycleContent != null">#{equipCycleContent,jdbcType=VARCHAR},</if>
+ <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
<if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
@@ -130,8 +124,8 @@
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
update sta_device_last
<set>
- <if test="equipNo != null">
- equip_no = #{equipNo,jdbcType=VARCHAR},
+ <if test="deviceNo != null">
+ device_no = #{deviceNo,jdbcType=VARCHAR},
</if>
<if test="workId != null">
work_id = #{workId,jdbcType=BIGINT},
@@ -151,8 +145,8 @@
<if test="nodeContent != null">
node_content = #{nodeContent,jdbcType=VARCHAR},
</if>
- <if test="equipCycleContent != null">
- equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
+ <if test="deviceCycleContent != null">
+ device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
@@ -184,14 +178,14 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
update sta_device_last
set
- equip_no = #{equipNo,jdbcType=VARCHAR},
+ device_no = #{deviceNo,jdbcType=VARCHAR},
work_id = #{workId,jdbcType=BIGINT},
repair_id = #{repairId,jdbcType=BIGINT},
plan_id = #{planId,jdbcType=BIGINT},
station_id = #{stationId,jdbcType=BIGINT},
curr_node = #{currNode,jdbcType=BIGINT},
node_content = #{nodeContent,jdbcType=VARCHAR},
- equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
+ device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
error_msg = #{errorMsg,jdbcType=VARCHAR},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
index fb8527f..ae4ac03 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
@@ -6,14 +6,14 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
<id property="id" column="id" jdbcType="BIGINT"/>
- <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
+ <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
<result property="workId" column="work_id" jdbcType="BIGINT"/>
<result property="repairId" column="repair_id" jdbcType="BIGINT"/>
<result property="planId" column="plan_id" jdbcType="BIGINT"/>
<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="equipCycleContent" column="equip_cycle_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"/>
<result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
@@ -32,9 +32,9 @@
</resultMap>
<sql id="Base_Column_List">
- id,equip_no,work_id,
+ id,device_no,work_id,
repair_id,plan_id,station_id,
- curr_node,node_content,equip_cycle_content,
+ curr_node,node_content,device_cycle_content,
status,result,
error_msg,assistants,in_time,
out_time,updated_by,memo
@@ -47,7 +47,7 @@
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectByEquipNo" parameterType="java.lang.String" resultMap="joinResultMap">
+ <select id="selectByDeviceNo" parameterType="java.lang.String" resultMap="joinResultMap">
select
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
@@ -55,7 +55,7 @@
left join pr_assembly_plan p on t.plan_id=p.id
left join plt_station s on s.id = t.station_id
left JOIN ba_user u on u.id=t.updated_by
- where t.equip_no = #{equipNo,jdbcType=VARCHAR}
+ where t.device_no = #{deviceNo,jdbcType=VARCHAR}
ORDER BY t.id DESC
</select>
@@ -66,16 +66,16 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
insert into sta_device_life
- ( id,equip_no,work_id
+ ( id,device_no,work_id
,repair_id,plan_id,station_id
- ,curr_node,node_content,equip_cycle_content
+ ,curr_node,node_content,device_cycle_content
,status,result
,error_msg,assistants,in_time
,out_time,updated_by,memo
)
- values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
+ 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},#{equipCycleContent,jdbcType=VARCHAR}
+ ,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{deviceCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}
@@ -85,14 +85,14 @@
insert into sta_device_life
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="equipNo != null">equip_no,</if>
+ <if test="deviceNo != null">device_no,</if>
<if test="workId != null">work_id,</if>
<if test="repairId != null">repair_id,</if>
<if test="planId != null">plan_id,</if>
<if test="stationId != null">station_id,</if>
<if test="currNode != null">curr_node,</if>
<if test="nodeContent != null">node_content,</if>
- <if test="equipCycleContent != null">equip_cycle_content,</if>
+ <if test="deviceCycleContent != null">device_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
<if test="errorMsg != null">error_msg,</if>
@@ -104,14 +104,14 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
+ <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
<if test="workId != null">#{workId,jdbcType=BIGINT},</if>
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
<if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
<if test="nodeContent != null">#{nodeContent,jdbcType=VARCHAR},</if>
- <if test="equipCycleContent != null">#{equipCycleContent,jdbcType=VARCHAR},</if>
+ <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
<if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
@@ -125,8 +125,8 @@
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
update sta_device_life
<set>
- <if test="equipNo != null">
- equip_no = #{equipNo,jdbcType=VARCHAR},
+ <if test="deviceNo != null">
+ device_no = #{deviceNo,jdbcType=VARCHAR},
</if>
<if test="workId != null">
work_id = #{workId,jdbcType=BIGINT},
@@ -146,8 +146,8 @@
<if test="nodeContent != null">
node_content = #{nodeContent,jdbcType=VARCHAR},
</if>
- <if test="equipCycleContent != null">
- equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
+ <if test="deviceCycleContent != null">
+ device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
@@ -179,14 +179,14 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
update sta_device_life
set
- equip_no = #{equipNo,jdbcType=VARCHAR},
+ device_no = #{deviceNo,jdbcType=VARCHAR},
work_id = #{workId,jdbcType=BIGINT},
repair_id = #{repairId,jdbcType=BIGINT},
plan_id = #{planId,jdbcType=BIGINT},
station_id = #{stationId,jdbcType=BIGINT},
curr_node = #{currNode,jdbcType=BIGINT},
node_content = #{nodeContent,jdbcType=VARCHAR},
- equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
+ device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
error_msg = #{errorMsg,jdbcType=VARCHAR},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
index df99ea3..fafb322 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -6,14 +6,14 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
<id property="id" column="id" jdbcType="BIGINT"/>
- <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
+ <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
<result property="workId" column="work_id" jdbcType="BIGINT"/>
<result property="repairId" column="repair_id" jdbcType="BIGINT"/>
<result property="planId" column="plan_id" jdbcType="BIGINT"/>
<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="equipCycleContent" column="equip_cycle_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"/>
<result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
@@ -32,9 +32,9 @@
</resultMap>
<sql id="Base_Column_List">
- id,equip_no,work_id,
+ id,device_no,work_id,
repair_id,plan_id,station_id,
- curr_node,node_content,equip_cycle_content,
+ curr_node,node_content,device_cycle_content,
status,result,
error_msg,assistants,in_time,
out_time,updated_by,memo
@@ -47,7 +47,7 @@
from sta_device_production_log
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectByEquipNo" parameterType="java.lang.String" resultMap="joinResultMap">
+ <select id="selectByDeviceNo" parameterType="java.lang.String" resultMap="joinResultMap">
select
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
@@ -55,7 +55,7 @@
left join pr_assembly_plan p on t.plan_id=p.id
left join plt_station s on s.id = t.station_id
left JOIN ba_user u on u.id=t.updated_by
- where t.equip_no = #{equipNo,jdbcType=VARCHAR}
+ where t.device_no = #{deviceNo,jdbcType=VARCHAR}
ORDER BY t.id DESC
</select>
@@ -65,16 +65,16 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
insert into sta_device_production_log
- ( id,equip_no,work_id
+ ( id,device_no,work_id
,repair_id,plan_id,station_id
- ,curr_node,node_content,equip_cycle_content
+ ,curr_node,node_content,device_cycle_content
,status,result
,error_msg,assistants,in_time
,out_time,updated_by,memo
)
- values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
+ 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},#{equipCycleContent,jdbcType=VARCHAR}
+ ,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{deviceCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}
@@ -84,14 +84,14 @@
insert into sta_device_production_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="equipNo != null">equip_no,</if>
+ <if test="deviceNo != null">device_no,</if>
<if test="workId != null">work_id,</if>
<if test="repairId != null">repair_id,</if>
<if test="planId != null">plan_id,</if>
<if test="stationId != null">station_id,</if>
<if test="currNode != null">curr_node,</if>
<if test="nodeContent != null">node_content,</if>
- <if test="equipCycleContent != null">equip_cycle_content,</if>
+ <if test="deviceCycleContent != null">device_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
<if test="errorMsg != null">error_msg,</if>
@@ -103,14 +103,14 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
+ <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
<if test="workId != null">#{workId,jdbcType=BIGINT},</if>
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
<if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
<if test="nodeContent != null">#{nodeContent,jdbcType=VARCHAR},</if>
- <if test="equipCycleContent != null">#{equipCycleContent,jdbcType=VARCHAR},</if>
+ <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
<if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
@@ -124,8 +124,8 @@
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
update sta_device_production_log
<set>
- <if test="equipNo != null">
- equip_no = #{equipNo,jdbcType=VARCHAR},
+ <if test="deviceNo != null">
+ device_no = #{deviceNo,jdbcType=VARCHAR},
</if>
<if test="workId != null">
work_id = #{workId,jdbcType=BIGINT},
@@ -145,8 +145,8 @@
<if test="nodeContent != null">
node_content = #{nodeContent,jdbcType=VARCHAR},
</if>
- <if test="equipCycleContent != null">
- equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
+ <if test="deviceCycleContent != null">
+ device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
@@ -178,14 +178,14 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
update sta_device_production_log
set
- equip_no = #{equipNo,jdbcType=VARCHAR},
+ device_no = #{deviceNo,jdbcType=VARCHAR},
work_id = #{workId,jdbcType=BIGINT},
repair_id = #{repairId,jdbcType=BIGINT},
plan_id = #{planId,jdbcType=BIGINT},
station_id = #{stationId,jdbcType=BIGINT},
curr_node = #{currNode,jdbcType=BIGINT},
node_content = #{nodeContent,jdbcType=VARCHAR},
- equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
+ device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
error_msg = #{errorMsg,jdbcType=VARCHAR},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
index 0f4ff2d..9483fc7 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
<id property="id" column="id" jdbcType="BIGINT"/>
- <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
+ <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
<result property="workId" column="work_id" jdbcType="BIGINT"/>
<result property="fromNode" column="from_node" jdbcType="BIGINT"/>
<result property="repairReason" column="repair_reason" jdbcType="VARCHAR"/>
@@ -15,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
- id,equip_no,work_id,
+ id,device_no,work_id,
from_node,repair_reason,repair_by,
repair_time
</sql>
@@ -26,11 +26,11 @@
from sta_repair_info
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectByEquipNo" resultMap="BaseResultMap">
+ <select id="selectByDeviceNo" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from sta_repair_info
- where equip_no = #{equipNo,jdbcType=VARCHAR}
+ where device_no = #{deviceNo,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from sta_repair_info
@@ -38,10 +38,10 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo" useGeneratedKeys="true">
insert into sta_repair_info
- ( id,equip_no,work_id
+ ( id,device_no,work_id
,from_node,repair_reason,repair_by
,repair_time)
- values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
+ values (#{id,jdbcType=BIGINT},#{deviceNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{fromNode,jdbcType=BIGINT},#{repairReason,jdbcType=VARCHAR},#{repairBy,jdbcType=BIGINT}
,#{repairTime,jdbcType=TIMESTAMP})
</insert>
@@ -49,7 +49,7 @@
insert into sta_repair_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="equipNo != null">equip_no,</if>
+ <if test="deviceNo != null">device_no,</if>
<if test="workId != null">work_id,</if>
<if test="fromNode != null">from_node,</if>
<if test="repairReason != null">repair_reason,</if>
@@ -58,7 +58,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
+ <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
<if test="workId != null">#{workId,jdbcType=BIGINT},</if>
<if test="fromNode != null">#{fromNode,jdbcType=BIGINT},</if>
<if test="repairReason != null">#{repairReason,jdbcType=VARCHAR},</if>
@@ -69,8 +69,8 @@
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
update sta_repair_info
<set>
- <if test="equipNo != null">
- equip_no = #{equipNo,jdbcType=VARCHAR},
+ <if test="deviceNo != null">
+ device_no = #{deviceNo,jdbcType=VARCHAR},
</if>
<if test="workId != null">
work_id = #{workId,jdbcType=BIGINT},
@@ -93,7 +93,7 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
update sta_repair_info
set
- equip_no = #{equipNo,jdbcType=VARCHAR},
+ device_no = #{deviceNo,jdbcType=VARCHAR},
work_id = #{workId,jdbcType=BIGINT},
from_node = #{fromNode,jdbcType=BIGINT},
repair_reason = #{repairReason,jdbcType=VARCHAR},
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
index fa39ad9..ca1a2ac 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
@@ -23,6 +23,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -104,6 +106,16 @@
if(process == null || !process.proId.equals(plan.proId)){
throw new RuntimeException("浜у搧涓庣敓浜ф祦绋嬩笉鍖归厤");
}
+ //Fancy add 2024/07/09 濡傛灉鐘舵�佷负鎵ц ,鍒欑粨鏉熸棩鏈熷繀椤诲ぇ浜庣瓑浜庡綋鍓嶆棩鏈�
+ if(plan.status == PlanStatusEnum.NORMAL.getCode()){
+ String endDateStr = plan.getEndDate();
+ LocalDate endDate = LocalDate.parse(endDateStr, DateTimeFormatter.ISO_LOCAL_DATE);
+ LocalDate nextDay = endDate.plusDays(1);
+ LocalDate today = LocalDate.now(); // 鑾峰彇褰撳墠鏃ユ湡
+ if (nextDay.isBefore(today)) {
+ throw new RuntimeException("鎵ц鐘舵�佺粨鏉熸棩鏈熷繀椤诲ぇ浜庣瓑浜庡綋鍓嶆棩鏈�");
+ }
+ }
PrAssemblyPlan origPlan = assemblyDao.selectByPrimaryKey(plan.id);
PrBatchNumber batch = batchDao.selectByPrimaryKey(origPlan.batchId);
//浜у搧鏀瑰彉鍒欐洿鏂板叏閮ㄥ凡鐢熸垚璁惧鍙�
diff --git a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java
index 91fcdc9..177494d 100644
--- a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java
+++ b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java
@@ -56,13 +56,13 @@
Map<String, Object> deviceInfo =new HashMap<>();
deviceInfo.put("deviceInfo", deviceLast);
//鏌ヨ璁惧鏃ュ織
- List<StaDeviceProductionLog> log = deviceProductionLogDao.selectByEquipNo(deviceNo);
+ List<StaDeviceProductionLog> log = deviceProductionLogDao.selectByDeviceNo(deviceNo);
deviceInfo.put("deviceLog", log);
// 鏌ヨ璁惧鐢熷懡鍛ㄦ湡
- List<StaDeviceLife> deviceLife = deviceLifeDao.selectByEquipNo(deviceNo);
+ List<StaDeviceLife> deviceLife = deviceLifeDao.selectByDeviceNo(deviceNo);
deviceInfo.put("deviceLife", deviceLife);
// 鏌ヨ璁惧缁翠慨淇℃伅
- List<StaRepairInfo> repairInfo = repairInfoDao.selectByEquipNo(deviceNo);
+ List<StaRepairInfo> repairInfo = repairInfoDao.selectByDeviceNo(deviceNo);
deviceInfo.put("deviceRepair", repairInfo);
// 鏌ヨ璁惧闄勪欢淇℃伅
List<StaWipSnEx> wipSnEx = wipSnExDao.selectByDeviceNo(deviceNo);
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 674443e..0c23c40 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
@@ -52,6 +52,7 @@
private OthFileMapper othFileMapper;
@Value("${dy.webFile.fmUrl}")
private String fmUrl;
+
@Autowired
public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
this.deviceLastDao = deviceLastDao;
@@ -189,7 +190,7 @@
record.planId = workLast.planId;
record.workId = Long.parseLong(params.workId);
record.stationId = workLast.stationId;
- record.equipNo = deviceNo;
+ record.deviceNo = deviceNo;
record.currNode = workLast.nodeId;
record.updatedBy = workLast.userId;
@@ -199,7 +200,7 @@
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
record.nodeContent = node.content;
if (node.isRecord) {
- record.equipCycleContent = node.equipCycleContent;
+ record.deviceCycleContent = node.equipCycleContent;
}
record.status = getStatus(params.status, node.isEnd,params.workType);
return record;
@@ -255,7 +256,7 @@
StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo);
StaRepairInfo repairInfo = new StaRepairInfo();
repairInfo.workId = workId;
- repairInfo.equipNo = vo.deviceNo;
+ repairInfo.deviceNo = vo.deviceNo;
repairInfo.repairTime = new Date();
repairInfo.repairBy = workLast.userId;
repairInfo.repairReason = vo.errorMsg;
@@ -406,10 +407,10 @@
}
public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
- return deviceLifeDao.selectByEquipNo(deviceNo);
+ return deviceLifeDao.selectByDeviceNo(deviceNo);
}
public List<StaDeviceProductionLog> queryLogByDeviceNo(String devoiceNo) {
- return deviceProductionLogDao.selectByEquipNo(devoiceNo);
+ return deviceProductionLogDao.selectByDeviceNo(devoiceNo);
}
}
--
Gitblit v1.8.0