From 0318c2e568a1369e3b21a2d528bc49a7f3bb6f88 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925259474@qq.com>
Date: Sun, 25 Jan 2026 15:11:16 +0800
Subject: [PATCH] no message

---
 .../service/processor/BatchProcessor.java     |  4 +
 .../inventory/mapper/InventoryMapper.java     |  9 +-
 .../inventory/mapper/xml/InventoryMapper.xml  |  8 ++
 cpte-module-system/cpte-system-start/pom.xml  |  2 +-
 .../modules/system/test/TesStockTest.java     | 83 +++++++++++++++++++
 5 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 cpte-module-system/cpte-system-start/src/test/java/org/jeecg/modules/system/test/TesStockTest.java

diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/processor/BatchProcessor.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/processor/BatchProcessor.java
index cde6490..29ec83d 100644
--- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/processor/BatchProcessor.java
+++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/processor/BatchProcessor.java
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -129,6 +130,7 @@ public class BatchProcessor {
             batchUtil.updateBatchInventory(updateToInventory);
         }
         if (CollectionUtils.isNotEmpty(updateToPickDetail)) {
+            updateToPickDetail.sort(Comparator.comparing(PickDetail::getId));
             batchUtil.updateBatchPickDetail(updateToPickDetail);
         }
         if (CollectionUtils.isNotEmpty(createToTask)) {
@@ -149,6 +151,7 @@ public class BatchProcessor {
             batchUtil.updateBatchInventory(updateToInventory);
         }
         if (CollectionUtils.isNotEmpty(updateToPickDetail)) {
+            updateToPickDetail.sort(Comparator.comparing(PickDetail::getId));
             batchUtil.updateBatchPickDetail(updateToPickDetail);
         }
 
@@ -167,6 +170,7 @@ public class BatchProcessor {
             inventoryMapper.deleteByIds(deleteToInventoryIds);
         }
         if (CollectionUtils.isNotEmpty(updateToPickDetail)) {
+            updateToPickDetail.sort(Comparator.comparing(PickDetail::getId));
             batchUtil.updateBatchPickDetail(updateToPickDetail);
         }
         if (CollectionUtils.isNotEmpty(updateToTask)) {
diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/mapper/InventoryMapper.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/mapper/InventoryMapper.java
index a76cd83..2046ed3 100644
--- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/mapper/InventoryMapper.java
+++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/mapper/InventoryMapper.java
@@ -116,7 +116,7 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
      *
      * @return Long
      */
-    @Select("select count(stock_id) from data_inventory")
+    @Select("select count(DISTINCT stock_id) from data_inventory ")
     Long queryStockCount();
 
     /**
@@ -125,4 +125,11 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
      * @return List<OutAndInData>
      */
     List<OutAndInData> queryOutAndInData();
+
+    /**
+     * 查询库内托盘-点位
+     *
+     * @return List<String>
+     */
+    List<String> queryStockPoint();
 }
diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/mapper/xml/InventoryMapper.xml b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/mapper/xml/InventoryMapper.xml
index 6547a20..4a9840a 100644
--- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/mapper/xml/InventoryMapper.xml
+++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/mapper/xml/InventoryMapper.xml
@@ -139,4 +139,12 @@
         </where>
         order by s.stock_code
     </select>
+
+    <select id="queryStockPoint" resultType="java.lang.String">
+        select CONCAT(s.stock_code,"-",p.point_code) from data_inventory inv
+        join base_point p on p.id=inv.point_id
+        join base_stock s on s.id=inv.stock_id
+        GROUP BY s.stock_code
+        order by s.stock_code
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/cpte-module-system/cpte-system-start/pom.xml b/cpte-module-system/cpte-system-start/pom.xml
index 1cb241a..a89c0e0 100644
--- a/cpte-module-system/cpte-system-start/pom.xml
+++ b/cpte-module-system/cpte-system-start/pom.xml
@@ -49,7 +49,7 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
-        
+
         <!-- 分库分表示例 -->
      <!--  <dependency>
            <groupId>org.jeecgframework.boot3</groupId>
diff --git a/cpte-module-system/cpte-system-start/src/test/java/org/jeecg/modules/system/test/TesStockTest.java b/cpte-module-system/cpte-system-start/src/test/java/org/jeecg/modules/system/test/TesStockTest.java
new file mode 100644
index 0000000..7256f58
--- /dev/null
+++ b/cpte-module-system/cpte-system-start/src/test/java/org/jeecg/modules/system/test/TesStockTest.java
@@ -0,0 +1,83 @@
+package org.jeecg.modules.system.test;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import jakarta.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.cpte.modules.inventory.mapper.InventoryMapper;
+import org.jeecg.CpteSystemApplication;
+import org.jeecg.common.util.RestUtil;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = CpteSystemApplication.class)
+public class TesStockTest {
+
+    @Resource
+    private InventoryMapper inventoryMapper;
+
+    @Test
+    public void testSelect() {
+        List<String> list = inventoryMapper.queryStockPoint();
+        List<String> stocks = getStockInfo();
+
+        Set<String> set1 = new HashSet<>(list);
+        Set<String> set2 = null;
+        if (stocks != null) {
+            set2 = new HashSet<>(stocks);
+        }
+
+        // 获取对称差集（所有不同的元素）
+        Set<String> allDifferent = new HashSet<>(set1);
+        if (set2 != null) {
+            allDifferent.addAll(set2);  // 先合并
+        }
+
+        Set<String> intersection = new HashSet<>(set1);
+        if (set2 != null) {
+            intersection.retainAll(set2);  // 获取交集
+        }
+
+        allDifferent.removeAll(intersection);  // 移除交集，得到对称差集
+
+        System.out.println("有差异的容器: " + allDifferent);
+    }
+
+    private List<String> getStockInfo() {
+
+        JSONObject params = new JSONObject();
+        params.put("warehouseID", "HETU");
+        params.put("clientCode", "WMS");
+        params.put("regionCode", 3);
+        params.put("pageNum", 1);
+        params.put("pageSize", 10000);
+
+        String url = "http://10.254.27.191/tes/apiv2/getPodList";
+        JSONObject stockInfo = RestUtil.post(url, params);
+        //JSONObject stockInfo =  stockInfo();
+        JSONObject data = stockInfo.getJSONObject("data");
+        if (data == null) {
+            return null;
+        }
+        JSONArray podList = data.getJSONArray("podList");
+        List<String> stocks = new ArrayList<>();
+        for (int i = 0; i < podList.size(); i++) {
+            JSONObject podObject = podList.getJSONObject(i);
+            String podID = podObject.getString("podID");
+            String storageID = podObject.getString("storageID");
+            if (StringUtils.isNotBlank(storageID)) {
+              /*  if ("P002000".equals(podID)) {
+                    continue;
+                }*/
+                stocks.add(podID + "-" + storageID);
+            }
+        }
+        return stocks;
+    }
+}