From 4e6349f69ec22ede3a2060e5af60feae43484178 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Wed, 20 Jul 2022 17:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E6=B3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseFpPlanqtyController.java   |  6 ++--
 .../mapper/system/BroadDataMapper.xml         | 35 ++++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseFpPlanqtyController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseFpPlanqtyController.java
index c8f79df..2a6f8fc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseFpPlanqtyController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseFpPlanqtyController.java
@@ -88,12 +88,12 @@ public class BaseFpPlanqtyController extends BaseController
     {
 
         List<BaseFpPlanqty> list = baseFpPlanqtyService.selectBaseFpPlanqtyList(null);
-        Long id=1L;
+        int id=0;
         System.out.println(list);
         if (list!=null||!list.isEmpty()){
-            id=list.get(list.size()-1).getId()+1;
+            id= Math.toIntExact(list.get(list.size() - 1).getId()) + 1;
         }
-        baseFpPlanqty.setId(id);
+        baseFpPlanqty.setId(Long.valueOf(id));
         return toAjax(baseFpPlanqtyService.insertBaseFpPlanqty(baseFpPlanqty));
     }
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 40b3a1c..edb691f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -214,23 +214,24 @@
     </select>
     <select id="selectFpStock" resultType="com.ruoyi.system.domain.BoxOutput">
         select substr(MATERIAL_NAME,
-              case
-                  when instr(MATERIAL_NAME, '-', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
-                  else instr(MATERIAL_NAME, '-', 1, 1) + 1
-                  end,
-              case
-                  when instr(MATERIAL_NAME, ',', 1, 2) = 0 then Length(MATERIAL_NAME) + 1
-                  else instr(MATERIAL_NAME, ',', 1, 2)
-                  end
-                  -
-              case
-                  when instr(MATERIAL_NAME, '-', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
-                  else instr(MATERIAL_NAME, '-', 1, 1) + 1
-                  end) as name,
-               STORE_QTY       as qty
-        from IMOS_LO_BIN
-        where MATERIAL_NAME like '发泡箱体%'
-          and STORE_QTY > 0
+                      case
+                          when instr(MATERIAL_NAME, '-', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
+                          else instr(MATERIAL_NAME, '-', 1, 1) + 1
+                          end,
+                      case
+                          when instr(MATERIAL_NAME, ',', 1, 2) = 0 then Length(MATERIAL_NAME) + 1
+                          else instr(MATERIAL_NAME, ',', 1, 2)
+                          end
+                          -
+                      case
+                          when instr(MATERIAL_NAME, '-', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
+                          else instr(MATERIAL_NAME, '-', 1, 1) + 1
+                          end) as name,
+                       sum(STORE_QTY)     as qty
+                from IMOS_LO_BIN
+                where MATERIAL_NAME like '发泡箱体%'
+                  and STORE_QTY > 0
+        group by MATERIAL_NAME
     </select>
 
     <select id="pqk_selectProductInStore" resultType="com.ruoyi.system.domain.BoxOutput">