From 6ddd5cf118a6b0d28daca62e0315b1f5b5e6780f Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 25 Mar 2025 15:00:11 +0800
Subject: [PATCH] 20240325

---
 .../modules/pallet/controller/CatchPalletController.java    | 6 +++++-
 .../com/gaotao/modules/pallet/mapper/CatchPalletMapper.java | 2 ++
 .../gaotao/modules/pallet/service/CatchPalletService.java   | 2 ++
 .../modules/pallet/service/impl/CatchPalletServiceImpl.java | 5 +++++
 src/main/resources/mapper/pallet/CatchPalletMapper.xml      | 4 ++++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/pallet/controller/CatchPalletController.java b/src/main/java/com/gaotao/modules/pallet/controller/CatchPalletController.java
index ac98339..abccc0b 100644
--- a/src/main/java/com/gaotao/modules/pallet/controller/CatchPalletController.java
+++ b/src/main/java/com/gaotao/modules/pallet/controller/CatchPalletController.java
@@ -63,7 +63,11 @@ public class CatchPalletController {
                     @PathVariable("size") Integer size,
                     @RequestBody CatchPallet pallet) {
         IPage<CatchPallet> page = catchPalletService.queryPage(no,size,pallet);
-        return R.ok().put("rows", page.getRecords()).put("total", page.getTotal());
+        int total = catchPalletService.queryPalletTotal(pallet);
+        return R.ok()
+                .put("rows", page.getRecords())
+                .put("total", page.getTotal())
+                .put("palletTotal",total);
     }
 
 
diff --git a/src/main/java/com/gaotao/modules/pallet/mapper/CatchPalletMapper.java b/src/main/java/com/gaotao/modules/pallet/mapper/CatchPalletMapper.java
index 14e04b4..ed9039a 100644
--- a/src/main/java/com/gaotao/modules/pallet/mapper/CatchPalletMapper.java
+++ b/src/main/java/com/gaotao/modules/pallet/mapper/CatchPalletMapper.java
@@ -9,4 +9,6 @@ import java.util.List;
 @Mapper
 public interface CatchPalletMapper extends BaseMapper<CatchPallet> {
     int saveBatch(List<CatchPallet> catchPalletList);
+
+    int queryPalletTotal(CatchPallet pallet);
 }
diff --git a/src/main/java/com/gaotao/modules/pallet/service/CatchPalletService.java b/src/main/java/com/gaotao/modules/pallet/service/CatchPalletService.java
index 5cc5c9f..43d622c 100644
--- a/src/main/java/com/gaotao/modules/pallet/service/CatchPalletService.java
+++ b/src/main/java/com/gaotao/modules/pallet/service/CatchPalletService.java
@@ -20,4 +20,6 @@ public interface CatchPalletService extends IService<CatchPallet> {
     void removeAllCatchPallet(CatchPallet pallet);
 
     void saveCatchPalletBatch(List<CatchPallet> palletList);
+
+    int queryPalletTotal(CatchPallet pallet);
 }
diff --git a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java
index 9e60079..35fefbc 100644
--- a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java
@@ -144,4 +144,9 @@ public class CatchPalletServiceImpl extends ServiceImpl<CatchPalletMapper, Catch
             saveCatchPallet(pallet);
         }
     }
+
+    @Override
+    public int queryPalletTotal(CatchPallet pallet) {
+        return baseMapper.queryPalletTotal(pallet);
+    }
 }
diff --git a/src/main/resources/mapper/pallet/CatchPalletMapper.xml b/src/main/resources/mapper/pallet/CatchPalletMapper.xml
index 4fe71e7..984c69c 100644
--- a/src/main/resources/mapper/pallet/CatchPalletMapper.xml
+++ b/src/main/resources/mapper/pallet/CatchPalletMapper.xml
@@ -8,4 +8,8 @@
                 (#{item.site},#{item.palletNo},#{item.sn},#{item.sku},#{item.partDesc},#{item.erpPartNo},#{item.createBy},#{item.createTime})
             </foreach>
     </insert>
+
+    <select id="queryPalletTotal" resultType="int">
+        select count(DISTINCT pallet_no) from catch_pallet where site = #{site} and create_by = #{createBy}
+    </select>
 </mapper>