From fb8c436457dbe87b47120c82e5a82539ffc0c821 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 10 七月 2024 16:40:47 +0800
Subject: [PATCH] add a inputtime and outputtime
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java | 10 ++++++++++
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 15 +++++++++++++++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 2 +-
3 files changed, 26 insertions(+), 1 deletions(-)
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 7103427..41f9d23 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
@@ -94,6 +94,16 @@
* 鍑虹珯鏃堕棿
*/
public Date outTime;
+
+ /**
+ * 鎶曞叆鏃堕棿
+ */
+ public Date inLineTime;
+ /**
+ * 浜у嚭鏃堕棿
+ */
+ public Date outLineTime;
+
/**
* 澶囨敞
*/
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 abed27c..4ae4fa9 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -21,6 +21,8 @@
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
<result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
+ <result property="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
+ <result property="outLineTime" column="out_line_time" jdbcType="TIMESTAMP"/>
<result property="memo" column="memo" jdbcType="VARCHAR"/>
</resultMap>
<resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast" extends="BaseResultMap">
@@ -78,6 +80,7 @@
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
,#{updatedBy,jdbcType=BIGINT},#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP}
+ ,#{inLineTime,jdbcType=TIMESTAMP},#{outLineTime,jdbcType=TIMESTAMP}
,#{memo,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
@@ -99,6 +102,8 @@
<if test="updatedBy != null">updated_by,</if>
<if test="inTime != null">in_time,</if>
<if test="outTime != null">out_time,</if>
+ <if test="inLineTime != null">in_line_time,</if>
+ <if test="outLineTime != null">out_line_time,</if>
<if test="memo != null">memo,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -118,6 +123,8 @@
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
<if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
+ <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
+ <if test="outLineTime != null">#{outLineTime,jdbcType=TIMESTAMP},</if>
<if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
</trim>
</insert>
@@ -169,6 +176,12 @@
<if test="outTime != null">
out_time = #{outTime,jdbcType=TIMESTAMP},
</if>
+ <if test="inLineTime != null">
+ in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="outLineTime != null">
+ out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
+ </if>
<if test="memo != null">
memo = #{memo,jdbcType=VARCHAR},
</if>
@@ -193,6 +206,8 @@
updated_by = #{updatedBy,jdbcType=BIGINT},
in_time = #{inTime,jdbcType=TIMESTAMP},
out_time = #{outTime,jdbcType=TIMESTAMP},
+ in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
+ out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
memo = #{memo,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
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 47d891f..4b7fb7c 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
@@ -145,7 +145,7 @@
});
if (deviceList.isEmpty()) {
- throw new RuntimeException("璁惧鍙�(" + params.deviceNo + ")鍧囦笉灞炰簬褰撳墠浠诲姟璁″垝");
+ throw new RuntimeException("璁惧鍙�(" + Arrays.toString(params.deviceNo) + ")鍧囦笉灞炰簬褰撳墠浠诲姟璁″垝");
}
if (deviceList.size() > 1) {
throw new RuntimeException("璁惧鍙锋湁涓斿彧鑳芥湁涓�涓睘浜庡綋鍓嶄换鍔¤鍒�");
--
Gitblit v1.8.0