From 78fb16915eab276b3cc44df060037189006ef663 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Thu, 23 May 2024 13:53:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=90=88=E5=BA=93=E5=AD=98=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E6=A8=A1=E7=89=88=E5=88=86=E9=A1=B5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/service/item/ItemServiceImpl.java     | 20 +++----------------
 .../ItemOutLocationServiceImpl.java           |  1 +
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/item/ItemServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/item/ItemServiceImpl.java
index 482c3ef..5957902 100644
--- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/item/ItemServiceImpl.java
+++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/item/ItemServiceImpl.java
@@ -348,24 +348,10 @@ public class ItemServiceImpl implements ItemService {
     public PageResult<ItemDO> getWarningPage(ItemPageReqVO pageReqVO) {
         pageReqVO.setFlag("2");
         PageResult<ItemDO> pageResult = itemMapper.selectPage(pageReqVO);
-        List<ItemDO> itemNewList=new ArrayList();
-        for (ItemDO itemDO : pageResult.getList()) {
-            QueryWrapper<ItemAccountsDO> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("item_number",itemDO.getNumber());
-            queryWrapper.eq("available","TRUE");
-            List<ItemAccountsDO>  itemAccountsDOList = itemAccountsMapper.selectList(queryWrapper);
-            BigDecimal allCount = BigDecimal.ZERO;
-            for (ItemAccountsDO itemAccountsDO : itemAccountsDOList) {
-                allCount=allCount.add(itemAccountsDO.getQty());
-            }
-            //如果各种类型的备件库存数量总数低于最低库存数量
-            if(allCount.compareTo(itemDO.getMinInventory())==-1){
-                itemDO.setAllCount(allCount);
-                itemNewList.add(itemDO);
-            }
+        for(ItemDO en: pageResult.getList()){
+            BigDecimal bigDecimal = itemAccountsMapper.selectInventorySum(en.getNumber());
+            en.setAllCount(bigDecimal);
         }
-        pageResult.setList(itemNewList);
-        pageResult.setTotal(Long.valueOf(itemNewList.size()).longValue());
         return pageResult;
     }
 
diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemoutlocation/ItemOutLocationServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemoutlocation/ItemOutLocationServiceImpl.java
index e7a689c..15757e6 100644
--- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemoutlocation/ItemOutLocationServiceImpl.java
+++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemoutlocation/ItemOutLocationServiceImpl.java
@@ -153,6 +153,7 @@ public class ItemOutLocationServiceImpl implements ItemOutLocationService {
     }
 
     @Override
+    @Transactional
     public Long createPDA(ItemOutLocationCreateReqVO createReqVO) {
         long i = 0l;
         List<Map<String, Object>> itemList = createReqVO.getItemNumbers();//备件号集合