From 0beab25b5232716050685505dc1bba51d78a675e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 13 Dec 2025 22:59:26 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/po/ReceivingAccountPO.java | 4 ++++ .../repository/todo/ReceivingAccountDO.java | 5 +++++ .../interfaces/dto/ReceivingAccountDTO.java | 4 ++++ .../material/command/CreateMaterialCommand.java | 5 +++++ .../command/MaterialCommandService.java | 4 ++-- .../material/command/UpdateMaterialCommand.java | 4 ++++ .../warehouse/material/model/Material.java | 17 +++++++++++++---- 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/po/ReceivingAccountPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/po/ReceivingAccountPO.java index 5f52792e3..5ae2e555e 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/po/ReceivingAccountPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/po/ReceivingAccountPO.java @@ -44,4 +44,8 @@ public class ReceivingAccountPO extends BaseVOEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + /**组织相关*/ + private String topOrganizationId; + /**组织相关*/ + private String organizationId; } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/todo/ReceivingAccountDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/todo/ReceivingAccountDO.java index 05d579200..1225ac1a4 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/todo/ReceivingAccountDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/todo/ReceivingAccountDO.java @@ -26,4 +26,9 @@ public class ReceivingAccountDO extends BaseVOEntity { @ApiModelProperty("删除标记：1-正常，2-已删除") private Integer delFlag; + + /**组织相关*/ + private String topOrganizationId; + /**组织相关*/ + private String organizationId; } diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ReceivingAccountDTO.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ReceivingAccountDTO.java index 5ae3399f3..e5dc7c153 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ReceivingAccountDTO.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ReceivingAccountDTO.java @@ -36,4 +36,8 @@ public class ReceivingAccountDTO { @ApiModelProperty("更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; + /**组织相关*/ + private String topOrganizationId; + /**组织相关*/ + private String organizationId; } diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java index 29eadb406..a907e2d2a 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java @@ -53,4 +53,9 @@ public class CreateMaterialCommand { @ApiModelProperty(value = "物料内容") private String materialContent; + + /**组织相关*/ + private String topOrganizationId; + /**组织相关*/ + private String organizationId; } diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java index 1e74a0d94..92c05251d 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java @@ -38,7 +38,7 @@ public class MaterialCommandService { command.getWeight(), command.getMaterialVolume(), command.getMaterialContent(), - command.getRemark(), + command.getRemark(),command.getTopOrganizationId(),command.getOrganizationId(), codeGenerator ); return materialRepository.save(material).getId(); @@ -61,7 +61,7 @@ public class MaterialCommandService { command.getWeight(), command.getMaterialVolume(), command.getMaterialContent(), - command.getRemark() + command.getRemark(),command.getTopOrganizationId(),command.getOrganizationId() ); materialRepository.update(material); diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java index 8d513ac30..65267c151 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java @@ -47,4 +47,8 @@ public class UpdateMaterialCommand { @ApiModelProperty(value = "物料内容") private String materialContent; + /**组织相关*/ + private String topOrganizationId; + /**组织相关*/ + private String organizationId; } diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java index ead5426f8..08f97c6cb 100644 --- a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java +++ b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java @@ -33,6 +33,10 @@ public class Material { private String materialContent; private LocalDateTime createTime; private LocalDateTime updateTime; + /**组织相关*/ + private String topOrganizationId; + /**组织相关*/ + private String organizationId; // 私有构造方法 @@ -47,7 +51,7 @@ public class Material { BigDecimal weight, BigDecimal materialVolume, String materialContent, - String remark) { + String remark,String topOrganizationId,String organizationId ) { validateRequiredFields( category, name, unit); this.ownerId = ownerId; this.shipper = shipper; @@ -63,6 +67,8 @@ public class Material { this.materialContent = materialContent; this.createTime = LocalDateTime.now(); this.updateTime = LocalDateTime.now(); + this.topOrganizationId = topOrganizationId; + this.organizationId = organizationId; } @@ -78,10 +84,11 @@ public class Material { BigDecimal weight, BigDecimal materialVolume, String materialContent, - String remark, + String remark,String topOrganizationId,String organizationId, MaterialCodeGenerator codeGenerator) { Material material = new Material(ownerId, shipper, category, name, model, - unit, value, codeManaged, weight, materialVolume, materialContent, remark + unit, value, codeManaged, weight, materialVolume, materialContent, remark, + topOrganizationId,organizationId ); material.materialCode = codeGenerator.generate(); return material; @@ -97,7 +104,7 @@ public class Material { BigDecimal weight, BigDecimal materialVolume, String materialContent, - String remark) { + String remark,String topOrganizationId,String organizationId ) { this.ownerId = ownerId; this.shipper = shipper; this.category = category; @@ -111,6 +118,8 @@ public class Material { this.codeManaged = codeManaged; this.remark = remark; this.updateTime = LocalDateTime.now(); + this.topOrganizationId = topOrganizationId; + this.organizationId = organizationId; } // 保留的核心校验