在出库查询是合并相同的名称

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@@ -983,19 +983,33 @@ public class DepositoryRecordController {
             StringBuilder depositoryName = new StringBuilder();
             double sumQuantity = 0;
             double sumPrice = 0.0;
+            List<Integer> depositoryIdList = new ArrayList<>();
+            List<String> mnameForMobiles = new ArrayList<>();
             for (ApplicationOutRecordMinP applicationOutRecordMin : applicationOutMinByParentId) {
                 // 获取子订单信息
                 // 获取出库物料信息
                 Inventory inventory = materialService.findInventoryById(applicationOutRecordMin.getMid());
-                if (inventory.getBrand() == null) {
+                String brand = inventory.getBrand();
+                String version = inventory.getVersion();
+                if (brand == null) {
                     inventory.setBrand("");
+                    brand = "";
+                }
+                if(version == null){
+                    inventory.setVersion("");
+                    version = "";
+                }
+                // 获取出库物料仓库Id
+                Integer depositoryId = applicationOutRecordMin.getDepositoryId();
+                if(!depositoryIdList.contains(depositoryId)){
+                    depositoryIdList.add(depositoryId);
                 }
-                // 获取出库物料仓库信息
+                String inventoryMname = inventory.getMname();
-                Depository depository = depositoryService.findDepositoryById(applicationOutRecordMin.getDepositoryId());
+                mname.append(inventoryMname).append(",");
-                mname.append(inventory.getMname()).append(",");
                 mcode.append(inventory.getCode()).append(",");
-                mversion.append(inventory.getBrand()).append(" ").append(inventory.getVersion()).append(",");
+                String mversionItem = brand + " "+version;
-                depositoryName.append(depository.getDname()).append(",");
+                mversion.append(mversionItem).append(",");
+                mnameForMobiles.add(inventoryMname+":"+mversionItem);
                 sumQuantity += applicationOutRecordMin.getQuantity();
                 String unit = applicationOutRecordMin.getUnit();
                 if ("-1".equals(unit)) {
@@ -1017,9 +1031,15 @@ public class DepositoryRecordController {
             outRecordP.setMcode(mcode.toString());
             outRecordP.setMname(mname.toString());
             outRecordP.setMversion(mversion.toString());
+            List<Depository> depositoryList = depositoryService.findDepositoryByIds(depositoryIdList);
+            for (Depository depository:depositoryList
+                 ) {
+                depositoryName.append(depository.getDname()).append(",");
+            }
             outRecordP.setDepositoryName(depositoryName.toString());
             outRecordP.setQuantity(sumQuantity);
             outRecordP.setPrice(sumPrice);
+            outRecordP.setMnameStringList(mnameForMobiles);
 
         }
         return new RestResponse(list, countBy, 200);

src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java

@@ -24,6 +24,14 @@ public interface PlaceMapper {
      */
     Place findPlaceById(Integer id);
 
+
+    /**
+     * 根据id批量查询库位
+     * @param ids 待查询id列表
+     * @return
+     */
+    List<Place> findPlaceByIdS(List<Integer> ids);
+
     /**
      * 根据条件查找库位
      * @param map

src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml

@@ -323,6 +323,18 @@
         FROM place p WHERE p.id = #{id}
     </select>
 
+
+    <select id="findPlaceByIdS" resultMap="placeMap" parameterType="list">
+        SELECT
+        <include refid="allColumns"/>
+        FROM place p WHERE p.id in
+        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+
+
     <select id="findPlaceAndMaterialByPid" resultMap="materialAndPlaceMap" parameterType="int">
         SELECT
         <include refid="allColumnsByMaterialAndPlace"/>

src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java

@@ -4,6 +4,8 @@ import com.dreamchaser.depository_manage.entity.ApplicationOutRecord;
 import com.dreamchaser.depository_manage.utils.DateUtil;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ApplicationOutRecordP {
     /**
@@ -21,6 +23,11 @@ public class ApplicationOutRecordP {
      */
     private String mname;
 
+    /**
+     * 物料名称列表
+     */
+    private List<String> mnameStringList;
+
     /**
      * 仓库id
      */

src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java

@@ -81,6 +81,13 @@ public interface PlaceService {
      */
     Place findPlaceById(Integer id);
 
+    /**
+     * 根据id批量查询库位
+     * @param ids 待查询id列表
+     * @return
+     */
+    List<Place> findPlaceByIdS(List<Integer> ids);
+
 
     /**
      * 根据仓库id及库位编码获取对应库位

src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java

@@ -197,6 +197,16 @@ public class PlaceServiceImpl implements PlaceService {
         return placeMapper.findPlaceById(id);
     }
 
+    /**
+     * 根据id批量查询库位
+     * @param ids 待查询id列表
+     * @return
+     */
+    @Override
+    public List<Place> findPlaceByIdS(List<Integer> ids) {
+        return placeMapper.findPlaceByIdS(ids);
+    }
+
     /**
      * 根据仓库id及库位编码获取对应库位
      *

src/main/resources/templates/pages/depository/table-out_mobile.html

@@ -127,11 +127,17 @@
                     result = res.data;
                     lis.push("<div class='clearfix'>");
                     for (let i = 0; i < result.length; i++) {
+                        let mnameList = result[i].mnameStringList;
+                        let mnameItem = "";
+                        $.each(mnameList,function (index,item) {
+                            let pItem = '<p>'+"物料名称："+item+"</p>";
+                            mnameItem += pItem;
+                        });
+
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                             + result[i].id + ')"><div class="layui-card-header"><h3 style="font-weight: bold">' + result[i].applicantName + "的出库申请" + '</h3></div>');
                         lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #666;font-size: 15px;">'
-                            + '<p>' + "物料名称："+ result[i].mname + '</p>'
+                            + mnameItem
-                            + '<p>' + "物料型号：" +result[i].mversion + '</p>'
                             + '<p>' + "申请总数：" + result[i].quantity + '</p>'
                             + '<p>' + "所处仓库：" + result[i].depositoryName + '</p>'
                             + '<p>' + "申请时间："+ result[i].applicantTime + '</p>'