From c4b2cfbdc4b31a6e37a9b51c5f69620bd5e7841f Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 23 八月 2025 08:38:58 +0800
Subject: [PATCH] wcs功能完善

---
 src/main/java/com/zy/mapper/WrkMastMapper.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/mapper/WrkMastMapper.java b/src/main/java/com/zy/mapper/WrkMastMapper.java
index 3454d25..d6eb1a1 100644
--- a/src/main/java/com/zy/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/mapper/WrkMastMapper.java
@@ -2,14 +2,24 @@
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.entity.WrkMast;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
 @Repository
 public interface WrkMastMapper extends BaseMapper<WrkMast> {
+
+    /**
+     * 鏌ヨ鍏ョ亴瑁呯嚎绔欑偣鍦ㄩ�斾换鍔℃暟锛堟湭杩涚綈瑁呯嚎閲岄潰锛�
+     * @param site 鍏ョ綈瑁呯嚎绔欑偣
+     */
+    int selectInGzxCount(@Param("site") int site);
 
     WrkMast selectByLocNo(@Param("sourceLocNo") String sourceLocNo);
 
@@ -31,7 +41,7 @@
 
     // 鍏ュ簱绗簩姝ワ紝褰撴墭鐩樼墿鏂欏湪鍫嗗灈鏈哄叆搴撶珯鏃舵椂鏌ヨ
 //    @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC")
-    WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
+    WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo);
 
     // 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
 //    @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
@@ -112,10 +122,16 @@
     WrkMast selectPickStep2(@Param("barcode")String barcode);
 
     WrkMast selectByWrkNo(@Param("wrkNo")Integer wrkNo);
+    WrkMast selectByIoTypeAndWrkSts(@Param("ioType")Integer ioTyper,@Param("wrkSts")Long wrkSts);
 
     /**
      * 鑾峰彇涓�鏉″埌104绔欑偣鐨勫嚭搴撲换鍔�
      * @return 宸ヤ綔涓绘。
      */
     WrkMast selectBy104();
+
+    int selectCountByKb();
+
+    // 鏍规嵁鍑哄叆搴撶被鍨嬪拰宸ヤ綔鏃堕棿锛屾煡璇㈠巻鍙茶〃璁板綍鏁伴噺
+    int selectCountHisByIoTypeAndIoTime(@Param("ioType") Integer IoType,@Param("ioType") Date ioTime);
 }

--
Gitblit v1.9.1