From fc80e4040d6bf39b8657f94df1f957732bae26fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 22:02:31 +0800
Subject: [PATCH] 电视机入库出库显示耗时、托数功能修改: 1.入库耗时改成当前订单第一托入库任务创建时间到后续入库的创建时间相减转换成分钟 2.出库耗时改成当前订订单任务创建时间减去到达出库口的耗时时间 3.入库托数改成当前入库订单号累计入库数量

---
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 93d3e44..0ca0e81 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -5,8 +5,10 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -17,6 +19,11 @@
     List<WrkMast> selectToBeCompleteData();
 
     List<WrkMast> selectToBeHistoryData();
+
+    List<WrkMast> selectPendingInboundCameraCapture(@Param("pending") String pending, @Param("running") String running);
+
+    @Update("update asr_wrk_mast set memo = #{next}, modi_time = getdate() where wrk_no = #{wrkNo} and memo = #{current}")
+    int updateMemoIfCurrent(@Param("wrkNo") Integer wrkNo, @Param("current") String current, @Param("next") String next);
 
     @Select("select count(1) from asr_wrk_mast where 1=1 and io_type = #{ioType} and sta_no = #{staNo}")
     int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);
@@ -33,4 +40,10 @@
     @Select("SELECT plt_type FROM asr_wrk_mast WHERE io_type = 101 AND plt_type IS NOT NULL AND plt_type > 0 AND user_no = #{userNo} AND ((#{batchSeq} IS NULL AND batch_seq IS NULL) OR batch_seq = #{batchSeq})")
     List<Integer> listOutboundPltTypesByUserNo(@Param("userNo") String userNo, @Param("batchSeq") String batchSeq);
 
+    @Select("SELECT MIN(ISNULL(appe_time, io_time)) FROM asr_wrk_mast WHERE train_no = #{trainNo} AND io_type < 100")
+    Date selectFirstInboundCreateTimeByTrainNo(@Param("trainNo") String trainNo);
+
+    @Select("SELECT wrk_no FROM asr_wrk_mast WHERE train_no = #{trainNo} AND io_type < 100 AND wrk_sts = 5")
+    List<Integer> listFinishedInboundWrkNosByTrainNo(@Param("trainNo") String trainNo);
+
 }

--
Gitblit v1.9.1