From 4cc4f5ec8be2dc37f9697b836b5d955d9707c479 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 14 Jan 2025 16:01:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/res/inout/IoSplitInvResponse.java    |  4 +++-
 .../glxp/api/service/inout/IoSplitFifoInvService.java |  4 ++--
 .../mybatis/mapper/inout/IoSplitFifoInvMapper.xml     | 11 +++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
index 3a30d0e23..1eed708da 100644
--- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
@@ -137,6 +137,8 @@ public class IoSplitInvResponse {
     private String busName;
     private Integer availableCount;
     private Integer monopoly;
-
+    private Integer queueRemindCount;
+    private String workPlaceQueueCodeName;
+    private Boolean queueEnableRemind;
 
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
index 5d6ac2587..cb03e635a 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -289,8 +289,8 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
         List<IoSplitInvResponse> ioSplitInvResponses = this.baseMapper.filterList(ioSplitFifoInvRequest);
         if (CollUtil.isNotEmpty(ioSplitInvResponses)) {
             ioSplitInvResponses.forEach(t -> {
-                if (t.getEnableRemind()) {
-                    int count = t.getReCount() - t.getInvRemindCount();
+                if (t.getQueueEnableRemind()) {
+                    int count = t.getReCount() - t.getQueueRemindCount();
                     if (count >= 0) {
                         t.setRemindState(1);
                     } else {
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
index 4d6415cc9..6b64ffd31 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
@@ -43,9 +43,13 @@
            bc.name  supName,
            sw.workPlaceName,
            swd.busName,
-           swd.monopoly
+           swd.monopoly,
+           swq.name as workPlaceQueueCodeName,
+           swq.enableRemind as queueEnableRemind,
+           swq.remindCount as queueRemindCount
     from io_split_fifo_inv isfi
            LEFT JOIN basic_udirel bu ON bu.id = isfi.relId
+           LEFT JOIN sys_workplace_queue swq ON swq.code = isfi.workPlaceQueueCode
            LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
            left join basic_corp bc on bc.erpId = isfi.supId
            left join sys_workplace sw on sw.workplaceId = isfi.workPlaceCode
@@ -92,6 +96,8 @@
           <if test="keyWords != null and keyWords != ''">
               AND (
               isfi.workPlaceCode like concat('%', #{keyWords}, '%')
+              or isfi.workPlaceQueueCode like concat('%', #{keyWords}, '%')
+              or swq.name like concat('%', #{keyWords}, '%')
               or bp.nameCode like concat('%', #{keyWords}, '%')
               or isfi.batchNo like concat('%', #{keyWords}, '%')
               or bp.cpmctymc like concat('%', #{keyWords}, '%')
@@ -106,7 +112,8 @@
               )
           </if>
           <if test="remind != null and remind == 'yj' ">
-             AND not exists(select 1 from io_split_fifo_inv t where t.enableRemind = 0 and (t.reCount - t.invRemindCount) <![CDATA[ >= ]]>  0 and t.id = isfi.id )
+             AND swq.enableRemind = 1
+             AND (isfi.reCount - swq.remindCount) <![CDATA[ < ]]>  0
           </if>
       </where>
       GROUP  BY id