From 244fbf9759138195c0da5cc3e1f7b5885eb37585 Mon Sep 17 00:00:00 2001 From: rcx <3084692334@qq.com> Date: Wed, 9 Sep 2026 18:20:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=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=E8=BF=94=E5=9B=9E=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0status=E5=AD=97=E6=AE=B5=EF=BC=88=E4=B8=8EoutOrderStat?= =?UTF-8?q?us/inOrderStatus=E5=90=8C=E5=80=BC=EF=BC=8C=E4=BE=BF=E4=BA=8E?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=BB=91=E5=AE=9A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/po/InMaterialDetailWithOrderPO.java | 3 +++ .../repository/po/OutMaterialDetailWithOrderPO.java | 3 +++ .../mapper/inMaterialDetail/InMaterialDetailMapper.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailWithOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailWithOrderPO.java index d429210e5..6726c3345 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailWithOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailWithOrderPO.java @@ -22,6 +22,9 @@ public class InMaterialDetailWithOrderPO extends InMaterialDetailPO { @Excel(name = "入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭") private Integer inOrderStatus; + @ApiModelProperty("入库单状态(与inOrderStatus同值,便于前端按status字段名绑定)") + private Integer status; + @ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过") @Excel(name = "入库单审核状态: 1-未审核 2-审核不通过 3-审核通过") private Integer inOrderAuditStatus; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailWithOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailWithOrderPO.java index 794e5252d..b45770de0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailWithOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailWithOrderPO.java @@ -35,6 +35,9 @@ public class OutMaterialDetailWithOrderPO extends OutMaterialDetailPO { @Excel(name = "出库单状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接") private Integer outOrderStatus; + @ApiModelProperty("出库单状态(与outOrderStatus同值,便于前端按status字段名绑定)") + private Integer status; + @ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过") @Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过") private Integer outOrderAuditStatus; diff --git a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml index 9940f961f..8de07a47b 100644 --- a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml @@ -375,6 +375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +