From 750fdbe96f721c33facba92341d722a944c72acc Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Thu, 5 Mar 2026 16:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E5=BC=82=E7=AE=A1=E7=90=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E5=BE=85=E8=BF=87=E8=B4=A6=E3=80=81?= =?UTF-8?q?=E9=87=8D=E7=9B=98=E3=80=81=E5=B7=B2=E8=BF=87=E8=B4=A6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/domain/differentManage/entity/DifferentManage.java | 4 ++++ .../repository/persistence/DifferentManageImpl.java | 4 ++++ .../differentManage/repository/po/DifferentManagePO.java | 4 ++++ .../differentManage/repository/todo/DifferentManageDO.java | 4 ++++ .../repository/persistence/InvestigationManageImpl.java | 1 + .../interfaces/dto/differentManage/DifferentManageDTO.java | 4 ++++ .../mapper/differentManage/DifferentManageMapper.xml | 2 +- 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/entity/DifferentManage.java b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/entity/DifferentManage.java index 87031715b..900fcb738 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/entity/DifferentManage.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/entity/DifferentManage.java @@ -111,6 +111,10 @@ public class DifferentManage extends BaseVOEntity { @Excel(name = "是否重盘: 1-是 2-否") private Integer reCountedFlag; + @ApiModelProperty("盘点差异状态: 1.待过账、2.重盘、3.已过账") + @Excel(name = "盘点差异状态: 1.待过账、2.重盘、3.已过账") + private Integer inventoryDiscrepancyStatus; + @ApiModelProperty("盘点详情") @TableField(exist = false) private List investigetionManageDetailList; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java index d0ae2d307..aac346a41 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java @@ -123,6 +123,8 @@ public class DifferentManageImpl extends ServiceImpl investigetionManageDetails = investigetionManageDetailMapper.selectList(new QueryWrapper().lambda().eq(InvestigetionManageDetail::getInvestigationNumber, investigationNumber)); List investigetionManageDetailList = new ArrayList<>(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/po/DifferentManagePO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/po/DifferentManagePO.java index 5463e476f..c98a51e33 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/po/DifferentManagePO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/po/DifferentManagePO.java @@ -110,6 +110,10 @@ public class DifferentManagePO extends BaseVOEntity { @Excel(name = "是否重盘: 1-是 2-否") private Integer reCountedFlag; + @ApiModelProperty("盘点差异状态: 1.待过账、2.重盘、3.已过账") + @Excel(name = "盘点差异状态: 1.待过账、2.重盘、3.已过账") + private Integer inventoryDiscrepancyStatus; + @ApiModelProperty("盘点详情") @TableField(exist = false) private List investigetionManageDetailList; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/todo/DifferentManageDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/todo/DifferentManageDO.java index 4aa8a986e..d3a36fe65 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/todo/DifferentManageDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/todo/DifferentManageDO.java @@ -114,6 +114,10 @@ public class DifferentManageDO extends BaseVOEntity { @Excel(name = "是否重盘: 1-是 2-否") private Integer reCountedFlag; + @ApiModelProperty("盘点差异状态: 1.待过账、2.重盘、3.已过账") + @Excel(name = "盘点差异状态: 1.待过账、2.重盘、3.已过账") + private Integer inventoryDiscrepancyStatus; + @ApiModelProperty("盘点详情") @TableField(exist = false) private List investigetionManageDetailList; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/persistence/InvestigationManageImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/persistence/InvestigationManageImpl.java index cdea44c7e..b4b0dbc3c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/persistence/InvestigationManageImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/persistence/InvestigationManageImpl.java @@ -377,6 +377,7 @@ public class InvestigationManageImpl extends ServiceImpl organizationIdList; diff --git a/mhd_wms/src/main/resources/mapper/differentManage/DifferentManageMapper.xml b/mhd_wms/src/main/resources/mapper/differentManage/DifferentManageMapper.xml index 72d36e5de..626199922 100644 --- a/mhd_wms/src/main/resources/mapper/differentManage/DifferentManageMapper.xml +++ b/mhd_wms/src/main/resources/mapper/differentManage/DifferentManageMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select different_manage_id, organization_id, organization_name, top_organization_id, different_number, investigation_number, investigation_status, investigation_range, investigation_type, investigation_method, investigation_frequency, investigation_man_by, investigation_man_name, operators_by, operators_name, warehouse_id, warehouse_code, warehouse_name, nullify, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name,posted_flag,re_counted_flag, del_flag from different_manage + select different_manage_id, organization_id, organization_name, top_organization_id, different_number, investigation_number, investigation_status, investigation_range, investigation_type, investigation_method, investigation_frequency, investigation_man_by, investigation_man_name, operators_by, operators_name, warehouse_id, warehouse_code, warehouse_name, nullify, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name,posted_flag,re_counted_flag, del_flag,inventoryDiscrepancyStatus from different_manage