From f2703d0b0afab76b372e8a9a760cf77c4bdfddab Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 1 Dec 2024 18:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=93=E5=BA=93=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/service/depot/DepotService.java   | 44 +++++++------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
index b1f551da..3f0c9c66 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
@@ -61,15 +61,9 @@ public class DepotService {
 
     public List<Depot> getDepotListByIds(String ids)throws Exception {
         List<Long> idList = StringUtil.strToLongList(ids);
-        List<Depot> list = new ArrayList<>();
-        try{
-            DepotExample example = new DepotExample();
-            example.createCriteria().andIdIn(idList);
-            list = depotMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
+        DepotExample example = new DepotExample();
+        example.createCriteria().andIdIn(idList);
+        return depotMapper.selectByExample(example);
     }
 
     public List<Depot> getDepot()throws Exception {
@@ -188,37 +182,33 @@ public class DepotService {
         int result=0;
         String [] idArray=ids.split(",");
         //校验单据子表	jsh_depot_item
-        List<DepotItem> depotItemList=null;
-        try{
-            depotItemList = depotItemMapperEx.getDepotItemListListByDepotIds(idArray);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
+        List<DepotItem> depotItemList = depotItemMapperEx.getDepotItemListListByDepotIds(idArray);
         if(depotItemList!=null&&depotItemList.size()>0){
             logger.error("异常码[{}],异常提示[{}],参数,DepotIds[{}]",
                     ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,ExceptionConstants.DELETE_FORCE_CONFIRM_MSG,ids);
             throw new BusinessRunTimeException(ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,
                     ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
         }
-        //记录日志
-        StringBuffer sb = new StringBuffer();
-        sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
-        List<Depot> list = getDepotListByIds(ids);
-        for(Depot depot: list){
-            sb.append("[").append(depot.getName()).append("]");
-        }
-        logService.insertLog("仓库", sb.toString(),
-                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-        User userInfo=userService.getCurrentUser();
-        //校验通过执行删除操作
         try{
+            //记录日志
+            StringBuffer sb = new StringBuffer();
+            sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
+            List<Depot> list = getDepotListByIds(ids);
+            for(Depot depot: list){
+                sb.append("[").append(depot.getName()).append("]");
+            }
+            User userInfo=userService.getCurrentUser();
+            //校验通过执行删除操作
             //删除仓库关联的商品的初始库存
             materialInitialStockMapperEx.batchDeleteByDepots(idArray);
             //删除仓库关联的商品的当前库存
             materialCurrentStockMapperEx.batchDeleteByDepots(idArray);
             //删除仓库
             result = depotMapperEx.batchDeleteDepotByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
-        }catch(Exception e){
+            //记录日志
+            logService.insertLog("仓库", sb.toString(),
+                    ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        } catch (Exception e) {
             JshException.writeFail(logger, e);
         }
         return result;