From e3826d6333f6b5b6009d8eb9afe26bbbfa4dc316 Mon Sep 17 00:00:00 2001 From: rcx <3084692334@qq.com> Date: Wed, 9 Sep 2026 17:23:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(oms):=20=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=8F=A3=E5=BE=84=E4=BF=AE=E6=AD=A3-=E6=94=B9?= =?UTF-8?q?=E4=B8=BAissue=5Fstatus=3D4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题：OMS执行出库单status不随WMS出库完成流转（回写代码被注释），推送创建的单据status也是默认值， 原过滤条件 status in(9,12,13)/status=5 会导致明细页查不到数据。 修复： - 出库明细SQL：status in(9,12,13) 改为 issue_status=4（issueStatus: 0-已创建 2-已审核 3-已驳回 4-已出库） - 入库明细SQL：status=5 改为 issue_status=4（WMS回写status=5时同步issueStatus=4，推送创建直接置4） - 两个明细SQL新增返回 b.issue_status，前端状态列绑定issueStatus - WithOrderPO新增issueStatus字段（导出"单据状态"列自动转文字），outOrderStatus/inOrderStatus保留返回但不再导出 --- .../po/ExecutionInMaterialDetailWithOrderPO.java | 7 +++++-- .../po/ExecutionOutMaterialDetailWithOrderPO.java | 7 +++++-- .../executionInMaterialDetailMapper.xml | 7 +++++-- .../ExecutionOutMaterialDetailMapper.xml | 9 ++++++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java index 8b1e53786..ee731a970 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java @@ -17,10 +17,13 @@ import java.util.Date; public class ExecutionInMaterialDetailWithOrderPO extends ExecutionInMaterialDetailPO { private static final long serialVersionUID = 1L; - @ApiModelProperty("入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭") - @Excel(name = "入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭") + @ApiModelProperty("入库单流转状态(参考): 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭") private Integer inOrderStatus; + @ApiModelProperty("入库单展示状态: 0-已创建 2-已审核 3-已驳回 4-已入库（WMS回写status=5时同步/推送创建时置4，前端状态列绑定此字段）") + @Excel(name = "单据状态", readConverterExp = "0=已创建,2=已审核,3=已驳回,4=已入库") + private Integer issueStatus; + @ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过") @Excel(name = "入库单审核状态: 1-未审核 2-审核不通过 3-审核通过") private Integer inOrderAuditStatus; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java index cf87264db..4a8c47fa2 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java @@ -19,10 +19,13 @@ import java.util.Date; public class ExecutionOutMaterialDetailWithOrderPO extends ExecutionOutMaterialDetailPO { private static final long serialVersionUID = 1L; - @ApiModelProperty("出库单状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") - @Excel(name = "出库单状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接") + @ApiModelProperty("出库单流转状态(参考): 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接；WMS出库完成不回写此字段") private Integer outOrderStatus; + @ApiModelProperty("出库单展示状态: 0-已创建 2-已审核 3-已驳回 4-已出库（WMS出库完成/推送创建时回写，前端状态列绑定此字段）") + @Excel(name = "单据状态", readConverterExp = "0=已创建,2=已审核,3=已驳回,4=已出库") + private Integer issueStatus; + @ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过") @Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过") private Integer outOrderAuditStatus; diff --git a/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml index 0c295a199..6e815bb7b 100644 --- a/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml +++ b/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml @@ -365,6 +365,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -409,6 +410,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.shipper_name as order_shipper_name, b.status as in_order_status, b.audit_status as in_order_audit_status, + b.issue_status as issue_status, b.warehouse_date from execution_in_material_detail a left join execution_stock_in_order b on a.in_order_number = b.in_order_number @@ -450,8 +452,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.order_type_code = #{inOrderTypeCode} - - and b.status = 5 + + and b.issue_status = 4 and b.expect_time >= #{inOrderExpectStartTime} diff --git a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml index c4674e9bd..e6123fcb5 100644 --- a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml +++ b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml @@ -454,6 +454,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" id="OutMaterialDetailWithOrderResult" extends="MaterialDetailResult"> + @@ -502,7 +503,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.OUTBOUND_DATE as order_outbound_date, b.OUTBOUND_TIME as order_outbound_time, b.status as out_order_status, - b.audit_status as out_order_audit_status + b.audit_status as out_order_audit_status, + b.issue_status as issue_status from execution_out_material_detail a left join execution_stock_out_order b on a.out_order_number = b.out_order_number left join NGWL_TEST_WMS.material_base_info c on a.material_base_info_id = c.material_base_info_id @@ -543,8 +545,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.order_type_code = #{outOrderTypeCode} - - and b.status in (9, 12, 13) + + and b.issue_status = 4 and b.expect_time >= #{outOrderExpectStartTime}