From ebe7db159f92d9da463712367f3124eea1a3b235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 3 Mar 2026 10:18:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E8=B0=83=E6=95=B4=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?/=E5=85=B3=E8=81=94=E5=8D=95=E5=8F=B7;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/HandoverTaskOrderDomainService.java | 2 ++ .../entity/InventoryAdjustmentRecord.java | 9 ++++++++- .../repository/po/InventoryAdjustmentRecordPO.java | 6 ++++++ .../repository/todo/InventoryAdjustmentRecordDO.java | 10 +++++++++- .../repository/persistence/OutMaterialDetailImpl.java | 8 ++++++++ .../service/StockShelfOrderDomainService.java | 2 ++ 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index 178e8dc84..9057e3ade 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -241,6 +241,8 @@ public class HandoverTaskOrderDomainService { //库存调整记录 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord(); + inventoryAdjustmentRecord.setAdjustAction("出库"); + inventoryAdjustmentRecord.setRelateNo(orderNumber); inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge"); inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge"); inventoryAdjustmentRecord.setAdjustAfterStatusName("合格"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java index b7f85f469..511e83d64 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/entity/InventoryAdjustmentRecord.java @@ -148,5 +148,12 @@ public class InventoryAdjustmentRecord extends BaseVOEntity { @Excel(name = "调整后冻结数量") private BigDecimal freezeAfterQuantity; + @ApiModelProperty("调整动作") + @Excel(name = "调整动作") + private String adjustAction; -} + @ApiModelProperty("关联单号") + @Excel(name = "关联单号") + private String relateNo; + +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java index b8f23ec43..855944d0f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/po/InventoryAdjustmentRecordPO.java @@ -205,5 +205,11 @@ public class InventoryAdjustmentRecordPO extends BaseVOEntity { @ApiModelProperty("物料更多属性列表（批次属性）") private List materialMoreDetailList; + @ApiModelProperty("调整动作") + @Excel(name = "调整动作") + private String adjustAction; + @ApiModelProperty("关联单号") + @Excel(name = "关联单号") + private String relateNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/todo/InventoryAdjustmentRecordDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/todo/InventoryAdjustmentRecordDO.java index 4a872ebdc..cc19f418b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/todo/InventoryAdjustmentRecordDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/repository/todo/InventoryAdjustmentRecordDO.java @@ -163,4 +163,12 @@ public class InventoryAdjustmentRecordDO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} + + @ApiModelProperty("调整动作") + @Excel(name = "调整动作") + private String adjustAction; + + @ApiModelProperty("关联单号") + @Excel(name = "关联单号") + private String relateNo; +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 77780d9ae..b1c171738 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -454,6 +454,8 @@ public class OutMaterialDetailImpl extends ServiceImpl