From a71d1c013a68022d8139b7b094d553e812361850 Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 11 Jun 2025 16:23:06 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=A7=BB=E5=BA=93=E5=90=88?= =?UTF-8?q?=E5=BA=93=E8=AE=B0=E5=BD=95=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E3=80=81=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hw/wms/domain/WmsRawOutstockDetail.java | 13 +++++++++++++ .../src/main/resources/mapper/wms/WmsMoveMapper.xml | 7 +------ .../mapper/wms/WmsRawOutstockDetailMapper.xml | 3 ++- .../wms/info/rawoutstock/rawOutstockDetail.vue | 1 + 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java index 7ff77488..07cd3b74 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java +++ b/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; } diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsMoveMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsMoveMapper.xml index 5a9b43ba..3194881a 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsMoveMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsMoveMapper.xml @@ -247,20 +247,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and wm.audit_status = #{auditStatus} and wm.execute_status = #{executeStatus} and wm.apply_by like concat('%', #{applyBy},'%') - - and wm.apply_date between #{params.beginApplyTime} and #{params.endApplyTime} - and wm.begin_time between #{params.beginBeginTime} and #{params.endBeginTime} - and wm.end_time between #{params.beginEndTime} and #{params.endEndTime} - and execute_status in (${executeStatusStr}) - + order by wm.move_id desc diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml index 7d7acf2f..96df4ff9 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml @@ -36,12 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - 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