From 9d438b5e29c7c3b3505d95c3eafc32014ab26561 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 21 八月 2025 16:27:31 +0800
Subject: [PATCH] #自动出库空托盘，历史档更新判断rgv工作档

---
 src/main/resources/mapper/WrkMastMapper.xml        |    1 +
 src/main/java/com/zy/common/web/WcsController.java |    4 ++--
 src/main/java/com/zy/common/model/LocTypeDto.java  |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index c6630aa..d540eb6 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -22,6 +22,8 @@
     // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
     private Short locType3;
 
+    private Integer siteId;
+
     public LocTypeDto() {
     }
 
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index e82d35b..2d251c6 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -142,14 +142,14 @@
 
     @PostMapping("auto/emptyOut/v1")
     @ResponseBody
-    public R autoEmptyOut(){
+    public R autoEmptyOut(@RequestBody LocTypeDto locTypeDto){
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                 .eq("loc_sts", "D"));
         if (Cools.isEmpty(locMast)) {
             return R.error("搴撳瓨娌℃湁绌烘澘");
         }
         EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
-        emptyPlateOutParam.setOutSite(301);
+        emptyPlateOutParam.setOutSite(locTypeDto.getSiteId());
         emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
         WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
         return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e9300ad..ca1dab5 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -69,6 +69,7 @@
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         select * from asr_wrk_mast
         where wrk_sts=5
+        or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_wrk_mast_sta))
         or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and dateadd(mi,3,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))

--
Gitblit v1.9.1