From b83a5cde3a944b959a0a484cfc2804969f59c331 Mon Sep 17 00:00:00 2001
From: Gauthier LO <lo.gauthier.glo@gmail.com>
Date: Fri, 25 Apr 2025 12:34:12 +0200
Subject: [PATCH] feat: better sku listing

---
 .../controller/admin/SkuController.java        |  5 +++--
 .../modules/business/mapper/SkuMapper.java     |  2 +-
 .../modules/business/mapper/xml/SkuMapper.xml  | 18 ++++++++++++++----
 .../modules/business/service/ISkuService.java  |  2 +-
 .../business/service/impl/SkuServiceImpl.java  |  4 ++--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java
index 23c83772b..5ec9a222c 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java
@@ -619,8 +619,9 @@ public class SkuController {
     }
 
     @GetMapping(value = "/compare")
-    public Result<?> compareClientSkuWithMabang(@RequestParam(name="clientId") String clientId) {
-        Map<String, Sku> clientSkus = skuService.listByClientId(clientId);
+    public Result<?> compareClientSkuWithMabang(@RequestParam(name="clientId") String clientId,
+                                                @RequestParam(name="erpStatuses[]") List<String> erpStatuses) {
+        Map<String, Sku> clientSkus = skuService.listInUninvoicedOrders(clientId, erpStatuses);
         List<String> skuIds = new ArrayList<>(clientSkus.keySet());
         List<SkuDocument> clientSkuDocs = new ArrayList<>();
         for(String skuId: skuIds) {
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java
index 4a9c48aa2..2f5397da9 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java
@@ -76,7 +76,7 @@ public interface SkuMapper extends BaseMapper<Sku> {
     List<SkuOrderPage> getInventory(@Param("erpCodes") List<String> erpCodes, @Param("invoiceNumber") String invoiceNumber);
 
     @MapKey("id")
-    Map<String, Sku> listByClientId(@Param("clientId") String clientId);
+    Map<String, Sku> listInUninvoicedOrders(@Param("clientId") String clientId, @Param("erpStatuses") List<String> erpStatuses);
 
     List<SkuOrderPage> searchExistingSkuByKeywords(@Param("keywords") List<String> keywords);
     List<Sku> listImgUrls();
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml
index c56c0b9c4..f235fc6b5 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml
@@ -723,12 +723,22 @@
             #{sku.id}
         </foreach>
     </update>
-    <select id="listByClientId" resultType="org.jeecg.modules.business.entity.Sku">
-        SELECT *
+    <select id="listInUninvoicedOrders" resultType="org.jeecg.modules.business.entity.Sku">
+        SELECT DISTINCT s.*
         FROM sku s
-             JOIN client_sku ON s.id = client_sku.sku_id
+            JOIN client_sku ON s.id = client_sku.sku_id
+            JOIN platform_order_content poc ON s.id = poc.sku_id
+            JOIN platform_order po ON poc.platform_order_id = po.id
         WHERE client_sku.client_id = #{clientId}
-        AND s.status = 3;
+          AND po.shipping_invoice_number IS NULL
+          AND poc.erp_status &lt;&gt; 5
+          AND po.erp_status IN
+          <foreach collection="erpStatuses" item="erpStatus" index="index" separator="," open="(" close=")">
+              #{erpStatus}
+          </foreach>
+          AND po.order_time &gt;= '2024-01-01 00:00:00'
+          AND s.status = 3
+        ;
     </select>
     <select id="searchExistingSkuByKeywords" resultType="org.jeecg.modules.business.vo.SkuOrderPage">
         SELECT
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java
index 0d01fa3eb..b33a4d99a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java
@@ -113,7 +113,7 @@ public interface ISkuService extends IService<Sku> {
     List<SkuOrderPage> getInventoryByInvoiceNumber(String invoiceNumber);
     List<SkuOrderPage> getInventory(List<String> erpCodes, String invoiceNumber);
 
-    Map<String, Sku> listByClientId(String clientId);
+    Map<String, Sku> listInUninvoicedOrders(String clientId, List<String> erpStatuses);
 
     List<SkuOrderPage> searchExistingSkuByKeywords(List<String> keywords);
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java
index 17691a4e2..8634a5a43 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java
@@ -598,8 +598,8 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
     }
 
     @Override
-    public Map<String, Sku> listByClientId(String clientId) {
-        return skuMapper.listByClientId(clientId);
+    public Map<String, Sku> listInUninvoicedOrders(String clientId, List<String> erpStatuses) {
+        return skuMapper.listInUninvoicedOrders(clientId, erpStatuses);
     }
 
     @Override