From 269d0866b24f253baf4823b0a6b92384b6773b13 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Tue, 11 Apr 2023 16:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MaterialController.java        | 101 +++--------------
 .../mapper/MaterialMapper.java                |  18 +++
 .../mapper/MaterialMapper.xml                 | 105 ++++++++++++++++++
 .../service/MaterialService.java              |  13 +++
 .../service/impl/MaterialServiceImpl.java     |  97 ++++++++++------
 .../mapper/MaterialMapper.xml                 | 105 ++++++++++++++++++
 6 files changed, 322 insertions(+), 117 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
index 90499d45..f6278dcb 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
@@ -154,94 +154,28 @@ public class MaterialController {
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         List<InventoryP> list = new ArrayList<>();
         Integer total = 0;
-        if (Integer.compare(userToken.getMaindeparment(), 361) != 0) {
+        Integer isadmin = userToken.getIsadmin();
+        if (isadmin == null) {
+            isadmin = 1;
+        }
+        if (isadmin != 4 && Integer.compare(userToken.getMaindeparment(), 361) != 0) {
             // 查询当前用户管理的仓库
             List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId());
             // 查询当前用户部门拥有的仓库
             List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
             // 定义仓库编号列表
             List<Integer> didList = new ArrayList<>();
-
-            Integer size = 10, page = 1; // 定义每页展示数量
-            if (map.containsKey("size")) {
-                size = ObjectFormatUtil.toInteger(map.get("size"));
+            for (RoleAndDepository andDepository : depositoryAndRole) {
+                didList.add(andDepository.getId());
+            }
+            for (Depository value : depositoryByAdminorg) {
+                didList.add(value.getId());
             }
-            if (!(map.containsKey("depositoryId") || map.containsKey("mcode") || map.containsKey("mname") || map.containsKey("version"))) {
-                // 用于标识是一次就查询成功
-                boolean flag = true;
-                for (Depository depository : depositoryByAdminorg) {
-                    Integer did = depository.getId();
-                    didList.add(did);
-                    map.put("depositoryId", did);
-                    List<InventoryP> inventory = null;
-                    if (!flag) {
-                        // 如果不是一次成功
-                        page = ObjectFormatUtil.toInteger(map.get("page"));
-                        if (page == null) {
-                            page = 1;
-                        }
-                        if (size - list.size() != size) {
-                            // 如果当前不是崭新一页
-                            map.put("begin", 0);
-                        } else {
-                            map.put("begin", (page - 1) * size - total);
-                        }
-                        map.put("size", size - list.size());
-
-                    }
-                    if (!map.containsKey("begin")) {
-                        inventory = materialService.findInventory(map);
-                    } else {
-                        inventory = materialService.findInventoryByDepository(map);
-                    }
-                    total += materialService.findInventoryCount(map);
 
+            map.put("depositoryIds", didList);
 
-                    if (list.size() < size) {
-                        list.addAll(inventory);
-                        // 如果本次没有达到数目
-                        if (list.size() < size) {
-                            flag = false;
-                        }
-                    }
-                }
-
-                for (RoleAndDepository roleAndDepository : depositoryAndRole) {
-                    Integer depositoryId = roleAndDepository.getDepositoryId();
-                    if (didList.contains(depositoryId)) {
-                        // 如果当前仓库编号存在
-                        continue; // 跳过本次循环
-                    }
-                    map.put("depositoryId", depositoryId);
-                    // 如果当前数目不足
-                    if (map.containsKey("page")) {
-                        // 当前页
-                        page = ObjectFormatUtil.toInteger(map.get("page"));
-                    }
-                    // 计算所有页数
-                    // 判断当前是在全新一页还是包含上述内容
-                    if (size - list.size() != size) {
-                        // 如果当前不是崭新一页
-                        map.put("begin", 0);
-                    } else {
-                        map.put("begin", (page - 1) * size - total);
-                    }
-                    map.put("size", size - list.size());
-                    if (list.size() < size) {
-                        List<InventoryP> materialByDepository = materialService.findInventoryByDepository(map);
-                        list.addAll(materialByDepository);
-                    }
-                    total += materialService.findMaterialByDepositoryCount(map);
-                }
-            } else {
-                List<InventoryP> inventory = materialService.findInventory(map);
-                list.addAll(inventory);
-                total += materialService.findInventoryCount(map);
-            }
-            for (InventoryP inventoryP : list
-            ) {
-                inventoryP.setSplitInfoList(splitUnitService.findSplitInfoByMid(inventoryP.getMid()));
-            }
+            list = materialService.findInventoryByDids(map);
+            total = materialService.findInventoryCountByDids(map);
         } else {
             list = materialService.findInventory(map);
             total = materialService.findInventoryCount(map);
@@ -257,13 +191,13 @@ public class MaterialController {
      * @return
      */
     @PostMapping("/material_add")
-    public RestResponse materialAdd(@RequestBody Map<String, Object> map,HttpServletRequest request) {
+    public RestResponse materialAdd(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
         if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
-        map.put("uid",userToken.getId());
+        map.put("uid", userToken.getId());
         return CrudUtil.insertHandle(materialService.insertMaterial(map), 1);
     }
 
@@ -293,13 +227,13 @@ public class MaterialController {
      * @return
      */
     @PostMapping("/material_edit")
-    public RestResponse updateDepository(@RequestBody Map<String, Object> map,HttpServletRequest request) {
+    public RestResponse updateDepository(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
         if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
-        map.put("uid",userToken.getId());
+        map.put("uid", userToken.getId());
         if (map.containsKey("state")) {
             map.put("state", 1);
         } else {
@@ -1691,6 +1625,7 @@ public class MaterialController {
 
     /**
      * 用于库存盘点时根据物料查询所处位置
+     *
      * @param map
      * @param request
      * @return
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
index cc2b18c3..df0111eb 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
@@ -1,6 +1,7 @@
 package com.dreamchaser.depository_manage.mapper;
 
 import com.dreamchaser.depository_manage.entity.*;
+import com.dreamchaser.depository_manage.pojo.InventoryP;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -144,6 +145,21 @@ public interface MaterialMapper {
      */
     List<Inventory> findInventory(Map<String,Object> map);
 
+
+    /**
+     * 根据条件查询符合条件的库存
+     * @param map
+     * @return
+     */
+    List<Inventory> findInventoryByDids(Map<String,Object> map);
+
+    /**
+     * 根据条件查询符合条件的库存数量
+     * @param map
+     * @return
+     */
+    Integer findInventoryCountByDids(Map<String,Object> map);
+
     /**
      * 根据条件查询符合条件的库存
      * @param map
@@ -167,6 +183,8 @@ public interface MaterialMapper {
      */
     List<Inventory> findInventoryByMidAndDids(Map<String,Object> map);
 
+
+
     /**
      * 根据id查询库存信息
      * @param id 库存id
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
index f253360c..906277f1 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
@@ -352,6 +352,111 @@
         </if>
     </select>
 
+
+    <select id="findInventoryByDids" resultMap="InventoryMap" parameterType="map">
+        SELECT
+        <include refid="allColumnsAndTypeNameOnViewByInventory"/>
+        from findInventory
+        where 1 = 1
+        and depositoryId in
+        <foreach collection="depositoryIds" index="index" item="did" open="(" separator="," close=")">
+            #{did}
+        </foreach>
+        <if test="mid != null">
+            and mid = #{mid}
+        </if>
+        <if test="mname != null and mname != ''">
+            AND mname LIKE CONCAT('%', #{mname}, '%')
+        </if>
+        <if test="version != null">
+            and version = #{version}
+        </if>
+        <if test="quantity != null">
+            AND quantity = #{quantity}
+        </if>
+        <if test="price != null">
+            AND price = #{price}
+        </if>
+        <if test="materialTypeId != null">
+            AND mtid = #{materialTypeId}
+        </if>
+        <if test="state != null and state != ''">
+            And mstate = #{state}
+        </if>
+        <if test="mcode != null and mcode != '' ">
+            and mcode = #{mcode}
+        </if>
+        <if test="shelfLife != null">
+            and #{shelfLife} >= shelfLife
+        </if>
+        <if test="producedDate != null">
+            and producedDate >= #{producedDate}
+        </if>
+        <if test="productionPlace != null and productionPlace !=''">
+            and productionPlace = #{productionPlace}
+        </if>
+        <if test="brand != '' and brand != null">
+            and brand LIKE CONCAT('%', #{brand}, '%')
+        </if>
+        <if test="remark != '' and remark != null">
+            and remark LIKE CONCAT('%', #{remark}, '%')
+        </if>
+        <if test="begin != null and size != null">
+            LIMIT #{begin},#{size}
+        </if>
+    </select>
+
+
+    <select id="findInventoryCountByDids" resultType="int" parameterType="map">
+        SELECT
+        COUNT(*)
+        from findInventory
+        where 1 = 1
+        and depositoryId in
+        <foreach collection="depositoryIds" index="index" item="did" open="(" separator="," close=")">
+            #{did}
+        </foreach>
+        <if test="mid != null">
+            and mid = #{mid}
+        </if>
+        <if test="mname != null and mname != ''">
+            AND mname LIKE CONCAT('%', #{mname}, '%')
+        </if>
+        <if test="version != null">
+            and version = #{version}
+        </if>
+        <if test="quantity != null">
+            AND quantity = #{quantity}
+        </if>
+        <if test="price != null">
+            AND price = #{price}
+        </if>
+        <if test="materialTypeId != null">
+            AND mtid = #{materialTypeId}
+        </if>
+        <if test="state != null and state != ''">
+            And mstate = #{state}
+        </if>
+        <if test="mcode != null and mcode != '' ">
+            and mcode = #{mcode}
+        </if>
+        <if test="shelfLife != null">
+            and #{shelfLife} >= shelfLife
+        </if>
+        <if test="producedDate != null">
+            and producedDate >= #{producedDate}
+        </if>
+        <if test="productionPlace != null and productionPlace !=''">
+            and productionPlace = #{productionPlace}
+        </if>
+        <if test="brand != '' and brand != null">
+            and brand LIKE CONCAT('%', #{brand}, '%')
+        </if>
+        <if test="remark != '' and remark != null">
+            and remark LIKE CONCAT('%', #{remark}, '%')
+        </if>
+    </select>
+
     <!--根据条件查询库存-->
     <select id="findInventoryForImport" resultMap="InventoryMap" parameterType="map">
         SELECT
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
index a50f54af..3c2c5173 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
@@ -74,6 +74,19 @@ public interface MaterialService {
      */
     List<InventoryP> findInventory(Map<String,Object> map);
 
+    /**
+     * 根据条件查询符合条件的库存数量
+     * @param map
+     * @return
+     */
+    Integer findInventoryCountByDids(Map<String,Object> map);
+    /**
+     * 根据条件查询符合条件的库存
+     * @param map
+     * @return
+     */
+    List<InventoryP> findInventoryByDids(Map<String,Object> map);
+
 
     /**
      * 根据物料编码及所处仓库查询库存
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index 4c613d07..3544f846 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -298,32 +298,42 @@ public class MaterialServiceImpl implements MaterialService {
         }
         map.put("state", state);
         List<Inventory> list = materialMapper.findInventory(map);
-        for (Inventory inventory : list) {
-            if (inventory.getPrice() != null) {
-                inventory.setPrice(inventory.getPrice() / 100);
-            } else {
-                inventory.setPrice(0.0);
-            }
-            inventory.setAmounts(inventory.getPrice() * inventory.getQuantity());
-            // 获取当前物料所处仓库
-            Integer depositoryId = inventory.getDepositoryId();
-            // 获取当前物料所处库位
-            Integer mid = inventory.getId();
-            List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(mid, depositoryId);
-            StringBuilder placeCode = new StringBuilder();
-            StringBuilder placeKingdeeCode = new StringBuilder();
-            for (PlaceP placeP : placeByMidAndDid) {
-                placeKingdeeCode.append(placeP.getKingdeecode()).append(" ");
-                placeCode.append(placeP.getCode()).append(" ");
-            }
-            if (depositoryId != null) {
-                Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId);
-                String code = depositoryRecordById.getCode();
-                inventory.setDepositoryCode(code);
-            }
-            inventory.setPlaceCode(placeCode.toString());
-            inventory.setPlaceKingdeeCode(placeKingdeeCode.toString());
+        return pack(list);
+    }
+
+    /**
+     * 根据条件查询符合条件的库存数量
+     * @param map
+     * @return
+     */
+    @Override
+    public Integer findInventoryCountByDids(Map<String, Object> map) {
+        return materialMapper.findInventoryCountByDids(map);
+    }
+
+    /**
+     * 根据条件查询符合条件的库存
+     *
+     * @param map
+     * @return
+     */
+    @Override
+    public List<InventoryP> findInventoryByDids(Map<String, Object> map) {
+        Integer size = 10, page = 1;
+        if (map.containsKey("size")) {
+            size = ObjectFormatUtil.toInteger(map.get("size"));
+            map.put("size", size);
         }
+        if (map.containsKey("page")) {
+            page = ObjectFormatUtil.toInteger(map.get("page"));
+            map.put("begin", (page - 1) * size);
+        }
+        Object state = 1;
+        if (map.containsKey("state")) {
+            state = map.get("state");
+        }
+        map.put("state", state);
+        List<Inventory> list = materialMapper.findInventoryByDids(map);
         return pack(list);
     }
 
@@ -586,7 +596,7 @@ public class MaterialServiceImpl implements MaterialService {
             for (MaterialAndPlaceForViewP materialByDidsAndMid : placeAndMaterialByDidsAndMid
             ) {
                 materialByDidsAndMid.setInventory(materialByDidsAndMid.getInventory() / 100);
-                if(materialByDidsAndMid.getMbrand() == null){
+                if (materialByDidsAndMid.getMbrand() == null) {
                     materialByDidsAndMid.setMbrand("");
                 }
             }
@@ -754,10 +764,34 @@ public class MaterialServiceImpl implements MaterialService {
      */
     private List<InventoryP> pack(List<Inventory> list) {
         List<InventoryP> result = new ArrayList<>(list.size());
+
         for (Inventory inventory : list) {
+            if (inventory.getPrice() != null) {
+                inventory.setPrice(inventory.getPrice() / 100);
+            } else {
+                inventory.setPrice(0.0);
+            }
+            inventory.setAmounts(inventory.getPrice() * inventory.getQuantity());
+            // 获取当前物料所处仓库
+            Integer depositoryId = inventory.getDepositoryId();
+            // 获取当前物料所处库位
+            Integer mid = inventory.getId();
+            List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(mid, depositoryId);
+            StringBuilder placeCode = new StringBuilder();
+            StringBuilder placeKingdeeCode = new StringBuilder();
+            for (PlaceP placeP : placeByMidAndDid) {
+                placeKingdeeCode.append(placeP.getKingdeecode()).append(" ");
+                placeCode.append(placeP.getCode()).append(" ");
+            }
+            if (depositoryId != null) {
+                Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId);
+                String code = depositoryRecordById.getCode();
+                inventory.setDepositoryCode(code);
+            }
+            inventory.setPlaceCode(placeCode.toString());
+            inventory.setPlaceKingdeeCode(placeKingdeeCode.toString());
             InventoryP m = new InventoryP(inventory);
             Integer warningCount = 0;
-            Integer depositoryId = inventory.getDepositoryId();
             if (depositoryId != null) {
                 m.setDepositoryName(depositoryMapper.findDepositoryNameById(depositoryId));
                 m.setWarehouseManager(depositoryMapper.findUserNameByDepositoryId(depositoryId));
@@ -807,10 +841,6 @@ public class MaterialServiceImpl implements MaterialService {
             m.setTypeId(materialTypeByOldId.getOldId());
             m.setWarningCount(warningCount);
 
-            // 查询当前物料在该仓库中的库位位置
-            List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(m.getId(), m.getDepositoryId());
-
-
             Map<String, Double> splitInventoryForUnit = new HashMap<>();
             splitInventoryForUnit.put(inventory.getUnit(), (double) inventory.getQuantity() / 100);
             m.setBaseUnitQuantity((double) inventory.getQuantity() / 100);
@@ -988,12 +1018,11 @@ public class MaterialServiceImpl implements MaterialService {
             // 如果该物料存在
             Inventory material = inventory.get(0);
 
-            if(map.containsKey("remark")){
+            if (map.containsKey("remark")) {
                 material.setRemark(map.get("remark").toString());
             }
 
 
-
             double quantity = Double.parseDouble(map.get("quantity").toString());
             double quantity_residue = 0;
             int splitInfoScaleQuantity = 0;
@@ -2706,7 +2735,7 @@ public class MaterialServiceImpl implements MaterialService {
         for (MaterialAndPlaceForViewP placeAndPlaceForViewP : placeAndMaterialByCondition
         ) {
             placeAndPlaceForViewP.setInventory(placeAndPlaceForViewP.getInventory() / 100);
-            if(placeAndPlaceForViewP.getMbrand() == null){
+            if (placeAndPlaceForViewP.getMbrand() == null) {
                 placeAndPlaceForViewP.setMbrand("");
             }
         }
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
index f253360c..906277f1 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
@@ -352,6 +352,111 @@
         </if>
     </select>
 
+
+    <select id="findInventoryByDids" resultMap="InventoryMap" parameterType="map">
+        SELECT
+        <include refid="allColumnsAndTypeNameOnViewByInventory"/>
+        from findInventory
+        where 1 = 1
+        and depositoryId in
+        <foreach collection="depositoryIds" index="index" item="did" open="(" separator="," close=")">
+            #{did}
+        </foreach>
+        <if test="mid != null">
+            and mid = #{mid}
+        </if>
+        <if test="mname != null and mname != ''">
+            AND mname LIKE CONCAT('%', #{mname}, '%')
+        </if>
+        <if test="version != null">
+            and version = #{version}
+        </if>
+        <if test="quantity != null">
+            AND quantity = #{quantity}
+        </if>
+        <if test="price != null">
+            AND price = #{price}
+        </if>
+        <if test="materialTypeId != null">
+            AND mtid = #{materialTypeId}
+        </if>
+        <if test="state != null and state != ''">
+            And mstate = #{state}
+        </if>
+        <if test="mcode != null and mcode != '' ">
+            and mcode = #{mcode}
+        </if>
+        <if test="shelfLife != null">
+            and #{shelfLife} >= shelfLife
+        </if>
+        <if test="producedDate != null">
+            and producedDate >= #{producedDate}
+        </if>
+        <if test="productionPlace != null and productionPlace !=''">
+            and productionPlace = #{productionPlace}
+        </if>
+        <if test="brand != '' and brand != null">
+            and brand LIKE CONCAT('%', #{brand}, '%')
+        </if>
+        <if test="remark != '' and remark != null">
+            and remark LIKE CONCAT('%', #{remark}, '%')
+        </if>
+        <if test="begin != null and size != null">
+            LIMIT #{begin},#{size}
+        </if>
+    </select>
+
+
+    <select id="findInventoryCountByDids" resultType="int" parameterType="map">
+        SELECT
+        COUNT(*)
+        from findInventory
+        where 1 = 1
+        and depositoryId in
+        <foreach collection="depositoryIds" index="index" item="did" open="(" separator="," close=")">
+            #{did}
+        </foreach>
+        <if test="mid != null">
+            and mid = #{mid}
+        </if>
+        <if test="mname != null and mname != ''">
+            AND mname LIKE CONCAT('%', #{mname}, '%')
+        </if>
+        <if test="version != null">
+            and version = #{version}
+        </if>
+        <if test="quantity != null">
+            AND quantity = #{quantity}
+        </if>
+        <if test="price != null">
+            AND price = #{price}
+        </if>
+        <if test="materialTypeId != null">
+            AND mtid = #{materialTypeId}
+        </if>
+        <if test="state != null and state != ''">
+            And mstate = #{state}
+        </if>
+        <if test="mcode != null and mcode != '' ">
+            and mcode = #{mcode}
+        </if>
+        <if test="shelfLife != null">
+            and #{shelfLife} >= shelfLife
+        </if>
+        <if test="producedDate != null">
+            and producedDate >= #{producedDate}
+        </if>
+        <if test="productionPlace != null and productionPlace !=''">
+            and productionPlace = #{productionPlace}
+        </if>
+        <if test="brand != '' and brand != null">
+            and brand LIKE CONCAT('%', #{brand}, '%')
+        </if>
+        <if test="remark != '' and remark != null">
+            and remark LIKE CONCAT('%', #{remark}, '%')
+        </if>
+    </select>
+
     <!--根据条件查询库存-->
     <select id="findInventoryForImport" resultMap="InventoryMap" parameterType="map">
         SELECT