出库-分配管理-显示库位名称

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * Entity基类
- * 
+ *
  * @author ruoyi
  */
 public class BaseEntity implements Serializable

ruoyi-ui/src/views/wms/allocation/index.vue

@@ -106,7 +106,7 @@
       </el-table-column>
       <el-table-column label="分配数量" align="center" prop="qty" />
       <el-table-column label="拣货数量" align="center" prop="pickQty" />
-      <el-table-column label="待检库位" align="center" prop="locationId" />
+      <el-table-column label="待检库位" align="center" prop="locationNo" />
 <!--      <el-table-column label="已拣库位" align="center" prop="pickToLocation" />-->
 <!--      <el-table-column label="拣货事务" align="center" prop="pickTransactionId" />-->
       <el-table-column
@@ -273,6 +273,8 @@ export default {
         orderNo: null,
         status: null,
         createDate: null,
+        locationNo:null
+
       },
       // 表单参数
       form: {},
@@ -345,7 +347,8 @@ export default {
         userdefine2: null,
         userdefine3: null,
         userdefine4: null,
-        pickQty: null
+        pickQty: null,
+        locationNo:null
       };
       this.resetForm("form");
     },

warewms-ams/src/main/java/com/ruoyi/ams/order/domain/ActAllocationDetails.java

@@ -35,6 +35,10 @@ public class ActAllocationDetails extends BaseEntity
     @Excel(name = "待检库位")
     private Long locationId;
 
+    /** 库位编码 */
+    @Excel(name = "库位编码")
+    private String locationNo;
+
     /** 叫料待检事务id */
     @Excel(name = "叫料待检事务id")
     private String callTransactionId;
@@ -143,6 +147,13 @@ public class ActAllocationDetails extends BaseEntity
     {
         return locationId;
     }
+    public String getLocationNo() {
+        return locationNo;
+    }
+
+    public void setLocationNo(String locationNo) {
+        this.locationNo = locationNo;
+    }
     public void setCallTransactionId(String callTransactionId)
     {
         this.callTransactionId = callTransactionId;
@@ -398,6 +409,7 @@ public class ActAllocationDetails extends BaseEntity
             .append("callTransactionId", getCallTransactionId())
             .append("status", getStatus())
             .append("lotnum", getLotnum())
+            .append("locationNo", getLocationNo())
             .append("qty", getQty())
             .append("pickTransactionId", getPickTransactionId())
             .append("pickToLocation", getPickToLocation())

warewms-ams/src/main/resources/mapper/ams/LotattConfigMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ams.config.mapper.LotattConfigMapper">
-    
+
     <resultMap type="LotattConfig" id="LotattConfigResult">
         <result property="id"    column="id"    />
         <result property="lotattId"    column="lotatt_id"    />
@@ -37,12 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLotattConfigVo"/>
         where status = 0
     </select>
-    
+
     <select id="selectLotattConfigById" parameterType="Long" resultMap="LotattConfigResult">
         <include refid="selectLotattConfigVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertLotattConfig" parameterType="LotattConfig" useGeneratedKeys="true" keyProperty="id">
         insert into lotatt_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteLotattConfigByIds" parameterType="String">
-        delete from lotatt_config where id in 
+        delete from lotatt_config where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -118,4 +118,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="lotattConfigComboDict" resultType="string">
         select input_scope from lotatt_config where input_type = 'ComboBox' and input_scope is not null group by input_scope
     </select>
-</mapper>
+</mapper>

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

@@ -43,6 +43,7 @@
         <result property="lotatt16"    column="lotatt16"/>
         <result property="lotatt17"    column="lotatt17"/>
         <result property="lotatt18"    column="lotatt18"/>
+        <result property="locationNo"    column="location_no"/>
     </resultMap>
 
     <resultMap type="com.ruoyi.ams.order.form.ActAllocationDetailsFrom" id="ActAllocationDetailsInvLotAttResult">
@@ -115,19 +116,22 @@
         ,t2.lotatt01,t2.lotatt02,t2.lotatt03,t2.lotatt04,t2.lotatt05,t2.lotatt06
         ,t2.lotatt07,t2.lotatt08,t2.lotatt09,t2.lotatt10,t2.lotatt11,t2.lotatt12
         ,t2.lotatt13,t2.lotatt14,t2.lotatt15,t2.lotatt16,t2.lotatt17,t2.lotatt18
+        ,t3.location_no
         from act_allocation_details t1
         LEFT JOIN inv_lot_att t2 on t2.lotnum = t1.lotnum
+        left join base_location_info t3 on t3.id=t1.location_id
         <where>
-            <if test="allocationId != null  and allocationId != ''"> and allocation_id = #{allocationId}</if>
-            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
-            <if test="locationId != null  and locationId != ''"> and location_id = #{locationId}</if>
-            <if test="material != null  and material != ''"> and material = #{material}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="allocationId != null  and allocationId != ''"> and t1.allocation_id = #{allocationId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and t1.order_no = #{orderNo}</if>
+            <if test="locationId != null  and locationId != ''"> and t1.location_id = #{locationId}</if>
+            <if test="locationNo != null  and locationNo != ''"> and t3.location_no = #{locationNo}</if>
+            <if test="material != null  and material != ''"> and t1.material = #{material}</if>
+            <if test="status != null  and status != ''"> and t1.status = #{status}</if>
             <if test="params.beginTime != null and params.beginTime != ''">
-                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+                AND date_format(t1.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
             <if test="params.endTime != null and params.endTime != ''">
-                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+                AND date_format(t1.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
     </select>