change - 移库合库记录倒序排序、出库记录增加备注信息的显示

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java

@@ -145,6 +145,11 @@ public class WmsRawOutstockDetail extends BaseEntity {
     @Excel(name = "每托数量")
     private BigDecimal stackAmount;
 
+    /**
+     * 备注字段，记录安全库位出库给谁用
+     */
+    @Excel(name = "备注")
+    private String tips;
 
     private String materialCode;
 
@@ -203,6 +208,14 @@ public class WmsRawOutstockDetail extends BaseEntity {
         this.tondBaseId = tondBaseId;
     }
 
+    public String getTips() {
+        return tips;
+    }
+
+    public void setTips(String tips) {
+        this.tips = tips;
+    }
+
     public void setRawOutstockDetailId(Long rawOutstockDetailId) {
         this.rawOutstockDetailId = rawOutstockDetailId;
     }

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsMoveMapper.xml

@@ -247,20 +247,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditStatus != null  and auditStatus != ''"> and wm.audit_status = #{auditStatus}</if>
             <if test="executeStatus != null  and executeStatus != ''"> and wm.execute_status = #{executeStatus}</if>
             <if test="applyBy != null  and applyBy != ''"> and wm.apply_by like concat('%', #{applyBy},'%')</if>
-
-
             <if test="params.beginApplyTime != null and params.beginApplyTime != '' and params.endApplyTime != null and params.endApplyTime != ''">
                 and wm.apply_date between #{params.beginApplyTime} and #{params.endApplyTime}</if>
-
             <if test="params.beginBeginTime != null and params.beginBeginTime != '' and params.endBeginTime != null and params.endBeginTime != ''">
                 and wm.begin_time between #{params.beginBeginTime} and #{params.endBeginTime}</if>
-
             <if test="params.beginEndTime != null and params.beginEndTime != '' and params.endEndTime != null and params.endEndTime != ''">
                 and wm.end_time between #{params.beginEndTime} and #{params.endEndTime}</if>
-
             <if test="executeStatusStr != null  and executeStatusStr != ''"> and execute_status in (${executeStatusStr})</if>
-
         </where>
+        order by wm.move_id desc
     </select>
 
 

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml

@@ -36,12 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"    column="material_name"    />
         <result property="materialSpec"    column="material_spec"    />
         <result property="barcodeSpec"    column="barcode_spec"    />
+        <result property="tips"    column="tips"    />
         <result property="productId"    column="product_id"    />
         <result property="tondBaseId"    column="tond_base_id"    />
     </resultMap>
 
     <sql id="selectWmsRawOutstockDetailVo">
-        select raw_outstock_detail_id, raw_outstock_id, location_code, material_barcode, material_id, instock_batch, material_production_Date, plan_amount, outstock_amount, execute_status, erp_status,erp_amount, outstock_person, outstock_time, outstock_way, machine_name, quality_status, create_by, create_date, update_by, update_date, stack_amount from wms_raw_outstock_detail wrod
+        select raw_outstock_detail_id, raw_outstock_id, location_code, material_barcode, material_id, instock_batch, material_production_Date, plan_amount, outstock_amount, execute_status, erp_status,erp_amount, outstock_person, outstock_time, outstock_way, machine_name, quality_status, create_by, create_date, update_by, update_date, stack_amount, tips from wms_raw_outstock_detail wrod
     </sql>
 
     <select id="selectWmsRawOutstockDetailList" parameterType="WmsRawOutstockDetail" resultMap="WmsRawOutstockDetailResult">

hw-ui/src/views/wms/info/rawoutstock/rawOutstockDetail.vue

@@ -131,6 +131,7 @@
           </template>
         </el-table-column>
         <el-table-column label="同步ERP数量" align="center" prop="erpAmount" />
+        <el-table-column label="备注" align="center" prop="tips" width="120"/>
       </el-table>
     </el-form>
     <div slot="footer" class="dialog-footer">