From 0b45ad181f0a413dd8482dc7220788cae464a30b Mon Sep 17 00:00:00 2001 From: rcx <3084692334@qq.com> Date: Thu, 10 Sep 2026 16:18:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(oms/wms):=20=E5=87=BA=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=9B=9E=E6=98=BE?= =?UTF-8?q?/=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6/=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A5=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 出库明细查询新增orderTypeCode（精确）/orderTypeName（模糊）查询条件 - OMS出库明细SQL补查b.order_type_code/name，响应回显orderTypeCode/orderTypeName（原恒为null） - WMS出库明细导出新增"业务单据类型"列（第31列） --- .../todo/ExecutionOutMaterialDetailQueryDTO.java | 6 ++++++ .../repository/todo/QueryOrderOverStockDO.java | 6 ++++++ .../ExecutionOutMaterialDetailMapper.xml | 10 ++++++++++ .../repository/po/OutMaterialDetailExportPO.java | 3 +++ .../OutMaterialDetailQueryDTO.java | 6 ++++++ .../OutMaterialDetail/OutMaterialDetailMapper.xml | 15 ++++++++++++++- 6 files changed, 45 insertions(+), 1 deletion(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/todo/ExecutionOutMaterialDetailQueryDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/todo/ExecutionOutMaterialDetailQueryDTO.java index 8d51f6774..1611fc6be 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/todo/ExecutionOutMaterialDetailQueryDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/todo/ExecutionOutMaterialDetailQueryDTO.java @@ -45,6 +45,12 @@ public class ExecutionOutMaterialDetailQueryDTO extends BaseVOEntity { @ApiModelProperty("出库单类型编码") private String outOrderTypeCode; + @ApiModelProperty("出库单类型编码(与outOrderTypeCode同义)") + private String orderTypeCode; + + @ApiModelProperty("出库单类型名称(模糊查询)") + private String orderTypeName; + @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") private Integer outStatus; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/QueryOrderOverStockDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/QueryOrderOverStockDO.java index 332e32915..bb55c5bae 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/QueryOrderOverStockDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/QueryOrderOverStockDO.java @@ -102,6 +102,12 @@ public class QueryOrderOverStockDO extends BaseVOEntity { @Excel(name = "出库单类型编码") private String outOrderTypeCode; + @ApiModelProperty("出库单类型编码(与outOrderTypeCode同义)") + private String orderTypeCode; + + @ApiModelProperty("出库单类型名称") + private String orderTypeName; + @ApiModelProperty("出库单类型名称") @Excel(name = "出库单类型名称") private String outOrderTypeName; diff --git a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml index 83b4ad5ba..b03103e99 100644 --- a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml +++ b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml @@ -456,6 +456,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -501,6 +503,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.shipper_id as order_shipper_id, b.shipper_code as order_shipper_code, b.shipper_name as order_shipper_name, + b.order_type_code, + b.order_type_name, b.OUTBOUND_DATE as order_outbound_date, b.OUTBOUND_TIME as order_outbound_time, b.status as out_order_status, @@ -546,6 +550,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.order_type_code = #{outOrderTypeCode} + + and b.order_type_code = #{orderTypeCode} + + + and b.order_type_name like concat('%', #{orderTypeName}, '%') + and b.issue_status = 4 diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailExportPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailExportPO.java index 78a955ca1..aad0e5b0d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailExportPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailExportPO.java @@ -105,4 +105,7 @@ public class OutMaterialDetailExportPO { @Excel(name = "单据状态", sort = 30, readConverterExp = "9=已出库,12=已复核,13=已交接") private Integer outOrderStatus; + + @Excel(name = "业务单据类型", sort = 31) + private String orderTypeName; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailQueryDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailQueryDTO.java index 450819254..30044e59d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailQueryDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailQueryDTO.java @@ -41,6 +41,12 @@ public class OutMaterialDetailQueryDTO extends BaseVOEntity { @ApiModelProperty("出库单类型编码") private String outOrderTypeCode; + @ApiModelProperty("出库单类型编码(与outOrderTypeCode同义)") + private String orderTypeCode; + + @ApiModelProperty("出库单类型名称(模糊查询)") + private String orderTypeName; + @ApiModelProperty("物料基础信息id") private Long materialBaseInfoId; diff --git a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml index 2ae53ff48..ea10d3357 100644 --- a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml @@ -466,6 +466,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.order_type_code = #{outOrderTypeCode} + + and b.order_type_code = #{orderTypeCode} + + + and b.order_type_name like concat('%', #{orderTypeName}, '%') + and b.status in (9, 12, 13) @@ -523,7 +529,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.in_order_number as inOrderNumber, c.material_classify_name as materialClassifyName, CAST(NULL AS DECIMAL) as totalAmount, - b.status as outOrderStatus + b.status as outOrderStatus, + b.order_type_name as orderTypeName from out_material_detail a join stock_out_order b on a.out_order_number = b.out_order_number left join material_base_info c on a.material_base_info_id = c.material_base_info_id @@ -565,6 +572,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.order_type_code = #{outOrderTypeCode} + + and b.order_type_code = #{orderTypeCode} + + + and b.order_type_name like concat('%', #{orderTypeName}, '%') + and b.status in (9, 12, 13) and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') >= #{outboundDateStart}