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 missList = new ArrayList<>(); + if(nameArray!=null && nameArray.length>0) { + List 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