From c53c175e5a7cbc27c0f6c6ae411547315691e30d Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 11 Dec 2025 10:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=BA=8F=E5=88=97=E5=8F=B7=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=87=BA=E5=BA=93=E5=A2=9E=E5=8A=A0=EF=BC=88=E6=9C=AA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=B0=E7=9A=84=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SerialNumberController.java    | 24 +++++++++++++++++++
 .../jeecgbiz/modal/JSelectSnModal.vue         |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java
index 53d27ea2..782d6bdc 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -99,8 +100,31 @@ public class SerialNumberController {
                 serialNumberEx.setCreateTimeStr(Tools.getCenternTime(serialNumberEx.getCreateTime()));
             }
             Long total = serialNumberService.getEnableSerialNumberCount(number, name, nameArray, depotId, barCode);
+            List<String> missList = new ArrayList<>();
+            if(nameArray!=null && nameArray.length>0) {
+                List<SerialNumberEx> allList = serialNumberService.getEnableSerialNumberList(number, name, nameArray, depotId, barCode, null, null);
+                if(allList.size() < nameArray.length) {
+                    //说明查出的比查询条件里面的序列号少，此时需要寻找出缺少的序列号
+                    for (String item : nameArray) {
+                        boolean isHave = false;
+                        for (SerialNumberEx serialNumberEx : allList) {
+                            if (item.equals(serialNumberEx.getSerialNumber())) {
+                                isHave = true;
+                                break;
+                            }
+                        }
+                        if (!isHave) {
+                            missList.add(item);
+                        }
+                    }
+                }
+            }
             map.put("rows", list);
             map.put("total", total);
+            if(!missList.isEmpty()) {
+                //列出未查询到的序列号
+                map.put("missInfo", String.join(",", missList));
+            }
             res.code = 200;
             res.data = map;
         } catch(Exception e){
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue
index de9059a2..2c480aef 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue
@@ -197,6 +197,9 @@
                 this.queryParam.name = ''
               }
             }
+            if(res.data.missInfo) {
+              this.$message.warning("未查询到的序列号：" + res.data.missInfo)
+            }
           }
         }).finally(() => {
           this.loading = false