diff --git a/pom.xml b/pom.xml index 40fc228..d1619b3 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.35 + 3.0.37 17 ${java.version} diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java index 6e05339..98e530d 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java @@ -12,6 +12,14 @@ import com.zt.plat.framework.common.exception.ErrorCode; public interface ErrorCodeConstants { // ========== 示例模块 1-001-000-000 ========== - ErrorCode EXAMPLE_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode MATERIAL_OTHER_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode ELEMENT_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode CONTACT_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode ACCOUNT_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode MATERIAL_DESTROY_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode COMPANY_RELATIVITY_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode WAREHOUSE_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); + ErrorCode FACTORY_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在"); } diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/DeleteStatusEnum.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/DeleteStatusEnum.java new file mode 100644 index 0000000..9ad986a --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/DeleteStatusEnum.java @@ -0,0 +1,39 @@ +package com.zt.plat.module.tmpltp.enums; + +import java.util.HashSet; +import java.util.Set; + +public enum DeleteStatusEnum { + + STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.DRAFT.getCode());}}), + STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()), + STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>()); + + + private final String code; + private final Set allowedTransitions; + + DeleteStatusEnum(String code, Set allowedTransitions) { + this.code = code; + this.allowedTransitions = allowedTransitions; + } + + /** + * 根据状态码获取对应的枚举实例 + */ + public static DeleteStatusEnum fromCode(String code) { + for (DeleteStatusEnum status : values()) { + if (status.code.equals(code)) { + return status; + } + } + return null; + } + + /** + * 校验状态转换是否合法 + */ + public boolean isTransitionAllowed(String targetStatus) { + return allowedTransitions.contains(targetStatus); + } +} diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java index cbfaec7..6b9efff 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java @@ -14,14 +14,15 @@ public interface ErrorCodeConstants { ErrorCode TMPL_TP_DEl_ERROR = new ErrorCode(1_027_000_507, "模版分类删除失败"); ErrorCode TEMPLATE_INSTANCE_DATA_NOT_EXISTS = new ErrorCode(1_027_000_508, "实例字段值不存在"); ErrorCode TEMPLATE_INSTANCE_ITEM_NOT_EXISTS = new ErrorCode(1_027_000_509, "实例条款值不存在"); + ErrorCode TEMPLATE_INSTANCE_CREATE_FAIL = new ErrorCode(1_027_000_510, "实例创建失败"); ErrorCode PARAMS_IS_NULL_OR_ERR = new ErrorCode(1_027_000_510, "参数为空或参数错误"); - ErrorCode DEPARTMENT_INSTANCE_RELATIVITY_NOT_EXISTS = new ErrorCode(1_027_000_511, "部门与实例关联不存在"); - ErrorCode ILLEGAL_OPERATION_TYPE = new ErrorCode(1_027_000_511, "非法操作类型"); - ErrorCode OPERATION_FAIL= new ErrorCode(1_027_000_512, "操作失败"); - ErrorCode STATUS_OPERATION_FAIL= new ErrorCode(1_027_000_513, "当前状态不支持此操作"); - ErrorCode NOT_FOUND_CLASS= new ErrorCode(1_027_000_514, "找不到对应的类"); - ErrorCode UTIL_NOT_INIT= new ErrorCode(1_027_000_515, "工具类为未初始化"); - ErrorCode TMPL_INS_FLD_CODE_EXISTS = new ErrorCode(1_027_000_516, "字段已存在"); + ErrorCode DEPARTMENT_INSTANCE_RELATIVITY_NOT_EXISTS = new ErrorCode(1_027_000_512, "部门与实例关联不存在"); + ErrorCode ILLEGAL_OPERATION_TYPE = new ErrorCode(1_027_000_513, "非法操作类型"); + ErrorCode OPERATION_FAIL= new ErrorCode(1_027_000_514, "操作失败"); + ErrorCode STATUS_OPERATION_FAIL= new ErrorCode(1_027_000_515, "当前状态不支持此操作"); + ErrorCode NOT_FOUND_CLASS= new ErrorCode(1_027_000_516, "找不到对应的类"); + ErrorCode UTIL_NOT_INIT= new ErrorCode(1_027_000_517, "工具类为未初始化"); + ErrorCode TMPL_INS_FLD_CODE_EXISTS = new ErrorCode(1_027_000_518, "字段已存在"); //Illegal operation type } diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/StatusEnum.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/PublishStatusEnum.java similarity index 56% rename from zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/StatusEnum.java rename to zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/PublishStatusEnum.java index 2871837..42532de 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/StatusEnum.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/PublishStatusEnum.java @@ -6,25 +6,17 @@ import java.util.Set; /** * 状态枚举类，定义所有可能的状态及合法的状态转换 */ -public enum StatusEnum { - // 定义所有状态及对应的合法转换目标状态 - STATUS_1("1", new HashSet() {{ - add("2"); - add("4"); - }}), - STATUS_2("2", new HashSet() {{ - add("3"); - }}), - STATUS_3("3", new HashSet() {{ - add("4"); - add("2"); - }}), - STATUS_4("4", new HashSet<>()); // 没有合法的转换目标 +public enum PublishStatusEnum { + + STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.DRAFT.getCode());}}), + STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()), + STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>() ); + private final String code; private final Set allowedTransitions; - StatusEnum(String code, Set allowedTransitions) { + PublishStatusEnum(String code, Set allowedTransitions) { this.code = code; this.allowedTransitions = allowedTransitions; } @@ -32,8 +24,8 @@ public enum StatusEnum { /** * 根据状态码获取对应的枚举实例 */ - public static StatusEnum fromCode(String code) { - for (StatusEnum status : values()) { + public static PublishStatusEnum fromCode(String code) { + for (PublishStatusEnum status : values()) { if (status.code.equals(code)) { return status; } diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/TmplStsEnum.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/TmplStsEnum.java new file mode 100644 index 0000000..04d6407 --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/TmplStsEnum.java @@ -0,0 +1,34 @@ +package com.zt.plat.module.tmpltp.enums; + +import lombok.Getter; + +@Getter +public enum TmplStsEnum { + // 草稿状态 + DRAFT("DRF", "草稿"), + // 已发布状态 + PUBLISHED("PUB", "已发布"), + // 已停用状态 + STOPPED("STOP", "已停用"); + + // 获取状态编码 + private final String code; + // 获取状态描述 + private final String description; + + // 构造方法 + TmplStsEnum(String code, String description) { + this.code = code; + this.description = description; + } + + // 根据编码获取枚举实例 + public static TmplStsEnum getByCode(String code) { + for (TmplStsEnum status : TmplStsEnum.values()) { + if (status.getCode().equals(code)) { + return status; + } + } + return null; + } +} diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/UpdateStatusEnum.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/UpdateStatusEnum.java new file mode 100644 index 0000000..2e34ef0 --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/UpdateStatusEnum.java @@ -0,0 +1,45 @@ +package com.zt.plat.module.tmpltp.enums; + +import java.util.HashSet; +import java.util.Set; + +public enum UpdateStatusEnum { + + STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{ + add(TmplStsEnum.DRAFT.getCode()); + add(TmplStsEnum.STOPPED.getCode()); + }}), + STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()), + STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>(){{ + add(TmplStsEnum.DRAFT.getCode()); + add(TmplStsEnum.STOPPED.getCode()); + }}); + + + private final String code; + private final Set allowedTransitions; + + UpdateStatusEnum(String code, Set allowedTransitions) { + this.code = code; + this.allowedTransitions = allowedTransitions; + } + + /** + * 根据状态码获取对应的枚举实例 + */ + public static UpdateStatusEnum fromCode(String code) { + for (UpdateStatusEnum status : values()) { + if (status.code.equals(code)) { + return status; + } + } + return null; + } + + /** + * 校验状态转换是否合法 + */ + public boolean isTransitionAllowed(String targetStatus) { + return allowedTransitions.contains(targetStatus); + } +} 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 new file mode 100644 index 0000000..84d1783 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/AccountController.java @@ -0,0 +1,104 @@ +package com.zt.plat.module.base.controller.admin.base; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.pojo.PageParam; +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.AccountPageReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO; +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.service.base.AccountService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - 账户条款") +@RestController +@RequestMapping("/base/account") +@Validated +public class AccountController { + + + @Resource + private AccountService accountService; + + @PostMapping("/create") + @Operation(summary = "创建账户条款") + @PreAuthorize("@ss.hasPermission('base:account:create')") + public CommonResult createAccount(@Valid @RequestBody AccountSaveReqVO createReqVO) { + return success(accountService.createAccount(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新账户条款") + @PreAuthorize("@ss.hasPermission('base:account:update')") + public CommonResult updateAccount(@Valid @RequestBody AccountSaveReqVO updateReqVO) { + accountService.updateAccount(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除账户条款") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:account:delete')") + public CommonResult deleteAccount(@RequestParam("id") Long id) { + accountService.deleteAccount(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除账户条款") + @PreAuthorize("@ss.hasPermission('base:account:delete')") + public CommonResult deleteAccountList(@RequestBody BatchDeleteReqVO req) { + accountService.deleteAccountListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得账户条款") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:account:query')") + public CommonResult getAccount(@RequestParam("id") Long id) { + AccountDO account = accountService.getAccount(id); + return success(BeanUtils.toBean(account, AccountRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得账户条款分页") + @PreAuthorize("@ss.hasPermission('base:account:query')") + public CommonResult> getAccountPage(@Valid AccountPageReqVO pageReqVO) { + PageResult pageResult = accountService.getAccountPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, AccountRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出账户条款 Excel") + @PreAuthorize("@ss.hasPermission('base:account:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportAccountExcel(@Valid AccountPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = accountService.getAccountPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "账户条款.xls", "数据", AccountRespVO.class, + BeanUtils.toBean(list, AccountRespVO.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/BaseTestController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/BaseTestController.java index 8e787af..b20566b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/BaseTestController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/BaseTestController.java @@ -1,13 +1,12 @@ package com.zt.plat.module.base.controller.admin.base; +import com.zt.plat.framework.common.pojo.CommonResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.zt.plat.framework.common.pojo.CommonResult; - import static com.zt.plat.framework.common.pojo.CommonResult.success; /** 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 new file mode 100644 index 0000000..07787d2 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/CompanyRelativityController.java @@ -0,0 +1,107 @@ +package com.zt.plat.module.base.controller.admin.base; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zt.plat.module.base.controller.admin.base.vo.*; +import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO; +import com.zt.plat.module.base.service.base.CompanyRelativityService; + +@Tag(name = "管理后台 - 公司关系") +@RestController +@RequestMapping("/base/company-relativity") +@Validated +public class CompanyRelativityController { + + + @Resource + private CompanyRelativityService companyRelativityService; + + @PostMapping("/create") + @Operation(summary = "创建公司关系") + @PreAuthorize("@ss.hasPermission('base:company-relativity:create')") + public CommonResult createCompanyRelativity(@Valid @RequestBody CompanyRelativitySaveReqVO createReqVO) { + return success(companyRelativityService.createCompanyRelativity(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新公司关系") + @PreAuthorize("@ss.hasPermission('base:company-relativity:update')") + public CommonResult updateCompanyRelativity(@Valid @RequestBody CompanyRelativitySaveReqVO updateReqVO) { + companyRelativityService.updateCompanyRelativity(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除公司关系") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:company-relativity:delete')") + public CommonResult deleteCompanyRelativity(@RequestParam("id") Long id) { + companyRelativityService.deleteCompanyRelativity(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除公司关系") + @PreAuthorize("@ss.hasPermission('base:company-relativity:delete')") + public CommonResult deleteCompanyRelativityList(@RequestBody BatchDeleteReqVO req) { + companyRelativityService.deleteCompanyRelativityListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得公司关系") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:company-relativity:query')") + public CommonResult getCompanyRelativity(@RequestParam("id") Long id) { + CompanyRelativityDO companyRelativity = companyRelativityService.getCompanyRelativity(id); + return success(BeanUtils.toBean(companyRelativity, CompanyRelativityRespVO.class)); + } + + @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)); + } + +} \ 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 new file mode 100644 index 0000000..193a161 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ContactController.java @@ -0,0 +1,104 @@ +package com.zt.plat.module.base.controller.admin.base; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.pojo.PageParam; +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.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.service.base.ContactService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - 联系人信息") +@RestController +@RequestMapping("/base/contact") +@Validated +public class ContactController { + + + @Resource + private ContactService contactService; + + @PostMapping("/create") + @Operation(summary = "创建联系人信息") + @PreAuthorize("@ss.hasPermission('base:contact:create')") + public CommonResult createContact(@Valid @RequestBody ContactSaveReqVO createReqVO) { + return success(contactService.createContact(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新联系人信息") + @PreAuthorize("@ss.hasPermission('base:contact:update')") + public CommonResult updateContact(@Valid @RequestBody ContactSaveReqVO updateReqVO) { + contactService.updateContact(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除联系人信息") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:contact:delete')") + public CommonResult deleteContact(@RequestParam("id") Long id) { + contactService.deleteContact(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除联系人信息") + @PreAuthorize("@ss.hasPermission('base:contact:delete')") + public CommonResult deleteContactList(@RequestBody BatchDeleteReqVO req) { + contactService.deleteContactListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得联系人信息") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:contact:query')") + public CommonResult getContact(@RequestParam("id") Long id) { + ContactDO contact = contactService.getContact(id); + return success(BeanUtils.toBean(contact, ContactRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得联系人信息分页") + @PreAuthorize("@ss.hasPermission('base:contact:query')") + public CommonResult> getContactPage(@Valid ContactPageReqVO pageReqVO) { + PageResult pageResult = contactService.getContactPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ContactRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出联系人信息 Excel") + @PreAuthorize("@ss.hasPermission('base:contact:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportContactExcel(@Valid ContactPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = contactService.getContactPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "联系人信息.xls", "数据", ContactRespVO.class, + BeanUtils.toBean(list, ContactRespVO.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/ElementController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java new file mode 100644 index 0000000..f8c5417 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java @@ -0,0 +1,104 @@ +package com.zt.plat.module.base.controller.admin.base; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.pojo.PageParam; +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.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.service.base.ElementService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - 金属元素") +@RestController +@RequestMapping("/base/element") +@Validated +public class ElementController { + + + @Resource + private ElementService elementService; + + @PostMapping("/create") + @Operation(summary = "创建金属元素") + @PreAuthorize("@ss.hasPermission('base:element:create')") + public CommonResult createElement(@Valid @RequestBody ElementSaveReqVO createReqVO) { + return success(elementService.createElement(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新金属元素") + @PreAuthorize("@ss.hasPermission('base:element:update')") + public CommonResult updateElement(@Valid @RequestBody ElementSaveReqVO updateReqVO) { + elementService.updateElement(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除金属元素") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:element:delete')") + public CommonResult deleteElement(@RequestParam("id") Long id) { + elementService.deleteElement(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除金属元素") + @PreAuthorize("@ss.hasPermission('base:element:delete')") + public CommonResult deleteElementList(@RequestBody BatchDeleteReqVO req) { + elementService.deleteElementListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得金属元素") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:element:query')") + public CommonResult getElement(@RequestParam("id") Long id) { + ElementDO element = elementService.getElement(id); + return success(BeanUtils.toBean(element, ElementRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得金属元素分页") + @PreAuthorize("@ss.hasPermission('base:element:query')") + public CommonResult> getElementPage(@Valid ElementPageReqVO pageReqVO) { + PageResult pageResult = elementService.getElementPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ElementRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出金属元素 Excel") + @PreAuthorize("@ss.hasPermission('base:element:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportElementExcel(@Valid ElementPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = elementService.getElementPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "金属元素.xls", "数据", ElementRespVO.class, + BeanUtils.toBean(list, ElementRespVO.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/FactoryController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/FactoryController.java new file mode 100644 index 0000000..57ada9c --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/FactoryController.java @@ -0,0 +1,104 @@ +package com.zt.plat.module.base.controller.admin.base; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.pojo.PageParam; +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.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.service.base.FactoryService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - 工厂") +@RestController +@RequestMapping("/base/factory") +@Validated +public class FactoryController { + + + @Resource + private FactoryService factoryService; + + @PostMapping("/create") + @Operation(summary = "创建工厂") + @PreAuthorize("@ss.hasPermission('base:factory:create')") + public CommonResult createFactory(@Valid @RequestBody FactorySaveReqVO createReqVO) { + return success(factoryService.createFactory(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新工厂") + @PreAuthorize("@ss.hasPermission('base:factory:update')") + public CommonResult updateFactory(@Valid @RequestBody FactorySaveReqVO updateReqVO) { + factoryService.updateFactory(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除工厂") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:factory:delete')") + public CommonResult deleteFactory(@RequestParam("id") Long id) { + factoryService.deleteFactory(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除工厂") + @PreAuthorize("@ss.hasPermission('base:factory:delete')") + public CommonResult deleteFactoryList(@RequestBody BatchDeleteReqVO req) { + factoryService.deleteFactoryListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得工厂") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:factory:query')") + public CommonResult getFactory(@RequestParam("id") Long id) { + FactoryDO factory = factoryService.getFactory(id); + return success(BeanUtils.toBean(factory, FactoryRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得工厂分页") + @PreAuthorize("@ss.hasPermission('base:factory:query')") + public CommonResult> getFactoryPage(@Valid FactoryPageReqVO pageReqVO) { + PageResult pageResult = factoryService.getFactoryPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, FactoryRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出工厂 Excel") + @PreAuthorize("@ss.hasPermission('base:factory:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportFactoryExcel(@Valid FactoryPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = factoryService.getFactoryPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "工厂.xls", "数据", FactoryRespVO.class, + BeanUtils.toBean(list, FactoryRespVO.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/MaterialDestroyController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java new file mode 100644 index 0000000..0c79789 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java @@ -0,0 +1,107 @@ +package com.zt.plat.module.base.controller.admin.base; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zt.plat.module.base.controller.admin.base.vo.*; +import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO; +import com.zt.plat.module.base.service.base.MaterialDestroyService; + +@Tag(name = "管理后台 - 物料回收率") +@RestController +@RequestMapping("/base/material-destroy") +@Validated +public class MaterialDestroyController { + + + @Resource + private MaterialDestroyService materialDestroyService; + + @PostMapping("/create") + @Operation(summary = "创建物料回收率") + @PreAuthorize("@ss.hasPermission('base:material-destroy:create')") + public CommonResult createMaterialDestroy(@Valid @RequestBody MaterialDestroySaveReqVO createReqVO) { + return success(materialDestroyService.createMaterialDestroy(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新物料回收率") + @PreAuthorize("@ss.hasPermission('base:material-destroy:update')") + public CommonResult updateMaterialDestroy(@Valid @RequestBody MaterialDestroySaveReqVO updateReqVO) { + materialDestroyService.updateMaterialDestroy(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除物料回收率") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:material-destroy:delete')") + public CommonResult deleteMaterialDestroy(@RequestParam("id") Long id) { + materialDestroyService.deleteMaterialDestroy(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除物料回收率") + @PreAuthorize("@ss.hasPermission('base:material-destroy:delete')") + public CommonResult deleteMaterialDestroyList(@RequestBody BatchDeleteReqVO req) { + materialDestroyService.deleteMaterialDestroyListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得物料回收率") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:material-destroy:query')") + public CommonResult getMaterialDestroy(@RequestParam("id") Long id) { + MaterialDestroyDO materialDestroy = materialDestroyService.getMaterialDestroy(id); + return success(BeanUtils.toBean(materialDestroy, MaterialDestroyRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得物料回收率分页") + @PreAuthorize("@ss.hasPermission('base:material-destroy:query')") + public CommonResult> getMaterialDestroyPage(@Valid MaterialDestroyPageReqVO pageReqVO) { + PageResult pageResult = materialDestroyService.getMaterialDestroyPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaterialDestroyRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出物料回收率 Excel") + @PreAuthorize("@ss.hasPermission('base:material-destroy:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaterialDestroyExcel(@Valid MaterialDestroyPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = materialDestroyService.getMaterialDestroyPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "物料回收率.xls", "数据", MaterialDestroyRespVO.class, + BeanUtils.toBean(list, MaterialDestroyRespVO.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/MaterialInfomationController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialInfomationController.java new file mode 100644 index 0000000..06fd42a --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialInfomationController.java @@ -0,0 +1,107 @@ +package com.zt.plat.module.base.controller.admin.base; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zt.plat.module.base.controller.admin.base.vo.*; +import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO; +import com.zt.plat.module.base.service.base.MaterialInfomationService; + +@Tag(name = "管理后台 - 物料信息") +@RestController +@RequestMapping("/base/material-infomation") +@Validated +public class MaterialInfomationController { + + + @Resource + private MaterialInfomationService materialInfomationService; + + @PostMapping("/create") + @Operation(summary = "创建物料信息") + @PreAuthorize("@ss.hasPermission('base:material-infomation:create')") + public CommonResult createMaterialInfomation(@Valid @RequestBody MaterialInfomationSaveReqVO createReqVO) { + return success(materialInfomationService.createMaterialInfomation(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新物料信息") + @PreAuthorize("@ss.hasPermission('base:material-infomation:update')") + public CommonResult updateMaterialInfomation(@Valid @RequestBody MaterialInfomationSaveReqVO updateReqVO) { + materialInfomationService.updateMaterialInfomation(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除物料信息") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:material-infomation:delete')") + public CommonResult deleteMaterialInfomation(@RequestParam("id") Long id) { + materialInfomationService.deleteMaterialInfomation(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除物料信息") + @PreAuthorize("@ss.hasPermission('base:material-infomation:delete')") + public CommonResult deleteMaterialInfomationList(@RequestBody BatchDeleteReqVO req) { + materialInfomationService.deleteMaterialInfomationListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得物料信息") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:material-infomation:query')") + public CommonResult getMaterialInfomation(@RequestParam("id") Long id) { + MaterialInfomationDO materialInfomation = materialInfomationService.getMaterialInfomation(id); + return success(BeanUtils.toBean(materialInfomation, MaterialInfomationRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得物料信息分页") + @PreAuthorize("@ss.hasPermission('base:material-infomation:query')") + public CommonResult> getMaterialInfomationPage(@Valid MaterialInfomationPageReqVO pageReqVO) { + PageResult pageResult = materialInfomationService.getMaterialInfomationPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaterialInfomationRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出物料信息 Excel") + @PreAuthorize("@ss.hasPermission('base:material-infomation:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaterialInfomationExcel(@Valid MaterialInfomationPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = materialInfomationService.getMaterialInfomationPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "物料信息.xls", "数据", MaterialInfomationRespVO.class, + BeanUtils.toBean(list, MaterialInfomationRespVO.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/MaterialOtherController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialOtherController.java new file mode 100644 index 0000000..bc37e3b --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialOtherController.java @@ -0,0 +1,107 @@ +package com.zt.plat.module.base.controller.admin.base; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zt.plat.module.base.controller.admin.base.vo.*; +import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO; +import com.zt.plat.module.base.service.base.MaterialOtherService; + +@Tag(name = "管理后台 - 物料拓展数据") +@RestController +@RequestMapping("/base/material-other") +@Validated +public class MaterialOtherController { + + + @Resource + private MaterialOtherService materialOtherService; + + @PostMapping("/create") + @Operation(summary = "创建物料拓展数据") + @PreAuthorize("@ss.hasPermission('base:material-other:create')") + public CommonResult createMaterialOther(@Valid @RequestBody MaterialOtherSaveReqVO createReqVO) { + return success(materialOtherService.createMaterialOther(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新物料拓展数据") + @PreAuthorize("@ss.hasPermission('base:material-other:update')") + public CommonResult updateMaterialOther(@Valid @RequestBody MaterialOtherSaveReqVO updateReqVO) { + materialOtherService.updateMaterialOther(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除物料拓展数据") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:material-other:delete')") + public CommonResult deleteMaterialOther(@RequestParam("id") Long id) { + materialOtherService.deleteMaterialOther(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除物料拓展数据") + @PreAuthorize("@ss.hasPermission('base:material-other:delete')") + public CommonResult deleteMaterialOtherList(@RequestBody BatchDeleteReqVO req) { + materialOtherService.deleteMaterialOtherListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得物料拓展数据") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:material-other:query')") + public CommonResult getMaterialOther(@RequestParam("id") Long id) { + MaterialOtherDO materialOther = materialOtherService.getMaterialOther(id); + return success(BeanUtils.toBean(materialOther, MaterialOtherRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得物料拓展数据分页") + @PreAuthorize("@ss.hasPermission('base:material-other:query')") + public CommonResult> getMaterialOtherPage(@Valid MaterialOtherPageReqVO pageReqVO) { + PageResult pageResult = materialOtherService.getMaterialOtherPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaterialOtherRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出物料拓展数据 Excel") + @PreAuthorize("@ss.hasPermission('base:material-other:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaterialOtherExcel(@Valid MaterialOtherPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = materialOtherService.getMaterialOtherPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "物料拓展数据.xls", "数据", MaterialOtherRespVO.class, + BeanUtils.toBean(list, MaterialOtherRespVO.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/WarehouseController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/WarehouseController.java new file mode 100644 index 0000000..aa658b2 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/WarehouseController.java @@ -0,0 +1,107 @@ +package com.zt.plat.module.base.controller.admin.base; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zt.plat.module.base.controller.admin.base.vo.*; +import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO; +import com.zt.plat.module.base.service.base.WarehouseService; + +@Tag(name = "管理后台 - 仓库") +@RestController +@RequestMapping("/base/warehouse") +@Validated +public class WarehouseController { + + + @Resource + private WarehouseService warehouseService; + + @PostMapping("/create") + @Operation(summary = "创建仓库") + @PreAuthorize("@ss.hasPermission('base:warehouse:create')") + public CommonResult createWarehouse(@Valid @RequestBody WarehouseSaveReqVO createReqVO) { + return success(warehouseService.createWarehouse(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新仓库") + @PreAuthorize("@ss.hasPermission('base:warehouse:update')") + public CommonResult updateWarehouse(@Valid @RequestBody WarehouseSaveReqVO updateReqVO) { + warehouseService.updateWarehouse(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除仓库") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('base:warehouse:delete')") + public CommonResult deleteWarehouse(@RequestParam("id") Long id) { + warehouseService.deleteWarehouse(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除仓库") + @PreAuthorize("@ss.hasPermission('base:warehouse:delete')") + public CommonResult deleteWarehouseList(@RequestBody BatchDeleteReqVO req) { + warehouseService.deleteWarehouseListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得仓库") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('base:warehouse:query')") + public CommonResult getWarehouse(@RequestParam("id") Long id) { + WarehouseDO warehouse = warehouseService.getWarehouse(id); + return success(BeanUtils.toBean(warehouse, WarehouseRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得仓库分页") + @PreAuthorize("@ss.hasPermission('base:warehouse:query')") + public CommonResult> getWarehousePage(@Valid WarehousePageReqVO pageReqVO) { + PageResult pageResult = warehouseService.getWarehousePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, WarehouseRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出仓库 Excel") + @PreAuthorize("@ss.hasPermission('base:warehouse:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportWarehouseExcel(@Valid WarehousePageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = warehouseService.getWarehousePage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "仓库.xls", "数据", WarehouseRespVO.class, + BeanUtils.toBean(list, WarehouseRespVO.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/vo/AccountPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java new file mode 100644 index 0000000..4b3e86f --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java @@ -0,0 +1,35 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 账户条款分页 Request VO") +@Data +public class AccountPageReqVO extends PageParam { + + @Schema(description = "类型", example = "2") + private String type; + + @Schema(description = "户名", example = "赵六") + private String accountName; + + @Schema(description = "开户行", example = "2834") + private String bankAccount; + + @Schema(description = "户号") + private String accountNumber; + + @Schema(description = "税号/社会信用代码") + private String taxNumber; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ 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/AccountRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java new file mode 100644 index 0000000..0304659 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java @@ -0,0 +1,43 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 账户条款 Response VO") +@Data +@ExcelIgnoreUnannotated +public class AccountRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15166") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("类型") + private String type; + + @Schema(description = "户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("户名") + private String accountName; + + @Schema(description = "开户行", requiredMode = Schema.RequiredMode.REQUIRED, example = "2834") + @ExcelProperty("开户行") + private String bankAccount; + + @Schema(description = "户号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("户号") + private String accountNumber; + + @Schema(description = "税号/社会信用代码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("税号/社会信用代码") + private String taxNumber; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ 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/AccountSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java new file mode 100644 index 0000000..a580f27 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java @@ -0,0 +1,34 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Schema(description = "管理后台 - 账户条款新增/修改 Request VO") +@Data +public class AccountSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15166") + private Long id; + + @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "类型不能为空") + private String type; + + @Schema(description = "户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @NotEmpty(message = "户名不能为空") + private String accountName; + + @Schema(description = "开户行", requiredMode = Schema.RequiredMode.REQUIRED, example = "2834") + @NotEmpty(message = "开户行不能为空") + private String bankAccount; + + @Schema(description = "户号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "户号不能为空") + private String accountNumber; + + @Schema(description = "税号/社会信用代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "税号/社会信用代码不能为空") + private String taxNumber; + +} \ 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 new file mode 100644 index 0000000..89e23cc --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java @@ -0,0 +1,32 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 公司关系分页 Request VO") +@Data +public class CompanyRelativityPageReqVO extends PageParam { + + @Schema(description = "ERP公司编码;一个供应链公司，可以关联多个ERP公司") + private String erpNumber; + + @Schema(description = "供应链公司编码") + private String number; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "负责人") + private String manager; + + @Schema(description = "部门来源") + private String departmentSource; + +} \ 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/CompanyRelativityRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityRespVO.java new file mode 100644 index 0000000..ceb2dee --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityRespVO.java @@ -0,0 +1,31 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 公司关系 Response VO") +@Data +@ExcelIgnoreUnannotated +public class CompanyRelativityRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "12011") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "ERP公司编码;一个供应链公司，可以关联多个ERP公司", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("ERP公司编码;一个供应链公司，可以关联多个ERP公司") + private String erpNumber; + + @Schema(description = "供应链公司编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("供应链公司编码") + private String number; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ 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/CompanyRelativitySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativitySaveReqVO.java new file mode 100644 index 0000000..b5993da --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativitySaveReqVO.java @@ -0,0 +1,40 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Schema(description = "管理后台 - 公司关系新增/修改 Request VO") +@Data +public class CompanyRelativitySaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "12011") + private Long id; + + @Schema(description = "ERP公司编码;一个供应链公司，可以关联多个ERP公司", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "ERP公司编码;一个供应链公司，可以关联多个ERP公司不能为空") + private String erpNumber; + + @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/ContactPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java new file mode 100644 index 0000000..1871043 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java @@ -0,0 +1,38 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 联系人信息分页 Request VO") +@Data +public class ContactPageReqVO extends PageParam { + + @Schema(description = "类型甲方/乙方", example = "2") + private String type; + + @Schema(description = "联系人") + private String contact; + + @Schema(description = "电话") + private String tel; + + @Schema(description = "邮箱") + private String email; + + @Schema(description = "传真") + private String fax; + + @Schema(description = "联系地址") + private String address; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ 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/ContactRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java new file mode 100644 index 0000000..190a241 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java @@ -0,0 +1,47 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 联系人信息 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ContactRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27121") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "类型甲方/乙方", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("类型甲方/乙方") + private String type; + + @Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("联系人") + private String contact; + + @Schema(description = "电话", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("电话") + private String tel; + + @Schema(description = "邮箱") + @ExcelProperty("邮箱") + private String email; + + @Schema(description = "传真") + @ExcelProperty("传真") + private String fax; + + @Schema(description = "联系地址", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("联系地址") + private String address; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ 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/ContactSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java new file mode 100644 index 0000000..7dc6fa8 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java @@ -0,0 +1,36 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Schema(description = "管理后台 - 联系人信息新增/修改 Request VO") +@Data +public class ContactSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27121") + private Long id; + + @Schema(description = "类型甲方/乙方", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "类型甲方/乙方不能为空") + private String type; + + @Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "联系人不能为空") + private String contact; + + @Schema(description = "电话", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "电话不能为空") + private String tel; + + @Schema(description = "邮箱") + private String email; + + @Schema(description = "传真") + private String fax; + + @Schema(description = "联系地址", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "联系地址不能为空") + private String address; + +} \ 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/ElementPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java new file mode 100644 index 0000000..a93ea20 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java @@ -0,0 +1,32 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 金属元素分页 Request VO") +@Data +public class ElementPageReqVO extends PageParam { + + @Schema(description = "金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", example = "芋艿") + private String name; + + @Schema(description = "金属元素编码") + private String coding; + + @Schema(description = "品位单位") + private String gradeUnit; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ 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/ElementRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java new file mode 100644 index 0000000..9f7c0fe --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java @@ -0,0 +1,39 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 金属元素 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ElementRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21884") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "金属元素缩写", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("金属元素名称") + private String name; + + @Schema(description = "金属元素编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("金属元素编码") + private String coding; + + @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("品位单位") + private String gradeUnit; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ 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/ElementSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java new file mode 100644 index 0000000..eafee0c --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java @@ -0,0 +1,30 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Schema(description = "管理后台 - 金属元素新增/修改 Request VO") +@Data +public class ElementSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21884") + private Long id; + + @Schema(description = "金属元素缩写", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "金属元素缩写不能为空") + private String abbreviation; + + @Schema(description = "金属元素名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @NotEmpty(message = "金属元素名称不能为空") + private String name; + + @Schema(description = "金属元素编码", requiredMode = Schema.RequiredMode.REQUIRED) +// @NotEmpty(message = "金属元素编码不能为空") + private String coding; + + @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "品位单位不能为空") + private String gradeUnit; + +} \ 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/FactoryPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryPageReqVO.java new file mode 100644 index 0000000..b1ec876 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryPageReqVO.java @@ -0,0 +1,38 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 工厂分页 Request VO") +@Data +public class FactoryPageReqVO extends PageParam { + + @Schema(description = "公司编码") + private String companyNumber; + + @Schema(description = "工厂名称", example = "赵六") + private String name; + + @Schema(description = "工厂编码") + private String number; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "是否启用") + private String isEnable; + + @Schema(description = "ERP工厂名称", example = "张三") + private String erpName; + + @Schema(description = "ERP工厂编码") + private String erpNumber; + +} \ 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/FactoryRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryRespVO.java new file mode 100644 index 0000000..4777ca6 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryRespVO.java @@ -0,0 +1,47 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 工厂 Response VO") +@Data +@ExcelIgnoreUnannotated +public class FactoryRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10325") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "公司编码") + @ExcelProperty("公司编码") + private String companyNumber; + + @Schema(description = "工厂名称", example = "赵六") + @ExcelProperty("工厂名称") + private String name; + + @Schema(description = "工厂编码") + @ExcelProperty("工厂编码") + private String number; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "是否启用") + @ExcelProperty("是否启用") + private String isEnable; + + @Schema(description = "ERP工厂名称", example = "张三") + @ExcelProperty("ERP工厂名称") + private String erpName; + + @Schema(description = "ERP工厂编码") + @ExcelProperty("ERP工厂编码") + private String erpNumber; + +} \ 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/FactorySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactorySaveReqVO.java new file mode 100644 index 0000000..df8598f --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactorySaveReqVO.java @@ -0,0 +1,31 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 工厂新增/修改 Request VO") +@Data +public class FactorySaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10325") + private Long id; + + @Schema(description = "公司编码") + private String companyNumber; + + @Schema(description = "工厂名称", example = "赵六") + private String name; + + @Schema(description = "工厂编码") + private String number; + + @Schema(description = "是否启用") + private String isEnable; + + @Schema(description = "ERP工厂名称", example = "张三") + private String erpName; + + @Schema(description = "ERP工厂编码") + private String erpNumber; + +} \ 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 new file mode 100644 index 0000000..795c029 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java @@ -0,0 +1,42 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 物料回收率分页 Request VO") +@Data +public class MaterialDestroyPageReqVO extends PageParam { + + @Schema(description = "原料物料编码") + private String upNumber; + + @Schema(description = "返产品物料编码") + private String downNumber; + + @Schema(description = "回收率") + private BigDecimal ratio; + + @Schema(description = "是否使用该物料核销") + private String operation; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "供应商编码") + private String supplierNumber; + + @Schema(description = "供应商名称", example = "王五") + private String supplierName; + + @Schema(description = "是否启用") + private String isEnable; + +} \ 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/MaterialDestroyRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java new file mode 100644 index 0000000..cee3798 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java @@ -0,0 +1,52 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 物料回收率 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaterialDestroyRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "23885") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "原料物料编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("原料物料编码") + private String upNumber; + + @Schema(description = "返产品物料编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("返产品物料编码") + private String downNumber; + + @Schema(description = "回收率", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("回收率") + private BigDecimal ratio; + + @Schema(description = "是否使用该物料核销") + @ExcelProperty("是否使用该物料核销") + private String operation; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "供应商编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("供应商编码") + private String supplierNumber; + + @Schema(description = "供应商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("供应商名称") + private String supplierName; + + @Schema(description = "是否启用") + @ExcelProperty("是否启用") + private String isEnable; + +} \ 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/MaterialDestroySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java new file mode 100644 index 0000000..85faf99 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java @@ -0,0 +1,43 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 物料回收率新增/修改 Request VO") +@Data +public class MaterialDestroySaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "23885") + private Long id; + + @Schema(description = "原料物料编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "原料物料编码不能为空") + private String upNumber; + + @Schema(description = "返产品物料编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "返产品物料编码不能为空") + private String downNumber; + + @Schema(description = "回收率", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "回收率不能为空") + private BigDecimal ratio; + + @Schema(description = "是否使用该物料核销") + private String operation; + + @Schema(description = "供应商编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "供应商编码不能为空") + private String supplierNumber; + + @Schema(description = "供应商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @NotEmpty(message = "供应商名称不能为空") + private String supplierName; + + @Schema(description = "是否启用") + private String isEnable; + +} \ 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/MaterialInfomationPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationPageReqVO.java new file mode 100644 index 0000000..5e1fe2b --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationPageReqVO.java @@ -0,0 +1,29 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 物料信息分页 Request VO") +@Data +public class MaterialInfomationPageReqVO extends PageParam { + + @Schema(description = "物料编码") + private String code; + + @Schema(description = "物料名称", example = "张三") + private String name; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ 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/MaterialInfomationRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationRespVO.java new file mode 100644 index 0000000..47237be --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationRespVO.java @@ -0,0 +1,35 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 物料信息 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaterialInfomationRespVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3326") + @ExcelProperty("主键ID") + private Long id; + + @Schema(description = "物料编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("物料编码") + private String code; + + @Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @ExcelProperty("物料名称") + private String name; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ 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/MaterialInfomationSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationSaveReqVO.java new file mode 100644 index 0000000..80d5cbe --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationSaveReqVO.java @@ -0,0 +1,26 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Schema(description = "管理后台 - 物料信息新增/修改 Request VO") +@Data +public class MaterialInfomationSaveReqVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3326") + private Long id; + + @Schema(description = "物料编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "物料编码不能为空") + private String code; + + @Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @NotEmpty(message = "物料名称不能为空") + private String name; + + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "备注不能为空") + private String remark; + +} \ 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/MaterialOtherPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherPageReqVO.java new file mode 100644 index 0000000..73e49a5 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherPageReqVO.java @@ -0,0 +1,53 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 物料拓展数据分页 Request VO") +@Data +public class MaterialOtherPageReqVO extends PageParam { + + @Schema(description = "物料编码") + private String materialNumber; + + @Schema(description = "物料名称", example = "王五") + private String materialName; + + @Schema(description = "ERP物料编码") + private String erpMaterialNumber; + + @Schema(description = "ERP物料名称", example = "李四") + private String erpMaterialName; + + @Schema(description = "ERP物料计量单位") + private String unit; + + @Schema(description = "金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", example = "赵六") + private String name; + + @Schema(description = "金属元素编码") + private String coding; + + @Schema(description = "品位单位") + private String gradeUnit; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "小数位数") + private Long decimal; + + @Schema(description = "是否启用") + private String isEnable; + +} \ 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/MaterialOtherRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherRespVO.java new file mode 100644 index 0000000..ec43586 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherRespVO.java @@ -0,0 +1,67 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 物料拓展数据 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaterialOtherRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27804") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "物料编码") + @ExcelProperty("物料编码") + private String materialNumber; + + @Schema(description = "物料名称", example = "王五") + @ExcelProperty("物料名称") + private String materialName; + + @Schema(description = "ERP物料编码") + @ExcelProperty("ERP物料编码") + private String erpMaterialNumber; + + @Schema(description = "ERP物料名称", example = "李四") + @ExcelProperty("ERP物料名称") + private String erpMaterialName; + + @Schema(description = "ERP物料计量单位") + @ExcelProperty("ERP物料计量单位") + private String unit; + + @Schema(description = "金属元素缩写") + @ExcelProperty("金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", example = "赵六") + @ExcelProperty("金属元素名称") + private String name; + + @Schema(description = "金属元素编码") + @ExcelProperty("金属元素编码") + private String coding; + + @Schema(description = "品位单位") + @ExcelProperty("品位单位") + private String gradeUnit; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "小数位数") + @ExcelProperty("小数位数") + private Long decimal; + + @Schema(description = "是否启用") + @ExcelProperty("是否启用") + private String isEnable; + +} \ 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/MaterialOtherSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java new file mode 100644 index 0000000..3c86e30 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java @@ -0,0 +1,46 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 物料拓展数据新增/修改 Request VO") +@Data +public class MaterialOtherSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27804") + private Long id; + + @Schema(description = "物料编码") + private String materialNumber; + + @Schema(description = "物料名称", example = "王五") + private String materialName; + + @Schema(description = "ERP物料编码") + private String erpMaterialNumber; + + @Schema(description = "ERP物料名称", example = "李四") + private String erpMaterialName; + + @Schema(description = "ERP物料计量单位") + private String unit; + + @Schema(description = "金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", example = "赵六") + private String name; + + @Schema(description = "金属元素编码") + private String coding; + + @Schema(description = "品位单位") + private String gradeUnit; + + @Schema(description = "小数位数") + private Long decimal; + + @Schema(description = "是否启用") + private String isEnable; + +} \ 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/WarehousePageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehousePageReqVO.java new file mode 100644 index 0000000..2d3d802 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehousePageReqVO.java @@ -0,0 +1,44 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.zt.plat.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 仓库分页 Request VO") +@Data +public class WarehousePageReqVO extends PageParam { + + @Schema(description = "工厂编码") + private String factoryNumber; + + @Schema(description = "仓库名称", example = "李四") + private String name; + + @Schema(description = "仓库编码") + private String coding; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "工厂名称", example = "李四") + private String factoryName; + + @Schema(description = "是否启用") + private String isEnable; + + @Schema(description = "公司编码") + private String companyNumber; + + @Schema(description = "ERP库位编码") + private String erpCoding; + + @Schema(description = "ERP库位名称", example = "赵六") + private String erpName; + +} \ 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/WarehouseRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseRespVO.java new file mode 100644 index 0000000..bf2852b --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseRespVO.java @@ -0,0 +1,55 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 仓库 Response VO") +@Data +@ExcelIgnoreUnannotated +public class WarehouseRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18014") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "工厂编码") + @ExcelProperty("工厂编码") + private String factoryNumber; + + @Schema(description = "仓库名称", example = "李四") + @ExcelProperty("仓库名称") + private String name; + + @Schema(description = "仓库编码") + @ExcelProperty("仓库编码") + private String coding; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "工厂名称", example = "李四") + @ExcelProperty("工厂名称") + private String factoryName; + + @Schema(description = "是否启用") + @ExcelProperty("是否启用") + private String isEnable; + + @Schema(description = "公司编码") + @ExcelProperty("公司编码") + private String companyNumber; + + @Schema(description = "ERP库位编码") + @ExcelProperty("ERP库位编码") + private String erpCoding; + + @Schema(description = "ERP库位名称", example = "赵六") + @ExcelProperty("ERP库位名称") + private String erpName; + +} \ 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/WarehouseSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseSaveReqVO.java new file mode 100644 index 0000000..482b0b9 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseSaveReqVO.java @@ -0,0 +1,37 @@ +package com.zt.plat.module.base.controller.admin.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 仓库新增/修改 Request VO") +@Data +public class WarehouseSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18014") + private Long id; + + @Schema(description = "工厂编码") + private String factoryNumber; + + @Schema(description = "仓库名称", example = "李四") + private String name; + + @Schema(description = "仓库编码") + private String coding; + + @Schema(description = "工厂名称", example = "李四") + private String factoryName; + + @Schema(description = "是否启用") + private String isEnable; + + @Schema(description = "公司编码") + private String companyNumber; + + @Schema(description = "ERP库位编码") + private String erpCoding; + + @Schema(description = "ERP库位名称", example = "赵六") + private String erpName; + +} \ 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/templtp/TemplateInstanceController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java index fdd827e..f0c765d 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java @@ -1,12 +1,11 @@ package com.zt.plat.module.base.controller.admin.templtp; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstancePageReqVO; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceRespVO; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceSaveReqVO; +import com.zt.plat.module.base.controller.admin.templtp.vo.*; import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDO; import com.zt.plat.module.base.service.tmpltp.TemplateInstanceService; import com.zt.plat.module.infra.api.file.FileApi; +import jakarta.validation.constraints.NotEmpty; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -21,6 +20,7 @@ import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.*; import jakarta.servlet.http.*; + import java.util.*; import java.io.IOException; @@ -29,6 +29,7 @@ import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.util.object.BeanUtils; + import static com.zt.plat.framework.common.pojo.CommonResult.success; import com.zt.plat.framework.excel.core.util.ExcelUtils; @@ -39,7 +40,6 @@ import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - @Tag(name = "管理后台 - 模板实例") @RestController @RequestMapping("/base/template-instance") @@ -50,28 +50,14 @@ public class TemplateInstanceController extends AbstractFileUploadController { static { FileUploadController annotation = TemplateInstanceController.class.getAnnotation(FileUploadController.class); if (annotation != null) { - setFileUploadInfo(annotation); + setFileUploadInfo(annotation); } } @Resource private TemplateInstanceService templateInstanceService; - @Resource - private FileApi fileApi; -// @PostMapping("/upload-file") -// @Operation(summary = "上传模板实例文件") -// public CommonResult >upload(MultipartFile file) { -// Map fileMap = new HashMap<>(); -// try { -// String fileWhitReturn = fileApi.createFile(file.getBytes(), file.getOriginalFilename()); -// fileMap.put("fileUrl", fileWhitReturn); -// } catch (IOException e) { -// throw new RuntimeException(e); -// } -// return success(fileMap); -// } @PostMapping("/create") @Operation(summary = "创建模板实例") @PreAuthorize("@ss.hasPermission('bse:template-instance:create')") @@ -99,7 +85,7 @@ public class TemplateInstanceController extends AbstractFileUploadController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除模板实例") - @PreAuthorize("@ss.hasPermission('bse:template-instance:delete')") + @PreAuthorize("@ss.hasPermission('bse:template-instance:delete')") public CommonResult deleteTemplateInstanceList(@RequestBody BatchDeleteReqVO req) { templateInstanceService.deleteTemplateInstanceListByIds(req.getIds()); return success(true); @@ -112,7 +98,7 @@ public class TemplateInstanceController extends AbstractFileUploadController { public CommonResult getTemplateInstance(@RequestParam("id") Long id) { TemplateInstanceDO templateInstance = templateInstanceService.getTemplateInstance(id); TemplateInstanceRespVO templateInstanceRespVO = BeanUtils.toBean(templateInstance, TemplateInstanceRespVO.class); - templateInstanceRespVO.setDeptIds(templateInstanceService.getDeptByInstanId(id)); + templateInstanceService.getDetailedInfo(templateInstanceRespVO); return success(templateInstanceRespVO); } @@ -121,7 +107,11 @@ public class TemplateInstanceController extends AbstractFileUploadController { @PreAuthorize("@ss.hasPermission('bse:template-instance:query')") public CommonResult> getTemplateInstancePage(@Valid TemplateInstancePageReqVO pageReqVO) { PageResult pageResult = templateInstanceService.getTemplateInstancePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, TemplateInstanceRespVO.class)); + PageResult templateInstanceRespVOPageResult = BeanUtils.toBean(pageResult, TemplateInstanceRespVO.class); + templateInstanceRespVOPageResult.getList().forEach(templateInstanceRespVO -> { + templateInstanceService.getDetailedInfo(templateInstanceRespVO); + }); + return success(templateInstanceRespVOPageResult); } @GetMapping("/export-excel") @@ -129,12 +119,62 @@ public class TemplateInstanceController extends AbstractFileUploadController { @PreAuthorize("@ss.hasPermission('bse:template-instance:export')") @ApiAccessLog(operateType = EXPORT) public void exportTemplateInstanceExcel(@Valid TemplateInstancePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = templateInstanceService.getTemplateInstancePage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "模板实例.xls", "数据", TemplateInstanceRespVO.class, - BeanUtils.toBean(list, TemplateInstanceRespVO.class)); + BeanUtils.toBean(list, TemplateInstanceRespVO.class)); } + //模版实例发布 + @PostMapping("/publish-batch") + @Operation(summary = "模版实例发布") + @PreAuthorize("@ss.hasPermission('bse:template-instance:publish')") + public CommonResult publishTemplateInstance(@Valid @RequestBody List publishReqVOS) { + templateInstanceService.publishTemplateInstance(publishReqVOS); + return success(true); + } + + //不显示停用状态的查询接口 + @GetMapping("/list-excluding-disabled") + @Operation(summary = "获得模板实例") + @PreAuthorize("@ss.hasPermission('bse:template-instance:query')") + public CommonResult> listExcludingDisabled(@Valid TemplateInstancePageReqVO pageReqVO) { + PageResult templateInstanceRespVOPageResult = BeanUtils.toBean(templateInstanceService.listExcludingDisabled(pageReqVO), TemplateInstanceRespVO.class); + templateInstanceRespVOPageResult.getList().forEach( + templateInstanceRespVO -> + templateInstanceService.getDetailedInfo(templateInstanceRespVO)); + return success(templateInstanceRespVOPageResult); + } + + //停用和启用接口 + @PostMapping("/disable-enable") + @Operation(summary = "实例停用和启用接口",description = "实例停用和启用接口") + @PreAuthorize("@ss.hasPermission('bse:template-instance:disable-enable')") + public CommonResult setDisableOrEnable(@Valid @RequestBody DisableEnableReqVO reqVO) { + templateInstanceService.setDisableOrEnable(reqVO); + return success(true); + } + //根据id获取实例版本号 + @GetMapping("/get-version") + @Operation(summary = "根据id获取实例版本号") + public CommonResult> getVersion(@RequestParam("id") String id) { + return success(templateInstanceService.getVersion(id)); + } + + //创建版本 + @PostMapping("/create-version") + @Operation(summary = "创建版本") + @PreAuthorize("@ss.hasPermission('bse:template-instance:create-version')") + public CommonResult createVersion(@Valid @NotEmpty(message = "模版实例id不能为空") String id) { + return success(templateInstanceService.createVersion(id)); + } + + //通过模版编码查看历史版本 + @GetMapping("/list-by-template-cdg") + @Operation(summary = "通过模版编码(cdg)查看历史版本",description = "通过模版编码查看历史版本,已按照发布时间和创建时间降序排序") + public CommonResult> listByTemplateCode(@RequestParam("cdg") @Valid @NotEmpty(message = "模版编号不能为空") String templateCode) { + return success(templateInstanceService.listByCdg(templateCode)); + } } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/DisableEnableReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/DisableEnableReqVO.java new file mode 100644 index 0000000..d8de1d5 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/DisableEnableReqVO.java @@ -0,0 +1,18 @@ +package com.zt.plat.module.base.controller.admin.templtp.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +import java.util.List; + +@Schema(description = "管理后台 - 实例启用与禁用 Request VO") +@Data +public class DisableEnableReqVO { + @Schema(description = "实例主键(id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "实例主键不能为空") + private List ids; + @Schema(description = "操作类型;操作类型type,type的值启用为enable，禁用为disable", requiredMode = Schema.RequiredMode.REQUIRED, example = "enable") + @NotEmpty(message = "实例操作类型不能为空") + private String type; +} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/PublishTemplateInstanceReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/PublishTemplateInstanceReqVO.java new file mode 100644 index 0000000..4a04cc2 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/PublishTemplateInstanceReqVO.java @@ -0,0 +1,16 @@ +package com.zt.plat.module.base.controller.admin.templtp.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + + +@Schema(description = "管理后台 - 实例发布 Request VO") +@Data +public class PublishTemplateInstanceReqVO { + @Schema(description = "主键;需要发布的模版实例id，类型是长整型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @NotEmpty(message = "id不能为空") + private String id; + @Schema(description = "当前状态;对应模版状态字段sts。需要传当前记录的状态,非必传。类型是字符串", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private String currentStatus; +} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceDataRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceDataRespVO.java index 3e41942..a744a72 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceDataRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceDataRespVO.java @@ -31,5 +31,4 @@ public class TemplateInstanceDataRespVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; - } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java index 9fb3f71..430a579 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java @@ -32,4 +32,8 @@ public class TemplateInstanceItemRespVO { @ExcelProperty("创建时间") private LocalDate createTime; + @Schema(description = "条款名", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("条款名") + private String itmName; + } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java index 6d9bca1..9cc4a28 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java @@ -56,6 +56,15 @@ public class TemplateInstanceRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @Schema(description = "使用部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @Schema(description = "发布时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("发布时间") + private LocalDateTime publishTime; + + + @Schema(description = "使用部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "") private List deptIds; + @Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "") + private List templateInstanceDataRespVOS; + @Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "") + private List instanceItemRespVOS; } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceSaveReqVO.java index 8ecdf4d..b00bd29 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceSaveReqVO.java @@ -21,9 +21,9 @@ public class TemplateInstanceSaveReqVO { @NotEmpty(message = "模板名称不能为空") private String name; - @Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "模板编码不能为空") - private String cdg; +// @Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED) +// @NotEmpty(message = "模板编码不能为空") +// private String cdg; @Schema(description = "模板描述") private String dsp; 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 new file mode 100644 index 0000000..72cd354 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java @@ -0,0 +1,92 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; +/** +* 账户条款 DO +* +* @author 后台管理 +*/ +@TableName("sply_acct") +@KeySequence("sply_acct_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class AccountDO extends BaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 类型 + */ + @TableField("TP") + private String type; + /** + * 户名 + */ + @TableField("ACCT_NAME") + private String accountName; + /** + * 开户行 + */ + @TableField("BNK_ACCT") + private String bankAccount; + /** + * 户号 + */ + @TableField("ACCT_NUM") + private String accountNumber; + /** + * 税号/社会信用代码 + */ + @TableField("TAX_NUM") + private String taxNumber; + /** + * 公司编号 + */ + @TableField("COMPANY_ID") + private Long companyId; + /** + * 公司名称 + */ + @TableField("COMPANY_NAME") + private String companyName; + /** + * 部门编号 + */ + @TableField("DEPT_ID") + private Long deptId; + /** + * 部门名称 + */ + @TableField("DEPT_NAME") + private String deptName; + /** + * 岗位编号 + */ + @TableField("POST_ID") + private Long postId; + /** + * 创建人名称 + */ + @TableField("CREATOR_NAME") + private String creatorName; + /** + * 更新人名称 + */ + @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/CompanyRelativityDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelativityDO.java new file mode 100644 index 0000000..d07c23c --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelativityDO.java @@ -0,0 +1,96 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; +/** +* 公司关系 DO +* +* @author 后台管理 +*/ +@TableName("sply_cpn_rel") +@KeySequence("sply_cpn_rel_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class CompanyRelativityDO extends BaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * ERP公司编码;一个供应链公司，可以关联多个ERP公司 + */ + @TableField("ERP_NUM") + private String erpNumber; + + // erp名称 + private String erpName; + + /** + * 供应链公司编码 + */ + @TableField("NUM") + private String number; + /** + * 公司编号 + */ + @TableField("COMPANY_ID") + private Long companyId; + /** + * 公司名称 + */ + @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; + /** + * 部门编号 + */ + @TableField("DEPT_ID") + private Long deptId; + /** + * 部门名称 + */ + @TableField("DEPT_NAME") + private String deptName; + /** + * 岗位编号 + */ + @TableField("POST_ID") + private Long postId; + /** + * 创建人名称 + */ + @TableField("CREATOR_NAME") + private String creatorName; + /** + * 更新人名称 + */ + @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 new file mode 100644 index 0000000..c694235 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java @@ -0,0 +1,97 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; +/** +* 联系人信息 DO +* +* @author 后台管理 +*/ +@TableName("sply_ctct") +@KeySequence("sply_ctct_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class ContactDO extends BaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 类型甲方/乙方 + */ + @TableField("TP") + private String type; + /** + * 联系人 + */ + @TableField("CTCT") + private String contact; + /** + * 电话 + */ + @TableField("TEL") + private String tel; + /** + * 邮箱 + */ + @TableField("EM") + private String email; + /** + * 传真 + */ + @TableField("FAX") + private String fax; + /** + * 联系地址 + */ + @TableField("ADR") + private String address; + /** + * 公司编号 + */ + @TableField("COMPANY_ID") + private Long companyId; + /** + * 公司名称 + */ + @TableField("COMPANY_NAME") + private String companyName; + /** + * 部门编号 + */ + @TableField("DEPT_ID") + private Long deptId; + /** + * 部门名称 + */ + @TableField("DEPT_NAME") + private String deptName; + /** + * 岗位编号 + */ + @TableField("POST_ID") + private Long postId; + /** + * 创建人名称 + */ + @TableField("CREATOR_NAME") + private String creatorName; + /** + * 更新人名称 + */ + @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/ElementDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java new file mode 100644 index 0000000..66172eb --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java @@ -0,0 +1,88 @@ +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 +* +* @author 后台管理 +*/ +@TableName("sply_elem") +@KeySequence("sply_elem_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class ElementDO extends BusinessBaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 金属元素缩写 + */ + @TableField("ABBR") + private String abbreviation; + /** + * 金属元素名称 + */ + @TableField("NAME") + private String name; + /** + * 金属元素编码 + */ + @TableField("CDG") + private String coding; + /** + * 品位单位 + */ + @TableField("GRD_UNT") + private String gradeUnit; + /** + * 公司编号 + */ + @TableField("COMPANY_ID") + private Long companyId; + /** + * 公司名称 + */ + @TableField("COMPANY_NAME") + private String companyName; + /** + * 部门编号 + */ + @TableField("DEPT_ID") + private Long deptId; + /** + * 部门名称 + */ + @TableField("DEPT_NAME") + private String deptName; + /** + * 岗位编号 + */ + @TableField("POST_ID") + private Long postId; + /** + * 创建人名称 + */ + @TableField("CREATOR_NAME") + private String creatorName; + /** + * 更新人名称 + */ + @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/FactoryDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java new file mode 100644 index 0000000..3de9f40 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java @@ -0,0 +1,97 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; +/** +* 工厂 DO +* +* @author 后台管理 +*/ +@TableName("sply_fact") +@KeySequence("sply_fact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class FactoryDO extends BaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 公司编码 + */ + @TableField("CPN_NUM") + private String companyNumber; + /** + * 工厂名称 + */ + @TableField("NAME") + private String name; + /** + * 工厂编码 + */ + @TableField("NUM") + private String number; + /** + * 公司编号 + */ + @TableField("COMPANY_ID") + private Long companyId; + /** + * 公司名称 + */ + @TableField("COMPANY_NAME") + private String companyName; + /** + * 部门编号 + */ + @TableField("DEPT_ID") + private Long deptId; + /** + * 部门名称 + */ + @TableField("DEPT_NAME") + private String deptName; + /** + * 岗位编号 + */ + @TableField("POST_ID") + private Long postId; + /** + * 创建人名称 + */ + @TableField("CREATOR_NAME") + private String creatorName; + /** + * 更新人名称 + */ + @TableField("UPDATER_NAME") + private String updaterName; + /** + * 是否启用 + */ + @TableField("IS_ENB") + private String isEnable; + /** + * ERP工厂名称 + */ + @TableField("ERP_NAME") + private String erpName; + /** + * ERP工厂编码 + */ + @TableField("ERP_NUM") + private String erpNumber; + +} \ 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/MaterialDestroyDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java new file mode 100644 index 0000000..418e2b4 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java @@ -0,0 +1,104 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; + +import java.math.BigDecimal; +/** +* 物料回收率 DO +* +* @author 后台管理 +*/ +@TableName("sply_mtrl_dstr") +@KeySequence("sply_mtrl_dstr_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class MaterialDestroyDO extends BaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 原料物料编码 + */ + @TableField("UP_NUM") + private String upNumber; + /** + * 返产品物料编码 + */ + @TableField("DOWN_NUM") + private String downNumber; + /** + * 回收率 + */ + @TableField("RTIO") + private BigDecimal ratio; + /** + * 是否使用该物料核销 + */ + @TableField("OPTN") + private String operation; + /** + * 公司编号 + */ + @TableField("COMPANY_ID") + private Long companyId; + /** + * 公司名称 + */ + @TableField("COMPANY_NAME") + private String companyName; + /** + * 部门编号 + */ + @TableField("DEPT_ID") + private Long deptId; + /** + * 部门名称 + */ + @TableField("DEPT_NAME") + private String deptName; + /** + * 岗位编号 + */ + @TableField("POST_ID") + private Long postId; + /** + * 创建人名称 + */ + @TableField("CREATOR_NAME") + private String creatorName; + /** + * 更新人名称 + */ + @TableField("UPDATER_NAME") + private String updaterName; + /** + * 供应商编码 + */ + @TableField("SPLR_NUM") + private String supplierNumber; + /** + * 供应商名称 + */ + @TableField("SPLR_NAME") + private String supplierName; + /** + * 是否启用 + */ + @TableField("IS_ENB") + private String isEnable; + +} \ 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/MaterialInfomationDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialInfomationDO.java new file mode 100644 index 0000000..1515714 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialInfomationDO.java @@ -0,0 +1,47 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; +/** +* 物料信息 DO +* +* @author 后台管理 +*/ +@TableName("bse_mtrl_inf") +@KeySequence("bse_mtrl_inf_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class MaterialInfomationDO extends BaseDO { + + + + /** + * 主键ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 物料编码 + */ + @TableField("CD") + private String code; + /** + * 物料名称 + */ + @TableField("NAME") + private String name; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ 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/MaterialOtherDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java new file mode 100644 index 0000000..696c895 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java @@ -0,0 +1,122 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; +/** +* 物料拓展数据 DO +* +* @author 后台管理 +*/ +@TableName("sply_mtrl_oth") +@KeySequence("sply_mtrl_oth_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class MaterialOtherDO extends BaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 物料编码 + */ + @TableField("MTRL_NUM") + private String materialNumber; + /** + * 物料名称 + */ + @TableField("MTRL_NAME") + private String materialName; + /** + * ERP物料编码 + */ + @TableField("ERP_MTRL_NUM") + private String erpMaterialNumber; + /** + * ERP物料名称 + */ + @TableField("ERP_MTRL_NAME") + private String erpMaterialName; + /** + * ERP物料计量单位 + */ + @TableField("UNT") + private String unit; + /** + * 金属元素缩写 + */ + @TableField("ABBR") + private String abbreviation; + /** + * 金属元素名称 + */ + @TableField("NAME") + private String name; + /** + * 金属元素编码 + */ + @TableField("CDG") + private String coding; + /** + * 品位单位 + */ + @TableField("GRD_UNT") + private String gradeUnit; + /** + * 公司编号 + */ + @TableField("COMPANY_ID") + private Long companyId; + /** + * 公司名称 + */ + @TableField("COMPANY_NAME") + private String companyName; + /** + * 部门编号 + */ + @TableField("DEPT_ID") + private Long deptId; + /** + * 部门名称 + */ + @TableField("DEPT_NAME") + private String deptName; + /** + * 岗位编号 + */ + @TableField("POST_ID") + private Long postId; + /** + * 小数位数 + */ + @TableField("DEC") + private Long decimal; + /** + * 创建人名称 + */ + @TableField("CREATOR_NAME") + private String creatorName; + /** + * 更新人名称 + */ + @TableField("UPDATER_NAME") + private String updaterName; + /** + * 是否启用 + */ + @TableField("IS_ENB") + private String isEnable; + +} \ 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/WarehouseDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java new file mode 100644 index 0000000..f0a1d45 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java @@ -0,0 +1,107 @@ +package com.zt.plat.module.base.dal.dataobject.base; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; +/** +* 仓库 DO +* +* @author 后台管理 +*/ +@TableName("sply_wrh") +@KeySequence("sply_wrh_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class WarehouseDO extends BaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 工厂编码 + */ + @TableField("FACT_NUM") + private String factoryNumber; + /** + * 仓库名称 + */ + @TableField("NAME") + private String name; + /** + * 仓库编码 + */ + @TableField("CDG") + private String coding; + /** + * 公司编号 + */ + @TableField("COMPANY_ID") + private Long companyId; + /** + * 公司名称 + */ + @TableField("COMPANY_NAME") + private String companyName; + /** + * 部门编号 + */ + @TableField("DEPT_ID") + private Long deptId; + /** + * 部门名称 + */ + @TableField("DEPT_NAME") + private String deptName; + /** + * 岗位编号 + */ + @TableField("POST_ID") + private Long postId; + /** + * 创建人名称 + */ + @TableField("CREATOR_NAME") + private String creatorName; + /** + * 更新人名称 + */ + @TableField("UPDATER_NAME") + private String updaterName; + /** + * 工厂名称 + */ + @TableField("FACT_NAME") + private String factoryName; + /** + * 是否启用 + */ + @TableField("IS_ENB") + private String isEnable; + /** + * 公司编码 + */ + @TableField("CPN_NUM") + private String companyNumber; + /** + * ERP库位编码 + */ + @TableField("ERP_CDG") + private String erpCoding; + /** + * ERP库位名称 + */ + @TableField("ERP_NAME") + private String erpName; + +} \ 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/tmpltp/DepartmentInstanceRelativityDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/DepartmentInstanceRelativityDO.java index e2864e2..95d3ab0 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/DepartmentInstanceRelativityDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/DepartmentInstanceRelativityDO.java @@ -1,9 +1,8 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; -import lombok.*; -import java.util.*; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +import lombok.*; /** * 部门与实例关联 DO * diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDO.java index f38899d..b2eb6bc 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDO.java @@ -1,12 +1,14 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; -import java.util.*; - import java.time.LocalDateTime; - import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; + +import java.time.LocalDateTime; + /** * 模板实例 DO * @@ -68,6 +70,12 @@ public class TemplateInstanceDO extends BusinessBaseDO { * 状态 */ private String sts; + + + /** + * 发布时间 + */ + private LocalDateTime publishTime; // /** // * 公司编号 // */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDataDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDataDO.java index 64d37db..b4547d2 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDataDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDataDO.java @@ -1,11 +1,8 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; -import lombok.*; -import java.util.*; - import java.time.LocalDateTime; - import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +import lombok.*; /** * 实例字段值 DO * diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceItemDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceItemDO.java index b76d4a9..00b2049 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceItemDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceItemDO.java @@ -1,9 +1,8 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; -import lombok.*; -import java.util.*; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +import lombok.*; /** * 实例条款值 DO * diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplFldRelDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplFldRelDO.java index f6aabb6..8d0756f 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplFldRelDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplFldRelDO.java @@ -1,17 +1,8 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; +import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; @TableName("BSE_TMPL_FLD_REL") @KeySequence("BSE_TMPL_FLD_REL_SEQ") diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmDO.java index deffb71..0996f78 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmDO.java @@ -1,17 +1,8 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; +import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; @TableName("BSE_TMPL_ITM") @KeySequence("BSE_TMPL_ITM_SEQ") diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmRelDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmRelDO.java index a1a34ac..913fb35 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmRelDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmRelDO.java @@ -1,17 +1,8 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; +import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; @TableName("BSE_TMPL_ITM_REL") @KeySequence("BSE_TMPL_ITM_REL_SEQ") diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpDO.java index a518594..40193c4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpDO.java @@ -1,9 +1,8 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; -import lombok.*; -import java.util.*; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +import lombok.*; /** * 模板分类 DO * diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpFldDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpFldDO.java index 3ca4b5f..9ffb89a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpFldDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpFldDO.java @@ -1,14 +1,12 @@ package com.zt.plat.module.base.dal.dataobject.tmpltp; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; -import java.time.LocalDateTime; - /** * 字段库 DO - * 对应数据库表：BIZ_TMPL_TP_FLD + * 对应数据库表：BSE_TMPL_TP_FLD * * @author 后台管理 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java new file mode 100644 index 0000000..9530a08 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java @@ -0,0 +1,29 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.AccountPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.AccountDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 账户条款 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface AccountMapper extends BaseMapperX { + + default PageResult selectPage(AccountPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(AccountDO::getType, reqVO.getType()) + .likeIfPresent(AccountDO::getAccountName, reqVO.getAccountName()) + .eqIfPresent(AccountDO::getBankAccount, reqVO.getBankAccount()) + .eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber()) + .eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber()) + .betweenIfPresent(AccountDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(AccountDO::getId)); + } + +} \ 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/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 new file mode 100644 index 0000000..99d67b4 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java @@ -0,0 +1,29 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.CompanyRelativityDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 公司关系 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface CompanyRelativityMapper extends BaseMapperX { + + default PageResult selectPage(CompanyRelativityPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(CompanyRelativityDO::getErpNumber, reqVO.getErpNumber()) + .eqIfPresent(CompanyRelativityDO::getNumber, reqVO.getNumber()) + .betweenIfPresent(CompanyRelativityDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(CompanyRelativityDO::getId)); + } + + 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/dal/mysql/base/ContactMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java new file mode 100644 index 0000000..6738f99 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java @@ -0,0 +1,30 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.ContactPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.ContactDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 联系人信息 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface ContactMapper extends BaseMapperX { + + default PageResult selectPage(ContactPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ContactDO::getType, reqVO.getType()) + .eqIfPresent(ContactDO::getContact, reqVO.getContact()) + .eqIfPresent(ContactDO::getTel, reqVO.getTel()) + .eqIfPresent(ContactDO::getEmail, reqVO.getEmail()) + .eqIfPresent(ContactDO::getFax, reqVO.getFax()) + .eqIfPresent(ContactDO::getAddress, reqVO.getAddress()) + .betweenIfPresent(ContactDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(ContactDO::getId)); + } + +} \ 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/mysql/base/ElementMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java new file mode 100644 index 0000000..665280c --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java @@ -0,0 +1,29 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.ElementPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.ElementDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 金属元素 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface ElementMapper extends BaseMapperX { + + default PageResult selectPage(ElementPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation()) + .likeIfPresent(ElementDO::getName, reqVO.getName()) + .eqIfPresent(ElementDO::getCoding, reqVO.getCoding()) + .eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit()) + .betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(ElementDO::getId)); + } + + String selectMaxCode(); +} \ 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/mysql/base/FactoryMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java new file mode 100644 index 0000000..4cf825f --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java @@ -0,0 +1,30 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.FactoryPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.FactoryDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 工厂 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface FactoryMapper extends BaseMapperX { + + default PageResult selectPage(FactoryPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(FactoryDO::getCompanyNumber, reqVO.getCompanyNumber()) + .likeIfPresent(FactoryDO::getName, reqVO.getName()) + .eqIfPresent(FactoryDO::getNumber, reqVO.getNumber()) + .betweenIfPresent(FactoryDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(FactoryDO::getIsEnable, reqVO.getIsEnable()) + .likeIfPresent(FactoryDO::getErpName, reqVO.getErpName()) + .eqIfPresent(FactoryDO::getErpNumber, reqVO.getErpNumber()) + .orderByDesc(FactoryDO::getId)); + } + +} \ 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/mysql/base/MaterialDestroyMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java new file mode 100644 index 0000000..3ae3887 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java @@ -0,0 +1,31 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.MaterialDestroyPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 物料回收率 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface MaterialDestroyMapper extends BaseMapperX { + + default PageResult selectPage(MaterialDestroyPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaterialDestroyDO::getUpNumber, reqVO.getUpNumber()) + .eqIfPresent(MaterialDestroyDO::getDownNumber, reqVO.getDownNumber()) + .eqIfPresent(MaterialDestroyDO::getRatio, reqVO.getRatio()) + .eqIfPresent(MaterialDestroyDO::getOperation, reqVO.getOperation()) + .betweenIfPresent(MaterialDestroyDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(MaterialDestroyDO::getSupplierNumber, reqVO.getSupplierNumber()) + .likeIfPresent(MaterialDestroyDO::getSupplierName, reqVO.getSupplierName()) + .eqIfPresent(MaterialDestroyDO::getIsEnable, reqVO.getIsEnable()) + .orderByDesc(MaterialDestroyDO::getId)); + } + +} \ 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/mysql/base/MaterialInfomationMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java new file mode 100644 index 0000000..2e353cb --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java @@ -0,0 +1,27 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.MaterialInfomationPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 物料信息 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface MaterialInfomationMapper extends BaseMapperX { + + default PageResult selectPage(MaterialInfomationPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaterialInfomationDO::getCode, reqVO.getCode()) + .likeIfPresent(MaterialInfomationDO::getName, reqVO.getName()) + .eqIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(MaterialInfomationDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(MaterialInfomationDO::getId)); + } + +} \ 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/mysql/base/MaterialOtherMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java new file mode 100644 index 0000000..ced6a90 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java @@ -0,0 +1,35 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.MaterialOtherPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 物料拓展数据 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface MaterialOtherMapper extends BaseMapperX { + + default PageResult selectPage(MaterialOtherPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MaterialOtherDO::getMaterialNumber, reqVO.getMaterialNumber()) + .likeIfPresent(MaterialOtherDO::getMaterialName, reqVO.getMaterialName()) + .eqIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber()) + .likeIfPresent(MaterialOtherDO::getErpMaterialName, reqVO.getErpMaterialName()) + .eqIfPresent(MaterialOtherDO::getUnit, reqVO.getUnit()) + .eqIfPresent(MaterialOtherDO::getAbbreviation, reqVO.getAbbreviation()) + .likeIfPresent(MaterialOtherDO::getName, reqVO.getName()) + .eqIfPresent(MaterialOtherDO::getCoding, reqVO.getCoding()) + .eqIfPresent(MaterialOtherDO::getGradeUnit, reqVO.getGradeUnit()) + .betweenIfPresent(MaterialOtherDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(MaterialOtherDO::getDecimal, reqVO.getDecimal()) + .eqIfPresent(MaterialOtherDO::getIsEnable, reqVO.getIsEnable()) + .orderByDesc(MaterialOtherDO::getId)); + } + +} \ 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/mysql/base/WarehouseMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java new file mode 100644 index 0000000..add8c1b --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java @@ -0,0 +1,32 @@ +package com.zt.plat.module.base.dal.mysql.base; + +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.WarehousePageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 仓库 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface WarehouseMapper extends BaseMapperX { + + default PageResult selectPage(WarehousePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(WarehouseDO::getFactoryNumber, reqVO.getFactoryNumber()) + .likeIfPresent(WarehouseDO::getName, reqVO.getName()) + .eqIfPresent(WarehouseDO::getCoding, reqVO.getCoding()) + .betweenIfPresent(WarehouseDO::getCreateTime, reqVO.getCreateTime()) + .likeIfPresent(WarehouseDO::getFactoryName, reqVO.getFactoryName()) + .eqIfPresent(WarehouseDO::getIsEnable, reqVO.getIsEnable()) + .eqIfPresent(WarehouseDO::getCompanyNumber, reqVO.getCompanyNumber()) + .eqIfPresent(WarehouseDO::getErpCoding, reqVO.getErpCoding()) + .likeIfPresent(WarehouseDO::getErpName, reqVO.getErpName()) + .orderByDesc(WarehouseDO::getId)); + } + +} \ 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/mysql/tmpltp/DepartmentInstanceRelativityMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/DepartmentInstanceRelativityMapper.java index 8cc2659..c3d79d6 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/DepartmentInstanceRelativityMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/DepartmentInstanceRelativityMapper.java @@ -1,11 +1,8 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; -import java.util.*; - import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; 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.templtp.vo.DepartmentInstanceRelativityPageReqVO; import com.zt.plat.module.base.dal.dataobject.tmpltp.DepartmentInstanceRelativityDO; import org.apache.ibatis.annotations.Mapper; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceDataMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceDataMapper.java index 197e6b7..215ad5a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceDataMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceDataMapper.java @@ -1,11 +1,8 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; -import java.util.*; - import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; 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.templtp.vo.TemplateInstanceDataPageReqVO; import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDataDO; import org.apache.ibatis.annotations.Mapper; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceItemMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceItemMapper.java index e1cee97..6dd5476 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceItemMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceItemMapper.java @@ -1,11 +1,8 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; -import java.util.*; - import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; 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.templtp.vo.TemplateInstanceItemPageReqVO; import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceItemDO; import org.apache.ibatis.annotations.Mapper; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceMapper.java index 66b7384..d475c01 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceMapper.java @@ -1,13 +1,11 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; -import java.util.*; - import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; 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.templtp.vo.TemplateInstancePageReqVO; import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDO; +import com.zt.plat.module.tmpltp.enums.TmplStsEnum; import org.apache.ibatis.annotations.Mapper; @@ -33,5 +31,20 @@ public interface TemplateInstanceMapper extends BaseMapperX .betweenIfPresent(TemplateInstanceDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(TemplateInstanceDO::getId)); } + default PageResult listExcludingDisabled(TemplateInstancePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(TemplateInstanceDO::getTpId, reqVO.getTpId()) + .likeIfPresent(TemplateInstanceDO::getName, reqVO.getName()) + .eqIfPresent(TemplateInstanceDO::getCdg, reqVO.getCdg()) + .eqIfPresent(TemplateInstanceDO::getDsp, reqVO.getDsp()) + .eqIfPresent(TemplateInstanceDO::getCntt, reqVO.getCntt()) + .eqIfPresent(TemplateInstanceDO::getOrigCntt, reqVO.getOrigCntt()) + .eqIfPresent(TemplateInstanceDO::getFileTp, reqVO.getFileTp()) + .eqIfPresent(TemplateInstanceDO::getVer, reqVO.getVer()) + .eqIfPresent(TemplateInstanceDO::getSts, reqVO.getSts()) + .betweenIfPresent(TemplateInstanceDO::getCreateTime, reqVO.getCreateTime()) + .ne(TemplateInstanceDO::getSts, TmplStsEnum.STOPPED.getCode()) // 不包含停用状态（不等于停用状态） + .orderByDesc(TemplateInstanceDO::getId)); + } } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplFldRelMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplFldRelMapper.java index a536a89..5c71936 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplFldRelMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplFldRelMapper.java @@ -1,7 +1,6 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; - import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplFldRelDO; import org.apache.ibatis.annotations.Mapper; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java index 92e67c3..fd062c6 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java @@ -3,7 +3,6 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; 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.templtp.vo.TmpItmPageReqVO; import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplItmDO; import org.apache.ibatis.annotations.Mapper; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmRelMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmRelMapper.java index 35d5e8a..f1af8be 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmRelMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmRelMapper.java @@ -1,7 +1,6 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; - import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplItmRelDO; import org.apache.ibatis.annotations.Mapper; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java index 2a3a095..3c84e72 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java @@ -3,7 +3,6 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; 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.templtp.vo.TmplFldPageReqVO; import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpFldDO; import org.apache.ibatis.annotations.Mapper; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpMapper.java index d64361c..746e4e3 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpMapper.java @@ -1,10 +1,8 @@ package com.zt.plat.module.base.dal.mysql.tmpltp; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; 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.templtp.vo.TmplFldRespVO; import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmRespVO; import com.zt.plat.module.base.controller.admin.templtp.vo.TmplTpPageReqVO; @@ -12,10 +10,8 @@ import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpDO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; -import java.util.Map; /** 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 new file mode 100644 index 0000000..4972bf0 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO; +import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO; +import com.zt.plat.module.base.dal.dataobject.base.AccountDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * 账户条款 Service 接口 + * + * @author 后台管理 + */ +public interface AccountService { + + /** + * 创建账户条款 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + AccountRespVO createAccount(@Valid AccountSaveReqVO createReqVO); + + /** + * 更新账户条款 + * + * @param updateReqVO 更新信息 + */ + void updateAccount(@Valid AccountSaveReqVO updateReqVO); + + /** + * 删除账户条款 + * + * @param id 编号 + */ + void deleteAccount(Long id); + + /** + * 批量删除账户条款 + * + * @param ids 编号 + */ + void deleteAccountListByIds(List ids); + + /** + * 获得账户条款 + * + * @param id 编号 + * @return 账户条款 + */ + AccountDO getAccount(Long id); + + /** + * 获得账户条款分页 + * + * @param pageReqVO 分页查询 + * @return 账户条款分页 + */ + PageResult getAccountPage(AccountPageReqVO 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/AccountServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java new file mode 100644 index 0000000..3c7d09f --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java @@ -0,0 +1,89 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO; +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.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; + +/** + * 账户条款 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class AccountServiceImpl implements AccountService { + + @Resource + private AccountMapper accountMapper; + + @Override + public AccountRespVO createAccount(AccountSaveReqVO createReqVO) { + // 插入 + AccountDO account = BeanUtils.toBean(createReqVO, AccountDO.class); + accountMapper.insert(account); + // 返回 + return BeanUtils.toBean(account, AccountRespVO.class); + } + + @Override + public void updateAccount(AccountSaveReqVO updateReqVO) { + // 校验存在 + validateAccountExists(updateReqVO.getId()); + // 更新 + AccountDO updateObj = BeanUtils.toBean(updateReqVO, AccountDO.class); + accountMapper.updateById(updateObj); + } + + @Override + public void deleteAccount(Long id) { + // 校验存在 + validateAccountExists(id); + // 删除 + accountMapper.deleteById(id); + } + + @Override + public void deleteAccountListByIds(List ids) { + // 校验存在 + validateAccountExists(ids); + // 删除 + accountMapper.deleteByIds(ids); + } + + private void validateAccountExists(List ids) { + List list = accountMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(ACCOUNT_NOT_EXISTS); + } + } + + private void validateAccountExists(Long id) { + if (accountMapper.selectById(id) == null) { + throw exception(ACCOUNT_NOT_EXISTS); + } + } + + @Override + public AccountDO getAccount(Long id) { + return accountMapper.selectById(id); + } + + @Override + public PageResult getAccountPage(AccountPageReqVO pageReqVO) { + return accountMapper.selectPage(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/CompanyRelativityService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityService.java new file mode 100644 index 0000000..ce7e8df --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +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.CompanyRelativityDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * 公司关系 Service 接口 + * + * @author 后台管理 + */ +public interface CompanyRelativityService { + + /** + * 创建公司关系 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + CompanyRelativityRespVO createCompanyRelativity(@Valid CompanyRelativitySaveReqVO createReqVO); + + /** + * 更新公司关系 + * + * @param updateReqVO 更新信息 + */ + void updateCompanyRelativity(@Valid CompanyRelativitySaveReqVO updateReqVO); + + /** + * 删除公司关系 + * + * @param id 编号 + */ + void deleteCompanyRelativity(Long id); + + /** + * 批量删除公司关系 + * + * @param ids 编号 + */ + void deleteCompanyRelativityListByIds(List ids); + + /** + * 获得公司关系 + * + * @param id 编号 + * @return 公司关系 + */ + CompanyRelativityDO getCompanyRelativity(Long id); + + /** + * 获得公司关系分页 + * + * @param pageReqVO 分页查询 + * @return 公司关系分页 + */ + 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 new file mode 100644 index 0000000..46775b6 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityServiceImpl.java @@ -0,0 +1,93 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +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.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.List; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.module.base.enums.ErrorCodeConstants.COMPANY_RELATIVITY_NOT_EXISTS; + +/** + * 公司关系 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class CompanyRelativityServiceImpl implements CompanyRelativityService { + + @Resource + private CompanyRelativityMapper companyRelativityMapper; + + @Override + public CompanyRelativityRespVO createCompanyRelativity(CompanyRelativitySaveReqVO createReqVO) { + // 插入 + CompanyRelativityDO companyRelativity = BeanUtils.toBean(createReqVO, CompanyRelativityDO.class); + companyRelativityMapper.insert(companyRelativity); + // 返回 + return BeanUtils.toBean(companyRelativity, CompanyRelativityRespVO.class); + } + + @Override + public void updateCompanyRelativity(CompanyRelativitySaveReqVO updateReqVO) { + // 校验存在 + validateCompanyRelativityExists(updateReqVO.getId()); + // 更新 + CompanyRelativityDO updateObj = BeanUtils.toBean(updateReqVO, CompanyRelativityDO.class); + companyRelativityMapper.updateById(updateObj); + } + + @Override + public void deleteCompanyRelativity(Long id) { + // 校验存在 + validateCompanyRelativityExists(id); + // 删除 + companyRelativityMapper.deleteById(id); + } + + @Override + public void deleteCompanyRelativityListByIds(List ids) { + // 校验存在 + validateCompanyRelativityExists(ids); + // 删除 + companyRelativityMapper.deleteByIds(ids); + } + + private void validateCompanyRelativityExists(List ids) { + List list = companyRelativityMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(COMPANY_RELATIVITY_NOT_EXISTS); + } + } + + private void validateCompanyRelativityExists(Long id) { + if (companyRelativityMapper.selectById(id) == null) { + throw exception(COMPANY_RELATIVITY_NOT_EXISTS); + } + } + + @Override + public CompanyRelativityDO getCompanyRelativity(Long id) { + return companyRelativityMapper.selectById(id); + } + + @Override + public PageResult getCompanyRelativityPage(CompanyRelativityPageReqVO pageReqVO) { + List list = companyRelativityMapper.getPageByReq(pageReqVO); + if (list == null) { + list = CollUtil.newArrayList(); + } + return new PageResult<>(list, (long) list.size()); + } + +} \ 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 new file mode 100644 index 0000000..cb23d88 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +import com.zt.plat.framework.common.pojo.PageResult; +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 jakarta.validation.Valid; + +import java.util.List; + +/** + * 联系人信息 Service 接口 + * + * @author 后台管理 + */ +public interface ContactService { + + /** + * 创建联系人信息 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + ContactRespVO createContact(@Valid ContactSaveReqVO createReqVO); + + /** + * 更新联系人信息 + * + * @param updateReqVO 更新信息 + */ + void updateContact(@Valid ContactSaveReqVO updateReqVO); + + /** + * 删除联系人信息 + * + * @param id 编号 + */ + void deleteContact(Long id); + + /** + * 批量删除联系人信息 + * + * @param ids 编号 + */ + void deleteContactListByIds(List ids); + + /** + * 获得联系人信息 + * + * @param id 编号 + * @return 联系人信息 + */ + ContactDO getContact(Long id); + + /** + * 获得联系人信息分页 + * + * @param pageReqVO 分页查询 + * @return 联系人信息分页 + */ + PageResult getContactPage(ContactPageReqVO 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/ContactServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactServiceImpl.java new file mode 100644 index 0000000..2f218bb --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactServiceImpl.java @@ -0,0 +1,89 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +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.mysql.base.ContactMapper; +import jakarta.annotation.Resource; +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.CONTACT_NOT_EXISTS; + +/** + * 联系人信息 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class ContactServiceImpl implements ContactService { + + @Resource + private ContactMapper contactMapper; + + @Override + public ContactRespVO createContact(ContactSaveReqVO createReqVO) { + // 插入 + ContactDO contact = BeanUtils.toBean(createReqVO, ContactDO.class); + contactMapper.insert(contact); + // 返回 + return BeanUtils.toBean(contact, ContactRespVO.class); + } + + @Override + public void updateContact(ContactSaveReqVO updateReqVO) { + // 校验存在 + validateContactExists(updateReqVO.getId()); + // 更新 + ContactDO updateObj = BeanUtils.toBean(updateReqVO, ContactDO.class); + contactMapper.updateById(updateObj); + } + + @Override + public void deleteContact(Long id) { + // 校验存在 + validateContactExists(id); + // 删除 + contactMapper.deleteById(id); + } + + @Override + public void deleteContactListByIds(List ids) { + // 校验存在 + validateContactExists(ids); + // 删除 + contactMapper.deleteByIds(ids); + } + + private void validateContactExists(List ids) { + List list = contactMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(CONTACT_NOT_EXISTS); + } + } + + private void validateContactExists(Long id) { + if (contactMapper.selectById(id) == null) { + throw exception(CONTACT_NOT_EXISTS); + } + } + + @Override + public ContactDO getContact(Long id) { + return contactMapper.selectById(id); + } + + @Override + public PageResult getContactPage(ContactPageReqVO pageReqVO) { + return contactMapper.selectPage(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/ElementService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java new file mode 100644 index 0000000..dcf55e4 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +import com.zt.plat.framework.common.pojo.PageResult; +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 jakarta.validation.Valid; + +import java.util.List; + +/** + * 金属元素 Service 接口 + * + * @author 后台管理 + */ +public interface ElementService { + + /** + * 创建金属元素 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + ElementRespVO createElement(@Valid ElementSaveReqVO createReqVO); + + /** + * 更新金属元素 + * + * @param updateReqVO 更新信息 + */ + void updateElement(@Valid ElementSaveReqVO updateReqVO); + + /** + * 删除金属元素 + * + * @param id 编号 + */ + void deleteElement(Long id); + + /** + * 批量删除金属元素 + * + * @param ids 编号 + */ + void deleteElementListByIds(List ids); + + /** + * 获得金属元素 + * + * @param id 编号 + * @return 金属元素 + */ + ElementDO getElement(Long id); + + /** + * 获得金属元素分页 + * + * @param pageReqVO 分页查询 + * @return 金属元素分页 + */ + PageResult getElementPage(ElementPageReqVO 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/ElementServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java new file mode 100644 index 0000000..f69b424 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java @@ -0,0 +1,100 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +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.mysql.base.ElementMapper; +import jakarta.annotation.Resource; +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.ELEMENT_NOT_EXISTS; + +/** + * 金属元素 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class ElementServiceImpl implements ElementService { + + @Resource + private ElementMapper elementMapper; + + @Override + public ElementRespVO createElement(ElementSaveReqVO createReqVO) { + // 插入 + ElementDO element = BeanUtils.toBean(createReqVO, ElementDO.class); + //金属编码自动生成，格式 JSYS-00001,依次新增 + String maxCode = elementMapper.selectMaxCode(); + if (maxCode == null) { + element.setCoding("JSYS-00001"); + } else { + String prefix = "JSYS-"; + String numberPart = maxCode.substring(prefix.length()); + int nextNumber = Integer.parseInt(numberPart) + 1; + String nextCode = prefix + String.format("%05d", nextNumber); + element.setCoding(nextCode); + } + elementMapper.insert(element); + // 返回 + return BeanUtils.toBean(element, ElementRespVO.class); + } + + @Override + public void updateElement(ElementSaveReqVO updateReqVO) { + // 校验存在 + validateElementExists(updateReqVO.getId()); + // 更新 + ElementDO updateObj = BeanUtils.toBean(updateReqVO, ElementDO.class); + elementMapper.updateById(updateObj); + } + + @Override + public void deleteElement(Long id) { + // 校验存在 + validateElementExists(id); + // 删除 + elementMapper.deleteById(id); + } + + @Override + public void deleteElementListByIds(List ids) { + // 校验存在 + validateElementExists(ids); + // 删除 + elementMapper.deleteByIds(ids); + } + + private void validateElementExists(List ids) { + List list = elementMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(ELEMENT_NOT_EXISTS); + } + } + + private void validateElementExists(Long id) { + if (elementMapper.selectById(id) == null) { + throw exception(ELEMENT_NOT_EXISTS); + } + } + + @Override + public ElementDO getElement(Long id) { + return elementMapper.selectById(id); + } + + @Override + public PageResult getElementPage(ElementPageReqVO pageReqVO) { + return elementMapper.selectPage(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/FactoryService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryService.java new file mode 100644 index 0000000..79db236 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +import com.zt.plat.framework.common.pojo.PageResult; +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 jakarta.validation.Valid; + +import java.util.List; + +/** + * 工厂 Service 接口 + * + * @author 后台管理 + */ +public interface FactoryService { + + /** + * 创建工厂 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + FactoryRespVO createFactory(@Valid FactorySaveReqVO createReqVO); + + /** + * 更新工厂 + * + * @param updateReqVO 更新信息 + */ + void updateFactory(@Valid FactorySaveReqVO updateReqVO); + + /** + * 删除工厂 + * + * @param id 编号 + */ + void deleteFactory(Long id); + + /** + * 批量删除工厂 + * + * @param ids 编号 + */ + void deleteFactoryListByIds(List ids); + + /** + * 获得工厂 + * + * @param id 编号 + * @return 工厂 + */ + FactoryDO getFactory(Long id); + + /** + * 获得工厂分页 + * + * @param pageReqVO 分页查询 + * @return 工厂分页 + */ + PageResult getFactoryPage(FactoryPageReqVO 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/FactoryServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java new file mode 100644 index 0000000..0205984 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java @@ -0,0 +1,89 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +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.mysql.base.FactoryMapper; +import jakarta.annotation.Resource; +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.FACTORY_NOT_EXISTS; + +/** + * 工厂 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class FactoryServiceImpl implements FactoryService { + + @Resource + private FactoryMapper factoryMapper; + + @Override + public FactoryRespVO createFactory(FactorySaveReqVO createReqVO) { + // 插入 + FactoryDO factory = BeanUtils.toBean(createReqVO, FactoryDO.class); + factoryMapper.insert(factory); + // 返回 + return BeanUtils.toBean(factory, FactoryRespVO.class); + } + + @Override + public void updateFactory(FactorySaveReqVO updateReqVO) { + // 校验存在 + validateFactoryExists(updateReqVO.getId()); + // 更新 + FactoryDO updateObj = BeanUtils.toBean(updateReqVO, FactoryDO.class); + factoryMapper.updateById(updateObj); + } + + @Override + public void deleteFactory(Long id) { + // 校验存在 + validateFactoryExists(id); + // 删除 + factoryMapper.deleteById(id); + } + + @Override + public void deleteFactoryListByIds(List ids) { + // 校验存在 + validateFactoryExists(ids); + // 删除 + factoryMapper.deleteByIds(ids); + } + + private void validateFactoryExists(List ids) { + List list = factoryMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(FACTORY_NOT_EXISTS); + } + } + + private void validateFactoryExists(Long id) { + if (factoryMapper.selectById(id) == null) { + throw exception(FACTORY_NOT_EXISTS); + } + } + + @Override + public FactoryDO getFactory(Long id) { + return factoryMapper.selectById(id); + } + + @Override + public PageResult getFactoryPage(FactoryPageReqVO pageReqVO) { + return factoryMapper.selectPage(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/MaterialDestroyService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyService.java new file mode 100644 index 0000000..725385d --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +import com.zt.plat.framework.common.pojo.PageResult; +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 jakarta.validation.Valid; + +import java.util.List; + +/** + * 物料回收率 Service 接口 + * + * @author 后台管理 + */ +public interface MaterialDestroyService { + + /** + * 创建物料回收率 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + MaterialDestroyRespVO createMaterialDestroy(@Valid MaterialDestroySaveReqVO createReqVO); + + /** + * 更新物料回收率 + * + * @param updateReqVO 更新信息 + */ + void updateMaterialDestroy(@Valid MaterialDestroySaveReqVO updateReqVO); + + /** + * 删除物料回收率 + * + * @param id 编号 + */ + void deleteMaterialDestroy(Long id); + + /** + * 批量删除物料回收率 + * + * @param ids 编号 + */ + void deleteMaterialDestroyListByIds(List ids); + + /** + * 获得物料回收率 + * + * @param id 编号 + * @return 物料回收率 + */ + MaterialDestroyDO getMaterialDestroy(Long id); + + /** + * 获得物料回收率分页 + * + * @param pageReqVO 分页查询 + * @return 物料回收率分页 + */ + PageResult getMaterialDestroyPage(MaterialDestroyPageReqVO 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/MaterialDestroyServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java new file mode 100644 index 0000000..302d66b --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java @@ -0,0 +1,89 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +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.mysql.base.MaterialDestroyMapper; +import jakarta.annotation.Resource; +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.MATERIAL_DESTROY_NOT_EXISTS; + +/** + * 物料回收率 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class MaterialDestroyServiceImpl implements MaterialDestroyService { + + @Resource + private MaterialDestroyMapper materialDestroyMapper; + + @Override + public MaterialDestroyRespVO createMaterialDestroy(MaterialDestroySaveReqVO createReqVO) { + // 插入 + MaterialDestroyDO materialDestroy = BeanUtils.toBean(createReqVO, MaterialDestroyDO.class); + materialDestroyMapper.insert(materialDestroy); + // 返回 + return BeanUtils.toBean(materialDestroy, MaterialDestroyRespVO.class); + } + + @Override + public void updateMaterialDestroy(MaterialDestroySaveReqVO updateReqVO) { + // 校验存在 + validateMaterialDestroyExists(updateReqVO.getId()); + // 更新 + MaterialDestroyDO updateObj = BeanUtils.toBean(updateReqVO, MaterialDestroyDO.class); + materialDestroyMapper.updateById(updateObj); + } + + @Override + public void deleteMaterialDestroy(Long id) { + // 校验存在 + validateMaterialDestroyExists(id); + // 删除 + materialDestroyMapper.deleteById(id); + } + + @Override + public void deleteMaterialDestroyListByIds(List ids) { + // 校验存在 + validateMaterialDestroyExists(ids); + // 删除 + materialDestroyMapper.deleteByIds(ids); + } + + private void validateMaterialDestroyExists(List ids) { + List list = materialDestroyMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(MATERIAL_DESTROY_NOT_EXISTS); + } + } + + private void validateMaterialDestroyExists(Long id) { + if (materialDestroyMapper.selectById(id) == null) { + throw exception(MATERIAL_DESTROY_NOT_EXISTS); + } + } + + @Override + public MaterialDestroyDO getMaterialDestroy(Long id) { + return materialDestroyMapper.selectById(id); + } + + @Override + public PageResult getMaterialDestroyPage(MaterialDestroyPageReqVO pageReqVO) { + return materialDestroyMapper.selectPage(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/MaterialInfomationService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialInfomationService.java new file mode 100644 index 0000000..cf0cb49 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialInfomationService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationPageReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationRespVO; +import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationSaveReqVO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * 物料信息 Service 接口 + * + * @author 后台管理 + */ +public interface MaterialInfomationService { + + /** + * 创建物料信息 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + MaterialInfomationRespVO createMaterialInfomation(@Valid MaterialInfomationSaveReqVO createReqVO); + + /** + * 更新物料信息 + * + * @param updateReqVO 更新信息 + */ + void updateMaterialInfomation(@Valid MaterialInfomationSaveReqVO updateReqVO); + + /** + * 删除物料信息 + * + * @param id 编号 + */ + void deleteMaterialInfomation(Long id); + + /** + * 批量删除物料信息 + * + * @param ids 编号 + */ + void deleteMaterialInfomationListByIds(List ids); + + /** + * 获得物料信息 + * + * @param id 编号 + * @return 物料信息 + */ + MaterialInfomationDO getMaterialInfomation(Long id); + + /** + * 获得物料信息分页 + * + * @param pageReqVO 分页查询 + * @return 物料信息分页 + */ + PageResult getMaterialInfomationPage(MaterialInfomationPageReqVO 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/MaterialInfomationServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialInfomationServiceImpl.java new file mode 100644 index 0000000..19e88a8 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialInfomationServiceImpl.java @@ -0,0 +1,89 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationPageReqVO; +import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationRespVO; +import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationSaveReqVO; +import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO; +import com.zt.plat.module.base.dal.mysql.base.MaterialInfomationMapper; +import jakarta.annotation.Resource; +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.MATERIAL_INFOMATION_NOT_EXISTS; + +/** + * 物料信息 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class MaterialInfomationServiceImpl implements MaterialInfomationService { + + @Resource + private MaterialInfomationMapper materialInfomationMapper; + + @Override + public MaterialInfomationRespVO createMaterialInfomation(MaterialInfomationSaveReqVO createReqVO) { + // 插入 + MaterialInfomationDO materialInfomation = BeanUtils.toBean(createReqVO, MaterialInfomationDO.class); + materialInfomationMapper.insert(materialInfomation); + // 返回 + return BeanUtils.toBean(materialInfomation, MaterialInfomationRespVO.class); + } + + @Override + public void updateMaterialInfomation(MaterialInfomationSaveReqVO updateReqVO) { + // 校验存在 + validateMaterialInfomationExists(updateReqVO.getId()); + // 更新 + MaterialInfomationDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInfomationDO.class); + materialInfomationMapper.updateById(updateObj); + } + + @Override + public void deleteMaterialInfomation(Long id) { + // 校验存在 + validateMaterialInfomationExists(id); + // 删除 + materialInfomationMapper.deleteById(id); + } + + @Override + public void deleteMaterialInfomationListByIds(List ids) { + // 校验存在 + validateMaterialInfomationExists(ids); + // 删除 + materialInfomationMapper.deleteByIds(ids); + } + + private void validateMaterialInfomationExists(List ids) { + List list = materialInfomationMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(MATERIAL_INFOMATION_NOT_EXISTS); + } + } + + private void validateMaterialInfomationExists(Long id) { + if (materialInfomationMapper.selectById(id) == null) { + throw exception(MATERIAL_INFOMATION_NOT_EXISTS); + } + } + + @Override + public MaterialInfomationDO getMaterialInfomation(Long id) { + return materialInfomationMapper.selectById(id); + } + + @Override + public PageResult getMaterialInfomationPage(MaterialInfomationPageReqVO pageReqVO) { + return materialInfomationMapper.selectPage(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/MaterialOtherService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java new file mode 100644 index 0000000..25d452e --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +import com.zt.plat.framework.common.pojo.PageResult; +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 jakarta.validation.Valid; + +import java.util.List; + +/** + * 物料拓展数据 Service 接口 + * + * @author 后台管理 + */ +public interface MaterialOtherService { + + /** + * 创建物料拓展数据 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + MaterialOtherRespVO createMaterialOther(@Valid MaterialOtherSaveReqVO createReqVO); + + /** + * 更新物料拓展数据 + * + * @param updateReqVO 更新信息 + */ + void updateMaterialOther(@Valid MaterialOtherSaveReqVO updateReqVO); + + /** + * 删除物料拓展数据 + * + * @param id 编号 + */ + void deleteMaterialOther(Long id); + + /** + * 批量删除物料拓展数据 + * + * @param ids 编号 + */ + void deleteMaterialOtherListByIds(List ids); + + /** + * 获得物料拓展数据 + * + * @param id 编号 + * @return 物料拓展数据 + */ + MaterialOtherDO getMaterialOther(Long id); + + /** + * 获得物料拓展数据分页 + * + * @param pageReqVO 分页查询 + * @return 物料拓展数据分页 + */ + PageResult getMaterialOtherPage(MaterialOtherPageReqVO 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/MaterialOtherServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java new file mode 100644 index 0000000..4fb7322 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java @@ -0,0 +1,89 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +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.mysql.base.MaterialOtherMapper; +import jakarta.annotation.Resource; +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.MATERIAL_OTHER_NOT_EXISTS; + +/** + * 物料拓展数据 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class MaterialOtherServiceImpl implements MaterialOtherService { + + @Resource + private MaterialOtherMapper materialOtherMapper; + + @Override + public MaterialOtherRespVO createMaterialOther(MaterialOtherSaveReqVO createReqVO) { + // 插入 + MaterialOtherDO materialOther = BeanUtils.toBean(createReqVO, MaterialOtherDO.class); + materialOtherMapper.insert(materialOther); + // 返回 + return BeanUtils.toBean(materialOther, MaterialOtherRespVO.class); + } + + @Override + public void updateMaterialOther(MaterialOtherSaveReqVO updateReqVO) { + // 校验存在 + validateMaterialOtherExists(updateReqVO.getId()); + // 更新 + MaterialOtherDO updateObj = BeanUtils.toBean(updateReqVO, MaterialOtherDO.class); + materialOtherMapper.updateById(updateObj); + } + + @Override + public void deleteMaterialOther(Long id) { + // 校验存在 + validateMaterialOtherExists(id); + // 删除 + materialOtherMapper.deleteById(id); + } + + @Override + public void deleteMaterialOtherListByIds(List ids) { + // 校验存在 + validateMaterialOtherExists(ids); + // 删除 + materialOtherMapper.deleteByIds(ids); + } + + private void validateMaterialOtherExists(List ids) { + List list = materialOtherMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(MATERIAL_OTHER_NOT_EXISTS); + } + } + + private void validateMaterialOtherExists(Long id) { + if (materialOtherMapper.selectById(id) == null) { + throw exception(MATERIAL_OTHER_NOT_EXISTS); + } + } + + @Override + public MaterialOtherDO getMaterialOther(Long id) { + return materialOtherMapper.selectById(id); + } + + @Override + public PageResult getMaterialOtherPage(MaterialOtherPageReqVO pageReqVO) { + return materialOtherMapper.selectPage(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/WarehouseService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseService.java new file mode 100644 index 0000000..4109750 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseService.java @@ -0,0 +1,64 @@ +package com.zt.plat.module.base.service.base; + +import com.zt.plat.framework.common.pojo.PageResult; +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.WarehouseDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * 仓库 Service 接口 + * + * @author 后台管理 + */ +public interface WarehouseService { + + /** + * 创建仓库 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + WarehouseRespVO createWarehouse(@Valid WarehouseSaveReqVO createReqVO); + + /** + * 更新仓库 + * + * @param updateReqVO 更新信息 + */ + void updateWarehouse(@Valid WarehouseSaveReqVO updateReqVO); + + /** + * 删除仓库 + * + * @param id 编号 + */ + void deleteWarehouse(Long id); + + /** + * 批量删除仓库 + * + * @param ids 编号 + */ + void deleteWarehouseListByIds(List ids); + + /** + * 获得仓库 + * + * @param id 编号 + * @return 仓库 + */ + WarehouseDO getWarehouse(Long id); + + /** + * 获得仓库分页 + * + * @param pageReqVO 分页查询 + * @return 仓库分页 + */ + PageResult getWarehousePage(WarehousePageReqVO 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/WarehouseServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseServiceImpl.java new file mode 100644 index 0000000..db02d54 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseServiceImpl.java @@ -0,0 +1,89 @@ +package com.zt.plat.module.base.service.base; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +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.WarehouseDO; +import com.zt.plat.module.base.dal.mysql.base.WarehouseMapper; +import jakarta.annotation.Resource; +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.WAREHOUSE_NOT_EXISTS; + +/** + * 仓库 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class WarehouseServiceImpl implements WarehouseService { + + @Resource + private WarehouseMapper warehouseMapper; + + @Override + public WarehouseRespVO createWarehouse(WarehouseSaveReqVO createReqVO) { + // 插入 + WarehouseDO warehouse = BeanUtils.toBean(createReqVO, WarehouseDO.class); + warehouseMapper.insert(warehouse); + // 返回 + return BeanUtils.toBean(warehouse, WarehouseRespVO.class); + } + + @Override + public void updateWarehouse(WarehouseSaveReqVO updateReqVO) { + // 校验存在 + validateWarehouseExists(updateReqVO.getId()); + // 更新 + WarehouseDO updateObj = BeanUtils.toBean(updateReqVO, WarehouseDO.class); + warehouseMapper.updateById(updateObj); + } + + @Override + public void deleteWarehouse(Long id) { + // 校验存在 + validateWarehouseExists(id); + // 删除 + warehouseMapper.deleteById(id); + } + + @Override + public void deleteWarehouseListByIds(List ids) { + // 校验存在 + validateWarehouseExists(ids); + // 删除 + warehouseMapper.deleteByIds(ids); + } + + private void validateWarehouseExists(List ids) { + List list = warehouseMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(WAREHOUSE_NOT_EXISTS); + } + } + + private void validateWarehouseExists(Long id) { + if (warehouseMapper.selectById(id) == null) { + throw exception(WAREHOUSE_NOT_EXISTS); + } + } + + @Override + public WarehouseDO getWarehouse(Long id) { + return warehouseMapper.selectById(id); + } + + @Override + public PageResult getWarehousePage(WarehousePageReqVO pageReqVO) { + return warehouseMapper.selectPage(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/tmpltp/TemplateInstanceService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java index 77350d6..493ea66 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java @@ -2,14 +2,13 @@ package com.zt.plat.module.base.service.tmpltp; import java.util.*; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstancePageReqVO; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceRespVO; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceSaveReqVO; +import com.zt.plat.module.base.controller.admin.templtp.vo.*; import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDO; import jakarta.validation.*; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.PageParam; +import jakarta.validation.constraints.NotEmpty; /** * 模板实例 Service 接口 @@ -64,4 +63,23 @@ public interface TemplateInstanceService { PageResult getTemplateInstancePage(TemplateInstancePageReqVO pageReqVO); List getDeptByInstanId(Long instanId); + + void publishTemplateInstance(List publishReqVOS); + + void getDetailedInfo(TemplateInstanceRespVO templateInstanceRespVO); + /** + * 获得模板实例分页排除停用状态的 + * + * @param pageReqVO 分页查询 + * @return 模板实例分页 + */ + PageResult listExcludingDisabled(@Valid TemplateInstancePageReqVO pageReqVO); + + void setDisableOrEnable(@Valid DisableEnableReqVO reqVO); + + TemplateInstanceRespVO createVersion(@Valid @NotEmpty(message = "模版实例id不能为空") String id); + + Map getVersion(String id); + + List listByCdg(String cdg); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java index 3ec7b89..9f4223b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java @@ -1,28 +1,33 @@ package com.zt.plat.module.base.service.tmpltp; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.extra.spring.SpringUtil; +import com.alibaba.fastjson2.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstancePageReqVO; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceRespVO; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceSaveReqVO; -import com.zt.plat.module.base.dal.dataobject.tmpltp.DepartmentInstanceRelativityDO; -import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDO; -import com.zt.plat.module.base.dal.mysql.tmpltp.DepartmentInstanceRelativityMapper; -import com.zt.plat.module.base.dal.mysql.tmpltp.TemplateInstanceDataMapper; -import com.zt.plat.module.base.dal.mysql.tmpltp.TemplateInstanceItemMapper; -import com.zt.plat.module.base.dal.mysql.tmpltp.TemplateInstanceMapper; +import com.zt.plat.framework.tenant.core.context.CompanyContextHolder; +import com.zt.plat.module.base.controller.admin.templtp.vo.*; +import com.zt.plat.module.base.dal.dataobject.tmpltp.*; +import com.zt.plat.module.base.dal.mysql.tmpltp.*; +import com.zt.plat.module.tmpltp.enums.DeleteStatusEnum; +import com.zt.plat.module.tmpltp.enums.PublishStatusEnum; +import com.zt.plat.module.tmpltp.enums.TmplStsEnum; +import com.zt.plat.module.tmpltp.enums.UpdateStatusEnum; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; -import java.util.ArrayList; -import java.util.List; +import java.time.LocalDateTime; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.*; @@ -33,6 +38,7 @@ import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.*; * * @author 后台管理 */ +@Slf4j @Service @Validated public class TemplateInstanceServiceImpl implements TemplateInstanceService { @@ -53,8 +59,13 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService { public TemplateInstanceRespVO createTemplateInstance(TemplateInstanceSaveReqVO createReqVO) { // 插入 TemplateInstanceDO templateInstance = BeanUtils.toBean(createReqVO, TemplateInstanceDO.class); - templateInstance.setVer("v1.0"); - templateInstanceMapper.insert(templateInstance); + templateInstance.setVer("v1.0"); //设置初始版本为v1.0 + templateInstance.setCdg(getCdg());//设置初始编码 + templateInstance.setSts(TmplStsEnum.DRAFT.getCode());//设置初始状态为草稿 + int insert = templateInstanceMapper.insert(templateInstance); + if (insert <= 0) { + throw exception(TEMPLATE_INSTANCE_CREATE_FAIL); + } //构建使用部门 List departmentInstanceRelativityDOS = new ArrayList<>(); @@ -66,26 +77,21 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService { }); departmentInstanceRelativityMapper.insertBatch(departmentInstanceRelativityDOS); // 插入使用范围 - return BeanUtils.toBean(templateInstance, TemplateInstanceRespVO.class); + TemplateInstanceRespVO templateInstanceRespVO = BeanUtils.toBean(templateInstance, TemplateInstanceRespVO.class); + templateInstanceRespVO.setDeptIds(createReqVO.getDeptIds()); + return templateInstanceRespVO; } @Override public void updateTemplateInstance(TemplateInstanceSaveReqVO updateReqVO) { // 校验存在 validateTemplateInstanceExists(updateReqVO.getId()); - // TemplateInstanceDO templateInstanceDO = templateInstanceMapper.selectById(updateReqVO.getId()); -// //获取保存旧文件内容防止被更新 -// String originalContent = templateInstanceDO.getOriginalContent(); + //校验该记录能否被修改 + validateStatusCanUpdate(updateReqVO.getId()); // 更新 TemplateInstanceDO templateInstanceDO = templateInstanceMapper.selectById(updateReqVO.getId()); - String sts = templateInstanceDO.getSts(); - if (!sts.equals("DRF")) { - throw exception(STATUS_OPERATION_FAIL); - } - TemplateInstanceDO updateObj = BeanUtils.toBean(updateReqVO, TemplateInstanceDO.class); - // updateObj.setOrigCntt(null); //重新赋值，防止原始文件被更改 - updateObj.setVer(incrementVersion(templateInstanceDO.getVer())); + // updateObj.setVer(incrementVersion(templateInstanceDO.getVer())); templateInstanceMapper.updateById(updateObj); } @@ -94,19 +100,23 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService { public void deleteTemplateInstance(Long id) { // 校验存在 validateTemplateInstanceExists(id); + validateStatusCanDelete(id); // 删除 //删除对应的字段和条款关系 //1、删除合同的与字段的关系 templateInstanceDataMapper.deleteByTemplateInstanceId(id); //2、删除条款与和他的关系 - templateInstanceDataMapper.deleteByTemplateInstanceId(id); + templateInstanceItemMapper.deleteByTemplateInstanceId(id); templateInstanceMapper.deleteById(id); } @Override + @Transactional public void deleteTemplateInstanceListByIds(List ids) { // 校验存在 validateTemplateInstanceExists(ids); + //校验当前模版能否被删除 + validateStatusCanDelete(ids); // 删除 templateInstanceMapper.deleteByIds(ids); } @@ -135,63 +145,96 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService { } - private String incrementVersion(String currentVersion) { - // 处理空值或空字符串 - if (currentVersion == null || currentVersion.trim().isEmpty()) { - return "v1.0"; - } +// private String incrementVersion(String currentVersion) { +// // 处理空值或空字符串 +// if (currentVersion == null || currentVersion.trim().isEmpty()) { +// return "v1.0"; +// } +// +// String version = currentVersion.trim(); +// Matcher matcher = VERSION_PATTERN.matcher(version); +// +// if (!matcher.matches()) { +// // 没有找到数字部分，返回默认版本 +// return version + "1.0"; +// } +// +// String prefix = matcher.group(1); // 前缀部分（如 "v", "version-" 等） +// String numberPart = matcher.group(2); // 数字部分（如 "1.2.3"） +// String suffix = matcher.group(3); // 后缀部分 +// +// // 分割数字部分 +// String[] segments = numberPart.split("\\."); +// +// // 从最后一段开始处理进位 +// boolean carry = true; // 初始需要加1 +// +// for (int i = segments.length - 1; i >= 0 && carry; i--) { +// try { +// int currentNumber = Integer.parseInt(segments[i]); +// currentNumber++; // 加1 +// +// if (currentNumber >= 10) { +// // 需要进位 +// segments[i] = "0"; +// carry = true; // 继续向前进位 +// } else { +// // 不需要进位 +// segments[i] = String.valueOf(currentNumber); +// carry = false; // 停止进位 +// } +// } catch (NumberFormatException e) { +// // 理论上不会发生，因为正则已经保证了是数字 +// segments[i] = "1"; +// carry = false; +// } +// } +// +// // 如果最高位也需要进位，在前面添加一段 +// if (carry) { +// String[] newSegments = new String[segments.length + 1]; +// newSegments[0] = "1"; +// System.arraycopy(segments, 0, newSegments, 1, segments.length); +// segments = newSegments; +// } +// +// // 重新组合版本号 +// String newNumberPart = String.join(".", segments); +// return prefix + newNumberPart + suffix; +// } +private String incrementVersion(String currentVersion) { + // 处理空值或空字符串 + if (currentVersion == null || currentVersion.trim().isEmpty()) { + return "v1"; + } - String version = currentVersion.trim(); - Matcher matcher = VERSION_PATTERN.matcher(version); + String version = currentVersion.trim(); + // 正则模式：前缀(可选) + 数字部分 + 后缀(可选) + // 数字部分匹配一个或多个数字 + Pattern VERSION_PATTERN = Pattern.compile("^([^0-9]*?)(\\d+)(.*)$"); + Matcher matcher = VERSION_PATTERN.matcher(version); - if (!matcher.matches()) { - // 没有找到数字部分，返回默认版本 - return version + "1.0"; - } + if (!matcher.matches()) { + // 没有找到数字部分，返回默认版本 + return version + "1"; + } - String prefix = matcher.group(1); // 前缀部分（如 "v", "version-" 等） - String numberPart = matcher.group(2); // 数字部分（如 "1.2.3"） - String suffix = matcher.group(3); // 后缀部分 + String prefix = matcher.group(1); // 前缀部分（如 "v", "version-" 等） + String numberPart = matcher.group(2); // 数字部分（如 "1", "123"） + String suffix = matcher.group(3); // 后缀部分 - // 分割数字部分 - String[] segments = numberPart.split("\\."); - - // 从最后一段开始处理进位 - boolean carry = true; // 初始需要加1 - - for (int i = segments.length - 1; i >= 0 && carry; i--) { - try { - int currentNumber = Integer.parseInt(segments[i]); - currentNumber++; // 加1 - - if (currentNumber >= 10) { - // 需要进位 - segments[i] = "0"; - carry = true; // 继续向前进位 - } else { - // 不需要进位 - segments[i] = String.valueOf(currentNumber); - carry = false; // 停止进位 - } - } catch (NumberFormatException e) { - // 理论上不会发生，因为正则已经保证了是数字 - segments[i] = "1"; - carry = false; - } - } - - // 如果最高位也需要进位，在前面添加一段 - if (carry) { - String[] newSegments = new String[segments.length + 1]; - newSegments[0] = "1"; - System.arraycopy(segments, 0, newSegments, 1, segments.length); - segments = newSegments; - } + try { + // 将数字部分解析为整数并加1 + int number = Integer.parseInt(numberPart); + number++; // 重新组合版本号 - String newNumberPart = String.join(".", segments); - return prefix + newNumberPart + suffix; + return prefix + number + suffix; + } catch (NumberFormatException e) { + // 解析数字格式异常时的 fallback + return prefix + "1" + suffix; } +} @Override @@ -206,4 +249,205 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService { .toList(); } + @Override + @Transactional + public void publishTemplateInstance(List publishReqVOS) { + // 校验当前状态是否能够进行发布 + publishReqVOS.forEach(reqVO -> { + String currentStatus = reqVO.getCurrentStatus(); + if (currentStatus.isEmpty()) { + currentStatus = templateInstanceMapper.selectById(reqVO.getId()).getSts(); + } + PublishStatusEnum status = PublishStatusEnum.fromCode(currentStatus); + boolean transitionAllowed = false; + if (status != null) { + transitionAllowed = status.isTransitionAllowed(TmplStsEnum.PUBLISHED.getCode()); + } + if (!transitionAllowed) { + throw exception(STATUS_OPERATION_FAIL); + } + }); + + templateInstanceMapper.update(new LambdaUpdateWrapper() + .in(TemplateInstanceDO::getId, publishReqVOS.stream() + .map(PublishTemplateInstanceReqVO::getId) + .collect(Collectors.toSet())) + .set(TemplateInstanceDO::getSts, TmplStsEnum.PUBLISHED.getCode())); + } + + @Override + public PageResult listExcludingDisabled(TemplateInstancePageReqVO pageReqVO) { + return templateInstanceMapper.listExcludingDisabled(pageReqVO); + } + + @Override + public void setDisableOrEnable(DisableEnableReqVO reqVO) { + validateTemplateInstanceExists(reqVO.getIds().stream().map(Long::valueOf).toList()); + String code; + if (reqVO.getType().equals("disable")) { + // 禁用 + code = TmplStsEnum.STOPPED.getCode(); + } else { + // 启用 + code = TmplStsEnum.PUBLISHED.getCode(); + } + templateInstanceMapper.update(new LambdaUpdateWrapper() + .set(TemplateInstanceDO::getSts, code) + .in(TemplateInstanceDO::getId, reqVO.getIds())); + } + + @Override + @Transactional + public TemplateInstanceRespVO createVersion(String id) { + validateTemplateInstanceExists(Long.valueOf(id)); + TemplateInstanceDO templateInstanceDO = templateInstanceMapper.selectById(id); + TemplateInstanceDO newTpInstanceDO = BeanUtils.toBean(templateInstanceDO, TemplateInstanceDO.class); + newTpInstanceDO.setId(null); + newTpInstanceDO.setVer(incrementVersion(templateInstanceDO.getVer())); + newTpInstanceDO.setPublishTime(LocalDateTime.now()); + newTpInstanceDO.setCreateTime(null); + newTpInstanceDO.setUpdateTime(null); + templateInstanceMapper.insert(newTpInstanceDO); + templateInstanceMapper.update(new LambdaUpdateWrapper() + .set(TemplateInstanceDO::getSts,TmplStsEnum.STOPPED.getCode()) + .eq(TemplateInstanceDO::getId, id)); + List templateInstanceDataDOS = new ArrayList<>(); + List templateInstanceItemDOS =new ArrayList<>(); + List newDepartmentInstanceRelativityDOS = new ArrayList<>(); + //设置部门 + List departmentInstanceRelativityDOS = departmentInstanceRelativityMapper + .selectList(new LambdaQueryWrapper() + .eq(DepartmentInstanceRelativityDO::getTemplateInstanceId, id)); + departmentInstanceRelativityDOS.forEach(departmentInstanceRelativityDO -> { + DepartmentInstanceRelativityDO newDepartmentInstanceRelativityDO = new DepartmentInstanceRelativityDO(); + newDepartmentInstanceRelativityDO.setTemplateInstanceId(String.valueOf(newTpInstanceDO.getId())); + newDepartmentInstanceRelativityDO.setCompanyDepartmentId(departmentInstanceRelativityDO.getCompanyDepartmentId()); + newDepartmentInstanceRelativityDOS.add(newDepartmentInstanceRelativityDO); + }); + //设置条款 + templateInstanceItemMapper.selectList(new LambdaQueryWrapper() + .eq(TemplateInstanceItemDO::getInscId, id)).forEach(templateInstanceItemDO -> { + TemplateInstanceItemDO newTemplateInstanceItemDO = new TemplateInstanceItemDO(); + newTemplateInstanceItemDO.setInscId(String.valueOf(newTpInstanceDO.getId())); + newTemplateInstanceItemDO.setItmId(templateInstanceItemDO.getItmId()); + newTemplateInstanceItemDO.setVal(templateInstanceItemDO.getVal()); + templateInstanceItemDOS.add(newTemplateInstanceItemDO); + }); + //设置实例字段 + templateInstanceDataMapper.selectList(new LambdaQueryWrapper() + .eq(TemplateInstanceDataDO::getInscId, id)).forEach(templateInstanceDataDO -> { + TemplateInstanceDataDO newTemplateInstanceDataDO = new TemplateInstanceDataDO(); + newTemplateInstanceDataDO.setInscId(String.valueOf(newTpInstanceDO.getId())); + newTemplateInstanceDataDO.setFldKy(templateInstanceDataDO.getFldKy()); + newTemplateInstanceDataDO.setFldVal(templateInstanceDataDO.getFldVal()); + templateInstanceDataDOS.add(newTemplateInstanceDataDO); + }); + templateInstanceDataMapper.insertBatch(templateInstanceDataDOS); + log.info("==================实例字段插入成功,共插入【{}】条记录==================", templateInstanceDataDOS.size()); + templateInstanceItemMapper.insertBatch(templateInstanceItemDOS); + log.info("==================条款插入成功,共插入【{}】条记录==================", templateInstanceItemDOS.size()); + departmentInstanceRelativityMapper.insertBatch(newDepartmentInstanceRelativityDOS); + log.info("==================部门实例关系插入成功,共插入【{}】条记录==================", newDepartmentInstanceRelativityDOS.size()); + TemplateInstanceRespVO templateInstanceRespVO = BeanUtils.toBean(newTpInstanceDO, TemplateInstanceRespVO.class); + getDetailedInfo(templateInstanceRespVO); + return templateInstanceRespVO; + } + + @Override + public Map getVersion(String id) { + validateTemplateInstanceExists(Long.valueOf(id)); + return Map.of("version", templateInstanceMapper.selectById(id).getVer()); + } + + @Override + public List listByCdg(String cdg) { + List templateInstanceDOS = templateInstanceMapper.selectList( + new LambdaQueryWrapper() + .eq(TemplateInstanceDO::getCdg, cdg) + .eq(TemplateInstanceDO::getCompanyId, CompanyContextHolder.getCompanyId()) + .orderByDesc(TemplateInstanceDO::getPublishTime) + .orderByDesc(TemplateInstanceDO::getCreateTime) + ); + List templateInstanceRespVOS = BeanUtils.toBean(templateInstanceDOS, TemplateInstanceRespVO.class); + templateInstanceRespVOS.forEach(this::getDetailedInfo); + return templateInstanceRespVOS; + } + + + @Override + public void getDetailedInfo(TemplateInstanceRespVO templateInstanceRespVO) { + templateInstanceRespVO.setDeptIds(getDeptByInstanId(templateInstanceRespVO.getId())); // 部门 + templateInstanceRespVO.setInstanceItemRespVOS(setInstanceItemRespVOS(templateInstanceRespVO.getId())); // 条款 + templateInstanceRespVO.setTemplateInstanceDataRespVOS(setTemplateInstanceDataRespVOS(templateInstanceRespVO.getId())); // 实例字段 + } + + // 实例条款值 + private List setInstanceItemRespVOS(Long id) { + List templateInstanceItemDOS = templateInstanceItemMapper.selectList(new LambdaQueryWrapper() + .eq(TemplateInstanceItemDO::getInscId, id) + .eq(TemplateInstanceItemDO::getCompanyId, CompanyContextHolder.getCompanyId())); + List templateInstanceItemRespVOS = BeanUtils.toBean(templateInstanceItemDOS, TemplateInstanceItemRespVO.class); + TmplItmMapper tmplItmMapper = SpringUtil.getBean(TmplItmMapper.class); + List ids = templateInstanceItemRespVOS.stream().map(TemplateInstanceItemRespVO::getItmId).toList(); + if (ids.isEmpty()){ + return templateInstanceItemRespVOS; + } + List tmplItmDOS = tmplItmMapper.selectByIds(ids); + tmplItmDOS.forEach(tmplItmDO -> { + templateInstanceItemRespVOS.forEach(templateInstanceItemRespVO -> { + if (templateInstanceItemRespVO.getItmId().equals(tmplItmDO.getId())) { + templateInstanceItemRespVO.setItmName(tmplItmDO.getItmName()); + } + }); + }); + return templateInstanceItemRespVOS ; + } + + // 实例数据 + private List setTemplateInstanceDataRespVOS(Long id) { + return BeanUtils.toBean(templateInstanceDataMapper.selectList(new LambdaQueryWrapper() + .eq(TemplateInstanceDataDO::getInscId, id) + .eq(TemplateInstanceDataDO::getCompanyId, CompanyContextHolder.getCompanyId())), TemplateInstanceDataRespVO.class); + } + + private void validateStatusCanDelete(List ids) { + Set sts = templateInstanceMapper.selectByIds(ids).stream().map(TemplateInstanceDO::getSts).collect(Collectors.toSet()); + sts.forEach(status -> { + DeleteStatusEnum deleteStatusEnum = DeleteStatusEnum.fromCode(status); + boolean transitionAllowed = false; + if (deleteStatusEnum != null) { + transitionAllowed = deleteStatusEnum.isTransitionAllowed(TmplStsEnum.DRAFT.getCode()); + } + if (!transitionAllowed) { + throw exception(STATUS_OPERATION_FAIL); + } + }); + } + + private void validateStatusCanDelete(Long id) { + String sts = templateInstanceMapper.selectById(id).getSts(); + DeleteStatusEnum deleteStatusEnum = DeleteStatusEnum.fromCode(sts); + boolean transitionAllowed = false; + if (deleteStatusEnum != null) { + transitionAllowed = deleteStatusEnum.isTransitionAllowed(TmplStsEnum.DRAFT.getCode()); + } + if (!transitionAllowed) { + throw exception(STATUS_OPERATION_FAIL); + } + } + + private void validateStatusCanUpdate(Long id) { + String sts = templateInstanceMapper.selectById(id).getSts(); + UpdateStatusEnum updateStatusEnum = UpdateStatusEnum.fromCode(sts); + boolean transitionAllowed = false; + if (updateStatusEnum != null) { + transitionAllowed = updateStatusEnum.isTransitionAllowed(sts); + } + if (!transitionAllowed) { + throw exception(STATUS_OPERATION_FAIL); + } + } + private String getCdg(){ + return "TP" + DateUtils.format(new Date(), "yyyyMMddHHmmssSSS") + RandomUtil.randomNumbers(4); + } } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java index f14a611..af878d6 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java @@ -11,7 +11,6 @@ import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpFldDO; import com.zt.plat.module.base.dal.mysql.tmpltp.TmplFldRelMapper; import com.zt.plat.module.base.dal.mysql.tmpltp.TmplItmRelMapper; import com.zt.plat.module.base.dal.mysql.tmpltp.TmplTpMapper; -import com.zt.plat.module.tmpltp.enums.StatusEnum; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -193,27 +192,27 @@ public class TmplTpServiceImpl extends ServiceImpl imple } - private boolean validateStatusUpdate(Long id, String status) { - TmplTpDO tmplTpDO = baseMapper.getTmplTpById(id); - String currentSts = tmplTpDO.getSts(); - - // 获取当前状态对应的枚举实例 - StatusEnum currentStatus = StatusEnum.fromCode(currentSts); - - // 如果当前状态不合法，直接返回false - if (currentStatus == null) { - return false; - } - - // 校验状态转换是否合法 - return currentStatus.isTransitionAllowed(status); - } +// private boolean validateStatusUpdate(Long id, String status) { +// TmplTpDO tmplTpDO = baseMapper.getTmplTpById(id); +// String currentSts = tmplTpDO.getSts(); +// +// // 获取当前状态对应的枚举实例 +// PublishStatusEnum currentStatus = PublishStatusEnum.fromCode(currentSts); +// +// // 如果当前状态不合法，直接返回false +// if (currentStatus == null) { +// return false; +// } +// +// // 校验状态转换是否合法 +// return currentStatus.isTransitionAllowed(status); +// } // private boolean validateStatusCanDelete(List ids) { // Set sts = listByIds(ids).stream().map(TmplTpDO::getSts).collect(Collectors.toSet()); // List result = new ArrayList<>(); // sts.forEach(status -> { -// StatusEnum currentStatus = StatusEnum.fromCode(status); +// PublishStatusEnum currentStatus = PublishStatusEnum.fromCode(status); // boolean transitionAllowed = false; // if (currentStatus != null) { // transitionAllowed = currentStatus.isTransitionAllowed(status); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/ClassInfoScanner.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/ClassInfoScanner.java index b74be2d..1c5f21b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/ClassInfoScanner.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/ClassInfoScanner.java @@ -2,12 +2,8 @@ package com.zt.plat.module.base.util; import io.swagger.v3.oas.annotations.media.Schema; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.ClassUtils; -import org.springframework.util.ResourceUtils; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.lang.reflect.Field; import java.net.JarURLConnection; diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/AccountMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/AccountMapper.xml new file mode 100644 index 0000000..e29bb41 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/AccountMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ 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 new file mode 100644 index 0000000..4974b09 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/ContactMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/ContactMapper.xml new file mode 100644 index 0000000..d769dc1 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/ContactMapper.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/ElementMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/ElementMapper.xml new file mode 100644 index 0000000..66316ee --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/ElementMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml new file mode 100644 index 0000000..131c560 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/FactoryMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialDestroyMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialDestroyMapper.xml new file mode 100644 index 0000000..5fc120c --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialDestroyMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialInfomationMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialInfomationMapper.xml new file mode 100644 index 0000000..54c82c3 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialInfomationMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialOtherMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialOtherMapper.xml new file mode 100644 index 0000000..52e529f --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/MaterialOtherMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/WarehouseMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/WarehouseMapper.xml new file mode 100644 index 0000000..30f7d26 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/WarehouseMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TmplTpMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TmplTpMapper.xml index bcaecee..3659758 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TmplTpMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TmplTpMapper.xml @@ -26,7 +26,7 @@