From 12067f657bc3dc169a7a466e433374368e8daf73 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 16:14:27 +0800
Subject: [PATCH] 越库订单逻辑调整
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 2465f1c..8d979b9 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
@@ -12,7 +13,20 @@
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
- @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
+ // @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
List<WrkMast> selectToBeCompleteData();
+ List<WrkMast> selectToBeHistoryData();
+
+ @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);
+
+ List<WrkMast> selectWrkMastWrkDetl(@Param("ioType") Integer ioType, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand
+ , @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1, @Param("boxType2") String boxType2, @Param("boxType3") String boxType3, @Param("crnNo") Integer crnNo);
+
+ /**
+ * 鎸変换鍔″彿鏇存柊鍛煎彨agv鐘舵��
+ */
+ void updateAgvCallByWrkNos(@Param("wrkNoList") List<Integer> wrkNoList);
}
--
Gitblit v1.9.1