From 17f73bd5c2c8fcc0341e5c89f2a58ebc5ad72481 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Thu, 25 Sep 2025 17:46:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/base/AccountController.java | 8 +++ .../base/CompanyRelativityController.java | 20 ++---- .../admin/base/ContactController.java | 8 +++ .../admin/base/ElementController.java | 8 +++ .../admin/base/FactoryController.java | 8 +++ .../admin/base/MaterialDestroyController.java | 7 ++ .../admin/base/MaterialOtherController.java | 8 +++ .../admin/base/WarehouseController.java | 8 +++ .../base/vo/CompanyRelativityPageReqVO.java | 6 ++ .../base/vo/CompanyRelativitySaveReqVO.java | 18 ----- .../base/vo/MaterialDestroyPageReqVO.java | 6 ++ .../admin/base/vo/MaterialDestroyRespVO.java | 8 +++ .../base/vo/MaterialDestroySaveReqVO.java | 8 +++ .../base/dal/dataobject/base/AccountDO.java | 3 +- .../dataobject/base/CompanyRelaDeptDO.java | 53 +++++++++++++++ .../dataobject/base/CompanyRelativityDO.java | 23 +------ .../base/dal/dataobject/base/ContactDO.java | 3 +- .../base/dal/dataobject/base/FactoryDO.java | 3 +- .../dataobject/base/MaterialDestroyDO.java | 15 ++++- .../dal/dataobject/base/MaterialOtherDO.java | 3 +- .../base/dal/dataobject/base/WarehouseDO.java | 3 +- .../mysql/base/CompanyRelativityMapper.java | 3 +- .../base/service/base/AccountService.java | 6 ++ .../base/service/base/AccountServiceImpl.java | 14 +++- .../base/CompanyRelativityService.java | 3 +- .../base/CompanyRelativityServiceImpl.java | 67 +++++++++++++++++-- .../base/service/base/ContactService.java | 1 + .../base/service/base/ContactServiceImpl.java | 12 ++++ .../base/service/base/ElementService.java | 1 + .../base/service/base/ElementServiceImpl.java | 12 ++++ .../base/service/base/FactoryService.java | 1 + .../base/service/base/FactoryServiceImpl.java | 12 ++++ .../service/base/MaterialDestroyService.java | 1 + .../base/MaterialDestroyServiceImpl.java | 12 ++++ .../service/base/MaterialOtherService.java | 1 + .../base/MaterialOtherServiceImpl.java | 12 ++++ .../base/service/base/WarehouseService.java | 1 + .../service/base/WarehouseServiceImpl.java | 12 ++++ .../mapper/base/CompanyRelativityMapper.xml | 48 ++++++++----- 39 files changed, 357 insertions(+), 89 deletions(-) create mode 100644 zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/AccountController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/AccountController.java index 84d1783..eb0f4b9 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/AccountController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/AccountController.java @@ -101,4 +101,12 @@ public class AccountController { BeanUtils.toBean(list, AccountRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新账户条款") + @PreAuthorize("@ss.hasPermission('base:account:update')") + public CommonResult enableAccountList(@RequestBody List saveReqVOS) { + accountService.enableAccountList(saveReqVOS); + return success(true); + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/CompanyRelativityController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/CompanyRelativityController.java index 07787d2..00b00f8 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/CompanyRelativityController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/CompanyRelativityController.java @@ -1,5 +1,6 @@ package com.zt.plat.module.base.controller.admin.base; +import com.zt.plat.module.base.dal.dataobject.base.CompanyRelaDeptDO; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -86,22 +87,9 @@ public class CompanyRelativityController { @GetMapping("/page") @Operation(summary = "获得公司关系分页") @PreAuthorize("@ss.hasPermission('base:company-relativity:query')") - public CommonResult> getCompanyRelativityPage(@Valid CompanyRelativityPageReqVO pageReqVO) { - PageResult pageResult = companyRelativityService.getCompanyRelativityPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, CompanyRelativityRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出公司关系 Excel") - @PreAuthorize("@ss.hasPermission('base:company-relativity:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportCompanyRelativityExcel(@Valid CompanyRelativityPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = companyRelativityService.getCompanyRelativityPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "公司关系.xls", "数据", CompanyRelativityRespVO.class, - BeanUtils.toBean(list, CompanyRelativityRespVO.class)); + public CommonResult> getCompanyRelativityPage(@Valid CompanyRelativityPageReqVO pageReqVO) { + PageResult pageResult = companyRelativityService.getCompanyRelativityPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, CompanyRelaDeptDO.class)); } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ContactController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ContactController.java index 193a161..6e3b0ac 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ContactController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ContactController.java @@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO; import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.ContactRespVO; import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO; @@ -101,4 +102,11 @@ public class ContactController { BeanUtils.toBean(list, ContactRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新") + @PreAuthorize("@ss.hasPermission('base:contact:update')") + public CommonResult enableContactList(@RequestBody List saveReqVOS) { + contactService.enableContactList(saveReqVOS); + return success(true); + } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java index f8c5417..433805a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java @@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO; @@ -101,4 +102,11 @@ public class ElementController { BeanUtils.toBean(list, ElementRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新") + @PreAuthorize("@ss.hasPermission('base:element:update')") + public CommonResult enableElementList(@RequestBody List saveReqVOS) { + elementService.enableElementList(saveReqVOS); + return success(true); + } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/FactoryController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/FactoryController.java index 57ada9c..85cebaa 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/FactoryController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/FactoryController.java @@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO; import com.zt.plat.module.base.controller.admin.base.vo.FactoryPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.FactoryRespVO; import com.zt.plat.module.base.controller.admin.base.vo.FactorySaveReqVO; @@ -101,4 +102,11 @@ public class FactoryController { BeanUtils.toBean(list, FactoryRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新") + @PreAuthorize("@ss.hasPermission('base:factory:update')") + public CommonResult enableFactoryList(@RequestBody List saveReqVOS) { + factoryService.enableFactoryList(saveReqVOS); + return success(true); + } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java index 0c79789..97ccc32 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java @@ -104,4 +104,11 @@ public class MaterialDestroyController { BeanUtils.toBean(list, MaterialDestroyRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新") + @PreAuthorize("@ss.hasPermission('base:material-destroy:update')") + public CommonResult enableMaterialDestroyList(@RequestBody List saveReqVOS) { + materialDestroyService.enableMaterialDestroyList(saveReqVOS); + return success(true); + } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialOtherController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialOtherController.java index bc37e3b..66d9178 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialOtherController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialOtherController.java @@ -104,4 +104,12 @@ public class MaterialOtherController { BeanUtils.toBean(list, MaterialOtherRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新") + @PreAuthorize("@ss.hasPermission('base:material-other:update')") + public CommonResult enableMaterialOtherList(@RequestBody List saveReqVOS) { + materialOtherService.enableMaterialOtherList(saveReqVOS); + return success(true); + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/WarehouseController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/WarehouseController.java index aa658b2..b7587b4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/WarehouseController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/WarehouseController.java @@ -104,4 +104,12 @@ public class WarehouseController { BeanUtils.toBean(list, WarehouseRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新") + @PreAuthorize("@ss.hasPermission('base:warehouse:update')") + public CommonResult enableWarehouseList(@RequestBody List saveReqVOS) { + warehouseService.enableWarehouseList(saveReqVOS); + return success(true); + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java index 89e23cc..c652096 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java @@ -23,6 +23,12 @@ public class CompanyRelativityPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "公司名称") + private String name; + + @Schema(description = "ERP公司名称") + private String erpName; + @Schema(description = "负责人") private String manager; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativitySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativitySaveReqVO.java index b5993da..f769749 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativitySaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativitySaveReqVO.java @@ -19,22 +19,4 @@ public class CompanyRelativitySaveReqVO { @Schema(description = "供应链公司编码", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "供应链公司编码不能为空") private String number; - - @Schema(description = "供应链公司编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "供应链公司编号不能为空") - private Long companyId; - - @Schema(description = "供应链公司名称", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "供应链公司名称不能为空") - private String companyName; - - @Schema(description = "供应链部门编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "供应链部门名称不能为空") - private Long deptId; - - @Schema(description = "供应链部门名称", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "供应链部门名称不能为空") - private String deptName; - - } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java index 795c029..2c7d71a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java @@ -20,6 +20,12 @@ public class MaterialDestroyPageReqVO extends PageParam { @Schema(description = "返产品物料编码") private String downNumber; + @Schema(description = "原料物料名称") + private String upName; + + @Schema(description = "返产品物料名称") + private String downName; + @Schema(description = "回收率") private BigDecimal ratio; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java index cee3798..69b57f4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java @@ -25,6 +25,14 @@ public class MaterialDestroyRespVO { @ExcelProperty("返产品物料编码") private String downNumber; + @Schema(description = "原料物料名称", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("原料物料名称") + private String upName; + + @Schema(description = "返产品物料名称", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("返产品物料名称") + private String downName; + @Schema(description = "回收率", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("回收率") private BigDecimal ratio; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java index 85faf99..e596df3 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java @@ -22,6 +22,14 @@ public class MaterialDestroySaveReqVO { @NotEmpty(message = "返产品物料编码不能为空") private String downNumber; + @Schema(description = "原料物料名称", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "原料物料名称不能为空") + private String upName; + + @Schema(description = "返产品物料名称", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "返产品物料名称不能为空") + private String downName; + @Schema(description = "回收率", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "回收率不能为空") private BigDecimal ratio; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java index 72cd354..7a3f02c 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; /** * 账户条款 DO @@ -19,7 +20,7 @@ import lombok.*; /** * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO */ -public class AccountDO extends BaseDO { +public class AccountDO extends BusinessBaseDO { diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java new file mode 100644 index 0000000..517ae16 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java @@ -0,0 +1,53 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +import lombok.*; + +import java.util.List; + +/** + * 公司关系 DO + * + * @author 后台管理 + */ +@Data +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** + * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO + */ +public class CompanyRelaDeptDO { + + private Long id; + //父id + private Long parentId; + //关联id + private Long relId; + // erp 编码 + private String erpNumber; + // erp名称 + private String erpName; + // 公司名称 + private String companyName; + // 部门编码 + private String deptNumber; + // 负责人id + private String leaderUserId; + // 是否公司 + private String isCompany; + // 是否集团 + private String isGroup; + //电话 + private String phone; + //邮箱 + private String email; + //部门状态 + private String status; + //创建人 + private String creator; + + private List childrens; +} \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelativityDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelativityDO.java index d07c23c..9bbe225 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelativityDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelativityDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; /** * 公司关系 DO @@ -19,9 +20,7 @@ import lombok.*; /** * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO */ -public class CompanyRelativityDO extends BaseDO { - - +public class CompanyRelativityDO extends BusinessBaseDO { /** * 主键 @@ -34,9 +33,6 @@ public class CompanyRelativityDO extends BaseDO { @TableField("ERP_NUM") private String erpNumber; - // erp名称 - private String erpName; - /** * 供应链公司编码 */ @@ -53,20 +49,6 @@ public class CompanyRelativityDO extends BaseDO { @TableField("COMPANY_NAME") private String companyName; - // 负责人id - private String leaderUserId; - // 是否公司 - private String isCompany; - //是否集团 - private String isGroup; - //电话 - private String phone; - //邮箱 - private String email; - //部门状态 - private String status; - //创建人 - private String creator; /** * 部门编号 */ @@ -92,5 +74,4 @@ public class CompanyRelativityDO extends BaseDO { */ @TableField("UPDATER_NAME") private String updaterName; - } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java index c694235..829bca2 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; /** * 联系人信息 DO @@ -19,7 +20,7 @@ import lombok.*; /** * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO */ -public class ContactDO extends BaseDO { +public class ContactDO extends BusinessBaseDO { diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java index 3de9f40..9be3635 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; /** * 工厂 DO @@ -19,7 +20,7 @@ import lombok.*; /** * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO */ -public class FactoryDO extends BaseDO { +public class FactoryDO extends BusinessBaseDO { diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java index 418e2b4..1f792af 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; import java.math.BigDecimal; @@ -21,9 +22,7 @@ import java.math.BigDecimal; /** * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO */ -public class MaterialDestroyDO extends BaseDO { - - +public class MaterialDestroyDO extends BusinessBaseDO { /** * 主键 @@ -40,6 +39,16 @@ public class MaterialDestroyDO extends BaseDO { */ @TableField("DOWN_NUM") private String downNumber; + /** + * 原料物料编码 + */ + @TableField("UP_NAME") + private String upName; + /** + * 返产品物料编码 + */ + @TableField("DOWN_NAME") + private String downName; /** * 回收率 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java index 696c895..87d0d5d 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; /** * 物料拓展数据 DO @@ -19,7 +20,7 @@ import lombok.*; /** * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO */ -public class MaterialOtherDO extends BaseDO { +public class MaterialOtherDO extends BusinessBaseDO { diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java index f0a1d45..35f5745 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; /** * 仓库 DO @@ -19,7 +20,7 @@ import lombok.*; /** * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO */ -public class WarehouseDO extends BaseDO { +public class WarehouseDO extends BusinessBaseDO { diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java index 99d67b4..c3d7a40 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java @@ -4,6 +4,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.CompanyRelaDeptDO; import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO; import org.apache.ibatis.annotations.Mapper; @@ -25,5 +26,5 @@ public interface CompanyRelativityMapper extends BaseMapperX getPageByReq(CompanyRelativityPageReqVO pageReqVO); + List getPageByReq(CompanyRelativityPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java index 4972bf0..b45cc72 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java @@ -61,4 +61,10 @@ public interface AccountService { */ PageResult getAccountPage(AccountPageReqVO pageReqVO); + /** + * 批量更新账户条款 + * + * @param saveReqVOS 账户条款 + */ + void enableAccountList(List saveReqVOS); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java index 3c7d09f..b24d576 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java @@ -9,6 +9,7 @@ import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO; import com.zt.plat.module.base.dal.dataobject.base.AccountDO; import com.zt.plat.module.base.dal.mysql.base.AccountMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -56,12 +57,12 @@ public class AccountServiceImpl implements AccountService { } @Override - public void deleteAccountListByIds(List ids) { + public void deleteAccountListByIds(List ids) { // 校验存在 validateAccountExists(ids); // 删除 accountMapper.deleteByIds(ids); - } + } private void validateAccountExists(List ids) { List list = accountMapper.selectByIds(ids); @@ -86,4 +87,13 @@ public class AccountServiceImpl implements AccountService { return accountMapper.selectPage(pageReqVO); } + @Override + public void enableAccountList(List entityList) { + List updateObj = BeanUtils.toBean(entityList, AccountDO.class); + List count = accountMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(ACCOUNT_NOT_EXISTS); + } + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityService.java index ce7e8df..4eacfb4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityService.java @@ -4,6 +4,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityRespVO; import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativitySaveReqVO; +import com.zt.plat.module.base.dal.dataobject.base.CompanyRelaDeptDO; import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO; import jakarta.validation.Valid; @@ -59,6 +60,6 @@ public interface CompanyRelativityService { * @param pageReqVO 分页查询 * @return 公司关系分页 */ - PageResult getCompanyRelativityPage(CompanyRelativityPageReqVO pageReqVO); + PageResult getCompanyRelativityPage(CompanyRelativityPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityServiceImpl.java index 46775b6..0b020bd 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityServiceImpl.java @@ -6,13 +6,17 @@ import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityRespVO; import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativitySaveReqVO; +import com.zt.plat.module.base.dal.dataobject.base.CompanyRelaDeptDO; import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO; import com.zt.plat.module.base.dal.mysql.base.CompanyRelativityMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.base.enums.ErrorCodeConstants.COMPANY_RELATIVITY_NOT_EXISTS; @@ -56,12 +60,12 @@ public class CompanyRelativityServiceImpl implements CompanyRelativityService { } @Override - public void deleteCompanyRelativityListByIds(List ids) { + public void deleteCompanyRelativityListByIds(List ids) { // 校验存在 validateCompanyRelativityExists(ids); // 删除 companyRelativityMapper.deleteByIds(ids); - } + } private void validateCompanyRelativityExists(List ids) { List list = companyRelativityMapper.selectByIds(ids); @@ -82,12 +86,65 @@ public class CompanyRelativityServiceImpl implements CompanyRelativityService { } @Override - public PageResult getCompanyRelativityPage(CompanyRelativityPageReqVO pageReqVO) { - List list = companyRelativityMapper.getPageByReq(pageReqVO); + public PageResult getCompanyRelativityPage(CompanyRelativityPageReqVO pageReqVO) { + // 获取分页数据 + List list = companyRelativityMapper.getPageByReq(pageReqVO); if (list == null) { list = CollUtil.newArrayList(); } - return new PageResult<>(list, (long) list.size()); + + // 构建树形结构 +// List treeList = buildTree(list); + + // 分页处理 + int pageNo = pageReqVO.getPageNo(); + int pageSize = pageReqVO.getPageSize(); + int total = list.size(); + + // 计算分页起始和结束位置 + int fromIndex = (pageNo - 1) * pageSize; + int toIndex = Math.min(fromIndex + pageSize, total); + + // 如果起始位置超出范围，则返回空列表 + if (fromIndex >= total) { + return new PageResult<>(new ArrayList<>(), (long) total); + } + + // 截取当前页数据 + List pageList = list.subList(fromIndex, toIndex); + + return new PageResult<>(pageList, (long) total); + } + + private List buildTree(List list) { + // 创建一个map用于存储所有节点，key为id，value为节点对象 + Map nodeMap = new HashMap<>(); + for (CompanyRelaDeptDO node : list) { + nodeMap.put(node.getId(), node); + } + + // 创建结果列表 + List result = new ArrayList<>(); + + // 遍历所有节点，建立父子关系 + for (CompanyRelaDeptDO node : list) { + Long parentId = node.getParentId(); + if (parentId == null || parentId == 0) { + // 如果没有父节点或者父节点为0，则为根节点 + result.add(node); + } else { + // 如果有父节点，则将其添加到父节点的子节点列表中 + CompanyRelaDeptDO parent = nodeMap.get(parentId); + if (parent != null) { + if (parent.getChildrens() == null) { + parent.setChildrens(new ArrayList<>()); + } + parent.getChildrens().add(node); + } + } + } + + return result; } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactService.java index cb23d88..8d53128 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactService.java @@ -61,4 +61,5 @@ public interface ContactService { */ PageResult getContactPage(ContactPageReqVO pageReqVO); + void enableContactList(List saveReqVOS); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactServiceImpl.java index 2f218bb..df24944 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactServiceImpl.java @@ -7,8 +7,10 @@ import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.ContactRespVO; import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO; import com.zt.plat.module.base.dal.dataobject.base.ContactDO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO; import com.zt.plat.module.base.dal.mysql.base.ContactMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -16,6 +18,7 @@ import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.base.enums.ErrorCodeConstants.CONTACT_NOT_EXISTS; +import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS; /** * 联系人信息 Service 实现类 @@ -86,4 +89,13 @@ public class ContactServiceImpl implements ContactService { return contactMapper.selectPage(pageReqVO); } + @Override + public void enableContactList(List saveReqVOS) { + List updateObj = BeanUtils.toBean(saveReqVOS, ContactDO.class); + List count = contactMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(CONTACT_NOT_EXISTS); + } + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java index dcf55e4..9dc95a9 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java @@ -61,4 +61,5 @@ public interface ElementService { */ PageResult getElementPage(ElementPageReqVO pageReqVO); + void enableElementList(List saveReqVOS); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java index f69b424..6f21330 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java @@ -7,8 +7,10 @@ import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO; import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO; import com.zt.plat.module.base.dal.dataobject.base.ElementDO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO; import com.zt.plat.module.base.dal.mysql.base.ElementMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -16,6 +18,7 @@ import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.base.enums.ErrorCodeConstants.ELEMENT_NOT_EXISTS; +import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS; /** * 金属元素 Service 实现类 @@ -97,4 +100,13 @@ public class ElementServiceImpl implements ElementService { return elementMapper.selectPage(pageReqVO); } + @Override + public void enableElementList(List saveReqVOS) { + List updateObj = BeanUtils.toBean(saveReqVOS, ElementDO.class); + List count = elementMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(ELEMENT_NOT_EXISTS); + } + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryService.java index 79db236..4168db3 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryService.java @@ -61,4 +61,5 @@ public interface FactoryService { */ PageResult getFactoryPage(FactoryPageReqVO pageReqVO); + void enableFactoryList(List saveReqVOS); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java index 0205984..cb3567d 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java @@ -7,8 +7,10 @@ import com.zt.plat.module.base.controller.admin.base.vo.FactoryPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.FactoryRespVO; import com.zt.plat.module.base.controller.admin.base.vo.FactorySaveReqVO; import com.zt.plat.module.base.dal.dataobject.base.FactoryDO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO; import com.zt.plat.module.base.dal.mysql.base.FactoryMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -16,6 +18,7 @@ import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.base.enums.ErrorCodeConstants.FACTORY_NOT_EXISTS; +import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS; /** * 工厂 Service 实现类 @@ -86,4 +89,13 @@ public class FactoryServiceImpl implements FactoryService { return factoryMapper.selectPage(pageReqVO); } + @Override + public void enableFactoryList(List saveReqVOS) { + List updateObj = BeanUtils.toBean(saveReqVOS, FactoryDO.class); + List count = factoryMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(FACTORY_NOT_EXISTS); + } + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyService.java index 725385d..424896b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyService.java @@ -61,4 +61,5 @@ public interface MaterialDestroyService { */ PageResult getMaterialDestroyPage(MaterialDestroyPageReqVO pageReqVO); + void enableMaterialDestroyList(List saveReqVOS); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java index 302d66b..9d7deaa 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java @@ -7,8 +7,10 @@ import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyPageReqVO import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyRespVO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroySaveReqVO; import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO; import com.zt.plat.module.base.dal.mysql.base.MaterialDestroyMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -16,6 +18,7 @@ import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_DESTROY_NOT_EXISTS; +import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS; /** * 物料回收率 Service 实现类 @@ -86,4 +89,13 @@ public class MaterialDestroyServiceImpl implements MaterialDestroyService { return materialDestroyMapper.selectPage(pageReqVO); } + @Override + public void enableMaterialDestroyList(List saveReqVOS) { + List updateObj = BeanUtils.toBean(saveReqVOS, MaterialDestroyDO.class); + List count = materialDestroyMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(MATERIAL_DESTROY_NOT_EXISTS); + } + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java index 25d452e..e136bfb 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java @@ -61,4 +61,5 @@ public interface MaterialOtherService { */ PageResult getMaterialOtherPage(MaterialOtherPageReqVO pageReqVO); + void enableMaterialOtherList(List saveReqVOS); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java index 4fb7322..b565cda 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java @@ -7,8 +7,10 @@ import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherPageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherRespVO; import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherSaveReqVO; import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO; +import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO; import com.zt.plat.module.base.dal.mysql.base.MaterialOtherMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -16,6 +18,7 @@ import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS; +import static com.zt.plat.module.base.enums.ErrorCodeConstants.WAREHOUSE_NOT_EXISTS; /** * 物料拓展数据 Service 实现类 @@ -86,4 +89,13 @@ public class MaterialOtherServiceImpl implements MaterialOtherService { return materialOtherMapper.selectPage(pageReqVO); } + @Override + public void enableMaterialOtherList(List saveReqVOS) { + List updateObj = BeanUtils.toBean(saveReqVOS, MaterialOtherDO.class); + List count = materialOtherMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(MATERIAL_OTHER_NOT_EXISTS); + } + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseService.java index 4109750..a8f01f4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseService.java @@ -61,4 +61,5 @@ public interface WarehouseService { */ PageResult getWarehousePage(WarehousePageReqVO pageReqVO); + void enableWarehouseList(List saveReqVOS); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseServiceImpl.java index db02d54..41e5b06 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseServiceImpl.java @@ -6,15 +6,18 @@ import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.base.controller.admin.base.vo.WarehousePageReqVO; import com.zt.plat.module.base.controller.admin.base.vo.WarehouseRespVO; import com.zt.plat.module.base.controller.admin.base.vo.WarehouseSaveReqVO; +import com.zt.plat.module.base.dal.dataobject.base.AccountDO; import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO; import com.zt.plat.module.base.dal.mysql.base.WarehouseMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.module.base.enums.ErrorCodeConstants.ACCOUNT_NOT_EXISTS; import static com.zt.plat.module.base.enums.ErrorCodeConstants.WAREHOUSE_NOT_EXISTS; /** @@ -86,4 +89,13 @@ public class WarehouseServiceImpl implements WarehouseService { return warehouseMapper.selectPage(pageReqVO); } + @Override + public void enableWarehouseList(List saveReqVOS) { + List updateObj = BeanUtils.toBean(saveReqVOS, WarehouseDO.class); + List count = warehouseMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(WAREHOUSE_NOT_EXISTS); + } + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml index 4974b09..edbcc58 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml @@ -9,23 +9,37 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - select - c.NUM as erpNumber, - c.NAME as erpName, - d.NAME as companyName, - d.ID as deptId, - d.LEADER_USER_ID as leaderUserId, - d.IS_COMPANY, - d.IS_GROUP, - d.PHONE, - d.EMAIL, - d.STATUS, - d.CREATOR - from - SPLY_CPN_REL r - left join SYSTEM_DEPT d on r.COMPANY_ID = d.ID - left join SPLY_ERP_CPN c on r.ERP_NUM = c.NUM - where r.DELETED = 0 + d.ID as id, + d.PARENT_ID as parentId, + r.ID as relId, + c.NUM as erpNumber, + c.NAME as erpName, + d.NAME as companyName, + d.CODE as deptId, + d.LEADER_USER_ID as leaderUserId, + d.IS_COMPANY as isCompany , + d.IS_GROUP as isGroup, + d.PHONE as phone, + d.EMAIL as email, + d.STATUS as status, + d.CREATOR as creator + from SYSTEM_DEPT d + left join SPLY_CPN_REL r on r.NUM = d.CODE + left join SPLY_ERP_CPN c on r.ERP_NUM = c.NUM + where d.DELETED = 0 + + and d.NAME = #{name} + + + and c.NAME = #{erpName} + + + and d.LEADER_USER_ID = #{manager} + + + and d.DEPT_SOURCE = #{departmentSource} + \ No newline at end of file