优化根据仓库和商品查询单据列表接口

jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java

@@ -72,10 +72,11 @@ public class DepotItemController {
             @RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize,
             @RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage,
             @RequestParam(value = "depotIds",required = false) String depotIds,
+            @RequestParam(value = "sku",required = false) String sku,
             @RequestParam("materialId") Long mId,
             HttpServletRequest request)throws Exception {
         Map<String, Object> objectMap = new HashMap<>();
-        List<DepotItemVo4DetailByTypeAndMId> list = depotItemService.findDetailByDepotIdsAndMaterialIdList(depotIds, mId, (currentPage-1)*pageSize, pageSize);
+        List<DepotItemVo4DetailByTypeAndMId> list = depotItemService.findDetailByDepotIdsAndMaterialIdList(depotIds, sku, mId, (currentPage-1)*pageSize, pageSize);
         JSONArray dataArray = new JSONArray();
         if (list != null) {
             for (DepotItemVo4DetailByTypeAndMId d: list) {
@@ -102,7 +103,7 @@ public class DepotItemController {
             return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
         }
         objectMap.put("rows", dataArray);
-        objectMap.put("total", depotItemService.findDetailByDepotIdsAndMaterialIdCount(depotIds, mId));
+        objectMap.put("total", depotItemService.findDetailByDepotIdsAndMaterialIdCount(depotIds, sku, mId));
         return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
     }
 

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -31,12 +31,14 @@ public interface DepotItemMapperEx {
 
     List<DepotItemVo4DetailByTypeAndMId> findDetailByDepotIdsAndMaterialIdList(
             @Param("depotIdArray") String[] depotIdArray,
+            @Param("sku") String sku,
             @Param("mId") Long mId,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
     Long findDetailByDepotIdsAndMaterialIdCount(
             @Param("depotIdArray") String[] depotIdArray,
+            @Param("sku") String sku,
             @Param("mId") Long mId);
 
     List<DepotItemVo4WithInfoEx> getDetailList(

jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java

@@ -168,28 +168,28 @@ public class DepotItemService {
         return list==null?0:list.size();
     }
 
-    public List<DepotItemVo4DetailByTypeAndMId> findDetailByDepotIdsAndMaterialIdList(String depotIds, Long mId, int offset, int rows)throws Exception {
+    public List<DepotItemVo4DetailByTypeAndMId> findDetailByDepotIdsAndMaterialIdList(String depotIds, String sku, Long mId, int offset, int rows)throws Exception {
         String [] depotIdArray = null;
         if(StringUtil.isNotEmpty(depotIds)) {
             depotIdArray = depotIds.split(",");
         }
         List<DepotItemVo4DetailByTypeAndMId> list =null;
         try{
-            list = depotItemMapperEx.findDetailByDepotIdsAndMaterialIdList(depotIdArray, mId, offset, rows);
+            list = depotItemMapperEx.findDetailByDepotIdsAndMaterialIdList(depotIdArray, sku, mId, offset, rows);
         }catch(Exception e){
             JshException.readFail(logger, e);
         }
         return list;
     }
 
-    public Long findDetailByDepotIdsAndMaterialIdCount(String depotIds, Long mId)throws Exception {
+    public Long findDetailByDepotIdsAndMaterialIdCount(String depotIds, String sku, Long mId)throws Exception {
         String [] depotIdArray = null;
         if(StringUtil.isNotEmpty(depotIds)) {
             depotIdArray = depotIds.split(",");
         }
         Long result =null;
         try{
-            result = depotItemMapperEx.findDetailByDepotIdsAndMaterialIdCount(depotIdArray, mId);
+            result = depotItemMapperEx.findDetailByDepotIdsAndMaterialIdCount(depotIdArray, sku, mId);
         }catch(Exception e){
             JshException.readFail(logger, e);
         }

jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml

@@ -165,6 +165,9 @@
             <foreach collection="depotIdArray" item="depotId" separator=",">#{depotId}</foreach>
             )
         </if>
+        <if test="sku != null and sku !=''">
+            and di.sku = #{sku}
+        </if>
         and di.material_id = #{mId}
         and ifnull(dh.delete_flag,'0') !='1'
         union all
@@ -183,6 +186,9 @@
             <foreach collection="depotIdArray" item="depotId" separator=",">#{depotId}</foreach>
             )
         </if>
+        <if test="sku != null and sku !=''">
+            and di.sku = #{sku}
+        </if>
         and di.material_id = #{mId}
         and ifnull(dh.delete_flag,'0') !='1') tb
         order by tb.oTime desc
@@ -204,6 +210,9 @@
             <foreach collection="depotIdArray" item="depotId" separator=",">#{depotId}</foreach>
             )
         </if>
+        <if test="sku != null and sku !=''">
+            and di.sku = #{sku}
+        </if>
         and di.material_id =#{mId}
         and ifnull(dh.delete_flag,'0') !='1'
         union all
@@ -216,6 +225,9 @@
             <foreach collection="depotIdArray" item="depotId" separator=",">#{depotId}</foreach>
             )
         </if>
+        <if test="sku != null and sku !=''">
+            and di.sku = #{sku}
+        </if>
         and di.material_id = #{mId}
         and ifnull(dh.delete_flag,'0') !='1') tb
     </select>