From 62693b315f93c58235cf1bad63b08de88885d50e Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sat, 18 Jan 2025 15:01:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/basic/SysWorkplaceFreightResponse.java   |  1 +
 .../mapper/basic/SysWorkplaceFreightMapper.xml   | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java
index 81ee9274e..ec59deafe 100644
--- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java
@@ -62,6 +62,7 @@ public class SysWorkplaceFreightResponse {
      */
     private Integer isSingQueue;
     private Integer freightRow;
+    private Integer reCount;
 
 
 
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
index 2779da013..df7a4c120 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
@@ -6,8 +6,22 @@
     <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceFreightResponse">
         select swf.*,
         sw.workplaceName  workPlaceName,
-        COUNT(swl.freightCode) as layerCount
+        COUNT(swl.freightCode) as layerCount,ccc.reCount
         from sys_workplace_freight swf
+        left join (
+            select freightCode,count(freightCode), min(reCount) as reCount from
+                (
+		select swq.freightCode,(ifnull(a.reCodeCount,0) - ifnull(swq.remindCount,0) ) as reCount
+        from sys_workplace_queue swq
+        LEFT JOIn (
+        select  sum(reCount) as reCodeCount,workPlaceQueueCode from io_split_fifo_inv isfi
+        group by workPlaceQueueCode
+        ) as  a on a.workPlaceQueueCode = swq.code
+        where swq.enableRemind = 1 and swq.relId is not null
+        ORDER BY reCodeCount
+				) as a
+        group by freightCode
+         ) as ccc on ccc.freightCode = swf.code
         left join sys_workplace sw on sw.workplaceId = swf.workPlaceIdFk
         left join sys_workplace_layer swl on swl.freightCode = swf.code
         <where>