From 116c58f2e3ff671d6f31313588f89cac5da9acf5 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 20 四月 2026 22:36:54 +0800
Subject: [PATCH] 1.新增任务档耗时字段 2.电视机耗时修改成站点累计入库出库任务用时
---
src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
index 7afe961..ec70cdd 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -16,14 +17,31 @@
@Repository
public interface WrkMastLogMapper extends BaseMapper<WrkMastLog> {
- @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
+ @Insert("INSERT INTO asr_wrk_mast_log (" +
+ "wrk_no, inv_wh, ymd, mk, whs_type, wrk_sts, io_type, crn_no, sheet_no, io_pri, wrk_date, loc_no, sta_no, source_sta_no, source_loc_no, loc_sts, " +
+ "picking, link_mis, online_yn, upd_mk, exit_mk, plt_type, batch_seq, empty_mk, io_time, ctn_type, packed, ove_mk, mtn_type, user_no, crn_str_time, " +
+ "crn_end_time, plc_str_time, crn_pos_time, load_time, exp_time, cost_time, ref_wrkno, ref_iotime, modi_user, modi_time, appe_user, appe_time, pause_mk, " +
+ "error_time, error_memo, ctn_kind, manu_type, memo_m, sc_weight, log_mk, log_err_time, log_err_memo, barcode, Pdc_type, container_no, teu, plate_no, train_no, freq_type, cube_number, ctn_no, full_plt, pre_have, take_none) " +
+ "SELECT " +
+ "wrk_no, inv_wh, ymd, mk, whs_type, wrk_sts, io_type, crn_no, sheet_no, io_pri, wrk_date, loc_no, sta_no, source_sta_no, source_loc_no, loc_sts, " +
+ "picking, link_mis, online_yn, upd_mk, exit_mk, plt_type, batch_seq, empty_mk, io_time, ctn_type, packed, ove_mk, mtn_type, user_no, crn_str_time, " +
+ "crn_end_time, plc_str_time, crn_pos_time, load_time, exp_time, DATEDIFF(MINUTE, appe_time, GETDATE()), ref_wrkno, ref_iotime, modi_user, modi_time, appe_user, appe_time, pause_mk, " +
+ "error_time, error_memo, ctn_kind, manu_type, memo, sc_weight, log_mk, log_err_time, log_err_memo, barcode, Pdc_type, container_no, teu, plate_no, train_no, freq_type, cube_number, ctn_no, full_plt, pre_have, take_none " +
+ "FROM asr_wrk_mast WHERE wrk_no=#{workNo}")
int save(Integer workNo);
/**
- * 鍑哄簱 101 涓嬭鍗曞彿宸插嚭鐜扮殑 plt_type锛堝巻鍙茶〃锛�
+ * 鍑哄簱 101 涓嬭鍗曞彿鍚屾壒娆″凡鍑虹幇鐨� plt_type锛堝巻鍙茶〃锛�
*/
- @Select("SELECT plt_type FROM asr_wrk_mast_log WHERE io_type = 101 AND plt_type IS NOT NULL AND plt_type > 0 AND user_no = #{userNo}")
- List<Integer> listOutboundPltTypesByUserNo(@Param("userNo") String userNo);
+ @Select("SELECT plt_type FROM asr_wrk_mast_log 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 ISNULL(SUM(CAST(ISNULL(cost_time, 0) AS BIGINT)), 0) " +
+ "FROM asr_wrk_mast_log " +
+ "WHERE wrk_sts = #{wrkSts} " +
+ "AND appe_time >= #{startTime} " +
+ "AND appe_time <= #{endTime}")
+ Long sumCostTimeByWrkSts(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("wrkSts") Integer wrkSts);
/**
* 鏌ヨ搴撳瓨绉诲姩娴佹按璁板綍
--
Gitblit v1.9.1