库位视图显示-优化

(cherry picked from commit 72ca190675ab30422ba657a607b177afb5ec92ed)

warewms-ams/src/main/java/com/ruoyi/ams/locationView/service/LocationViewService.java

@@ -17,10 +17,7 @@ import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by IntelliJ IDEA.
@@ -132,7 +129,7 @@ public class LocationViewService {
                 int index = 0;
                 for (BaseLocationGuiDTO b : locList) {
                     // 层号
-                    String shiftNo = b.getShiftNo();
+                    String shiftNo = b.getRowNoShiftNo();
                     // 列号
                     String locNo = b.getColNo();
                     index++;
@@ -185,6 +182,28 @@ public class LocationViewService {
             }
             guiDTOS.add(basLocationGuiExtDTO);
         }
+        // 填充
+        for (BasLocationGuiExtDTO guiDTO : guiDTOS) {
+            List<BasLocationGuiColDTO> basLocationGuiColDTOList = guiDTO.getBasLocationGuiColDTOS();
+            int maxSize = basLocationGuiColDTOList
+                    .stream()
+                    .mapToInt(t -> t.getBaseLocationGuiDTOList().size())
+                    .max()
+                    .getAsInt();
+            basLocationGuiColDTOList.stream().forEach(v -> {
+                int size = v.getBaseLocationGuiDTOList().size();
+                List<BaseLocationGuiDTO> locationGuiDTOList = v.getBaseLocationGuiDTOList();
+                int num = 0;
+                if (size < maxSize) {
+                    num = maxSize - size;
+                    for (int i = 0; i < num; i++) {
+                        BaseLocationGuiDTO dto = new BaseLocationGuiDTO();
+                        locationGuiDTOList.add(dto);
+                    }
+                }
+            });
+
+        }
         return guiDTOS;
     }
 }

warewms-ams/src/main/resources/mapper/docOrder/ActAllocationDetailsMapper.xml

@@ -45,47 +45,6 @@
         <result property="lotatt18"    column="lotatt18"/>
     </resultMap>
 
-    <resultMap type="com.ruoyi.ams.order.form.ActAllocationDetailsFrom" id="ActAllocationDetailsInvLotAttResult">
-    <result property="allocationId" column="allocation_id"/>
-    <result property="orderNo" column="order_no"/>
-    <result property="lineNo" column="line_no"/>
-    <result property="material" column="material"/>
-    <result property="locationId" column="location_id"/>
-    <result property="callTransactionId" column="call_transaction_id"/>
-    <result property="status" column="status"/>
-    <result property="lotnum" column="lotnum"/>
-    <result property="qty" column="qty"/>
-    <result property="pickTransactionId" column="pick_transaction_id"/>
-    <result property="pickToLocation" column="pick_to_location"/>
-    <result property="pickQty" column="pick_qty"/>
-    <result property="createBy" column="create_by"/>
-    <result property="createTime" column="create_time"/>
-    <result property="updateBy" column="update_by"/>
-    <result property="updateTime" column="update_time"/>
-    <result property="userdefine1" column="userdefine1"/>
-    <result property="userdefine2" column="userdefine2"/>
-    <result property="userdefine3" column="userdefine3"/>
-    <result property="userdefine4" column="userdefine4"/>
-    <result property="lotatt01" column="lotatt01"/>
-    <result property="lotatt02" column="lotatt02"/>
-    <result property="lotatt03" column="lotatt04"/>
-    <result property="lotatt04" column="lotatt04"/>
-    <result property="lotatt05" column="lotatt05"/>
-    <result property="lotatt06" column="lotatt06"/>
-    <result property="lotatt07" column="lotatt07"/>
-    <result property="lotatt08" column="lotatt08"/>
-    <result property="lotatt09" column="lotatt09"/>
-    <result property="lotatt10" column="lotatt10"/>
-    <result property="lotatt11" column="lotatt11"/>
-    <result property="lotatt12" column="lotatt12"/>
-    <result property="lotatt13" column="lotatt13"/>
-    <result property="lotatt14" column="lotatt14"/>
-    <result property="lotatt15" column="lotatt15"/>
-    <result property="lotatt16" column="lotatt16"/>
-    <result property="lotatt17" column="lotatt17"/>
-    <result property="lotatt18" column="lotatt18"/>
-    </resultMap>
-
     <sql id="selectActAllocationDetailsVo">
         select allocation_id,
                order_no,

warewms-base/src/main/java/com/ruoyi/base/domain/dto/BasLocationGuiColDTO.java

@@ -3,6 +3,7 @@ package com.ruoyi.base.domain.dto;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ public class BasLocationGuiColDTO {
     /**
      * 列号对应的库存信息
      */
-    private List<BaseLocationGuiDTO> baseLocationGuiDTOList = new ArrayList<>();
+    private List<BaseLocationGuiDTO> baseLocationGuiDTOList = new LinkedList<>();
 
     public void addBaslocation(BaseLocationGuiDTO baseLocationGuiDTO) {
         baseLocationGuiDTOList.add(baseLocationGuiDTO);

warewms-base/src/main/java/com/ruoyi/base/domain/dto/BaseLocationGuiDTO.java

@@ -30,6 +30,7 @@ public class BaseLocationGuiDTO extends BaseLocationInfo {
     private String sku;
     private String skuName;
     private String isEmptyPlate;
+    private String rowNoShiftNo;
 
     public String getLotatt01() {
         return lotatt01;
@@ -198,4 +199,12 @@ public class BaseLocationGuiDTO extends BaseLocationInfo {
     public void setIsEmptyPlate(String isEmptyPlate) {
         this.isEmptyPlate = isEmptyPlate;
     }
+
+    public String getRowNoShiftNo() {
+        return rowNoShiftNo;
+    }
+
+    public void setRowNoShiftNo(String rowNoShiftNo) {
+        this.rowNoShiftNo = rowNoShiftNo;
+    }
 }

warewms-base/src/main/resources/mapper/base/BaseLocationInfoMapper.xml

@@ -582,7 +582,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 库位视图-->
     <select id="queryByListAllInvLotAttView" resultType="com.ruoyi.base.domain.dto.BaseLocationGuiDTO" parameterType="Object">
         select t1.zone_id zoneId,t1.id,t1.location_no locationNo
-             ,t1.shift_no shiftNo,t1.shift_index shiftIndex,t1.col_no colNo,t1.col_index colIndex
+             ,CONCAT(t1.row_no,t1.shift_no) rowNoShiftNo,t1.shift_no shiftNo,t1.shift_index shiftIndex,t1.col_no colNo,t1.col_index colIndex
              ,t1.stock_status stockStatus,t1.is_empty isEmpty
              ,t4.lotatt01,t4.lotatt02,t4.lotatt03,t4.lotatt04,t4.lotatt05,t4.lotatt06
              ,t4.lotatt07,t4.lotatt08,t4.lotatt09,t4.lotatt10,t4.lotatt11,t4.lotatt12
@@ -597,7 +597,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t1.zone_id = #{zoneId} and t1.id not in (99997, 99998, 99999)
         <choose>
             <when test=" sort == '1'.toString() ">
-                ORDER BY t1.shift_no + 0,t1.location_no
+                ORDER BY CONCAT(t1.row_no,t1.shift_no),t1.location_no
             </when >
             <when test=" sort == '2'.toString() ">
                 ORDER BY t1.col_no + 0,t1.location_no