zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
潘荣晟
2025-09-26 16:42:33 +08:00
parent 7507a53c8a 163da2f79d
commit 3e70de3977
35 changed files with 187 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/CompanyRelativityController.java
View File

@@ -1,36 +1,27 @@
package com.zt.plat.module.base.controller.admin.base;
import com.zt.plat.module.base.dal.dataobject.base.CompanyRelaDeptDO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
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.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
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.controller.admin.base.vo.CompanyRelativityPageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativitySaveReqVO;
import com.zt.plat.module.base.dal.dataobject.base.CompanyRelaDeptDO;
import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO;
import com.zt.plat.module.base.service.base.CompanyRelativityService;
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.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 公司关系")
@RestController

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ContactController.java
View File

@@ -7,7 +7,6 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.ContactRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO;

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java
View File

@@ -7,7 +7,6 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO;

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/FactoryController.java
View File

@@ -7,7 +7,6 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.FactoryPageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.FactoryRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.FactorySaveReqVO;

45
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialDestroyController.java
View File

@@ -1,35 +1,32 @@
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.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.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
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.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.service.base.MaterialDestroyService;
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

45
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialInfomationController.java
View File

@@ -1,35 +1,32 @@
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.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.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
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.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.service.base.MaterialInfomationService;
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

45
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialOtherController.java
View File

@@ -1,35 +1,32 @@
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.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.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
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.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.service.base.MaterialOtherService;
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

45
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/WarehouseController.java
View File

@@ -1,35 +1,32 @@
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.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.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
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.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.service.base.WarehouseService;
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

9
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java
View File

@@ -32,4 +32,13 @@ public class AccountPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "是否启用")
private String isEnable;
@Schema(description = "客商公司编码")
private String customerNumber;
@Schema(description = "客商公司名称")
private String customerName;
}

12
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java
View File

@@ -40,4 +40,16 @@ public class AccountRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "是否启用")
@ExcelProperty("是否启用")
private String isEnable;
@Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("客商公司编码")
private String customerNumber;
@Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("客商公司名称")
private String customerName;
}

12
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.base.controller.admin.base.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import lombok.Data;
@@ -31,4 +32,15 @@ public class AccountSaveReqVO {
@NotEmpty(message = "税号/社会信用代码不能为空")
private String taxNumber;
@Schema(description = "是否启用")
@ExcelProperty("是否启用")
private String isEnable;
@Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "客商公司编码不能为空")
private String customerNumber;
@Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "客商公司名称不能为空")
private String customerName;
}

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativitySaveReqVO.java
View File

@@ -1,6 +1,5 @@
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;

7
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.base.controller.admin.base.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.zt.plat.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -37,4 +38,10 @@ public class ContactPageReqVO extends PageParam {
@Schema(description = "是否启用")
private String isEnable;
@TableField("CSTM_NUM")
private String customerNumber;
@TableField("CSTM_NAME")
private String customerName;
}

8
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java
View File

@@ -47,4 +47,12 @@ public class ContactRespVO {
@Schema(description = "是否启用")
@ExcelProperty("是否启用")
private String isEnable;
@Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("客商公司编码")
private String customerNumber;
@Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("客商公司名称")
private String customerName;
}

8
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java
View File

@@ -36,4 +36,12 @@ public class ContactSaveReqVO {
@Schema(description = "是否启用")
private String isEnable;
@Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "客商公司编码不能为空")
private String customerNumber;
@Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "客商公司名称不能为空")
private String customerName;
}

14
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java
View File

@@ -1,7 +1,6 @@
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.*;
/**
@@ -54,6 +53,19 @@ public class AccountDO extends BusinessBaseDO {
*/
@TableField("TAX_NUM")
private String taxNumber;
/**
* 是否启用
*/
@TableField("IS_ENB")
private String isEnable;
@TableField("CSTM_NUM")
private String customerNumber;
@TableField("CSTM_NAME")
private String customerName;
/**
* 公司编号
*/

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java
View File

@@ -1,7 +1,5 @@
package com.zt.plat.module.base.dal.dataobject.base;
import com.baomidou.mybatisplus.annotation.*;
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
import lombok.*;
import java.util.List;
@@ -33,7 +31,7 @@ public class CompanyRelaDeptDO {
// 公司名称
private String companyName;
// 部门编码
private String deptNumber;
private String companyNumber;
// 负责人id
private String leaderUserId;
// 是否公司

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelativityDO.java
View File

@@ -1,7 +1,6 @@
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.*;
/**

7
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java
View File

@@ -1,7 +1,6 @@
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.*;
/**
@@ -100,4 +99,10 @@ public class ContactDO extends BusinessBaseDO {
@TableField("UPDATER_NAME")
private String updaterName;
@TableField("CSTM_NUM")
private String customerNumber;
@TableField("CSTM_NAME")
private String customerName;
}

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java
View File

@@ -1,7 +1,6 @@
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.*;
/**

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java
View File

@@ -1,7 +1,6 @@
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.*;
/**

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java
View File

@@ -1,7 +1,6 @@
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.*;

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java
View File

@@ -1,7 +1,6 @@
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.*;
/**

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java
View File

@@ -1,7 +1,6 @@
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.*;
/**

3
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java
View File

@@ -20,6 +20,9 @@ public interface AccountMapper extends BaseMapperX<AccountDO> {
.eqIfPresent(AccountDO::getType, reqVO.getType())
.likeIfPresent(AccountDO::getAccountName, reqVO.getAccountName())
.eqIfPresent(AccountDO::getBankAccount, reqVO.getBankAccount())
.eqIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName())
.eqIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber())
.eqIfPresent(AccountDO::getIsEnable, reqVO.getIsEnable())
.eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber())
.eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber())
.betweenIfPresent(AccountDO::getCreateTime, reqVO.getCreateTime())

3
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java
View File

@@ -20,6 +20,9 @@ public interface ContactMapper extends BaseMapperX<ContactDO> {
.eqIfPresent(ContactDO::getType, reqVO.getType())
.eqIfPresent(ContactDO::getContact, reqVO.getContact())
.eqIfPresent(ContactDO::getTel, reqVO.getTel())
.eqIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName())
.eqIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber())
.eqIfPresent(ContactDO::getIsEnable, reqVO.getIsEnable())
.eqIfPresent(ContactDO::getEmail, reqVO.getEmail())
.eqIfPresent(ContactDO::getFax, reqVO.getFax())
.eqIfPresent(ContactDO::getAddress, reqVO.getAddress())

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactServiceImpl.java
View File

@@ -7,7 +7,6 @@ import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.ContactRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO;
import com.zt.plat.module.base.dal.dataobject.base.ContactDO;
import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
import com.zt.plat.module.base.dal.mysql.base.ContactMapper;
import jakarta.annotation.Resource;
import org.apache.ibatis.executor.BatchResult;
@@ -18,7 +17,6 @@ import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.CONTACT_NOT_EXISTS;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS;
/**
* 联系人信息 Service 实现类

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java
View File

@@ -7,7 +7,6 @@ import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO;
import com.zt.plat.module.base.dal.dataobject.base.ElementDO;
import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
import com.zt.plat.module.base.dal.mysql.base.ElementMapper;
import jakarta.annotation.Resource;
import org.apache.ibatis.executor.BatchResult;
@@ -18,7 +17,6 @@ import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.ELEMENT_NOT_EXISTS;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS;
/**
* 金属元素 Service 实现类

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java
View File

@@ -7,7 +7,6 @@ import com.zt.plat.module.base.controller.admin.base.vo.FactoryPageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.FactoryRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.FactorySaveReqVO;
import com.zt.plat.module.base.dal.dataobject.base.FactoryDO;
import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
import com.zt.plat.module.base.dal.mysql.base.FactoryMapper;
import jakarta.annotation.Resource;
import org.apache.ibatis.executor.BatchResult;
@@ -18,7 +17,6 @@ import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.FACTORY_NOT_EXISTS;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS;
/**
* 工厂 Service 实现类

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java
View File

@@ -7,7 +7,6 @@ import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyPageReqVO
import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroySaveReqVO;
import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO;
import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
import com.zt.plat.module.base.dal.mysql.base.MaterialDestroyMapper;
import jakarta.annotation.Resource;
import org.apache.ibatis.executor.BatchResult;
@@ -18,7 +17,6 @@ import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_DESTROY_NOT_EXISTS;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS;
/**
* 物料回收率 Service 实现类

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java
View File

@@ -7,7 +7,6 @@ import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherPageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherSaveReqVO;
import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO;
import com.zt.plat.module.base.dal.mysql.base.MaterialOtherMapper;
import jakarta.annotation.Resource;
import org.apache.ibatis.executor.BatchResult;
@@ -18,7 +17,6 @@ import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.WAREHOUSE_NOT_EXISTS;
/**
* 物料拓展数据 Service 实现类

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseServiceImpl.java
View File

@@ -6,7 +6,6 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.module.base.controller.admin.base.vo.WarehousePageReqVO;
import com.zt.plat.module.base.controller.admin.base.vo.WarehouseRespVO;
import com.zt.plat.module.base.controller.admin.base.vo.WarehouseSaveReqVO;
import com.zt.plat.module.base.dal.dataobject.base.AccountDO;
import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO;
import com.zt.plat.module.base.dal.mysql.base.WarehouseMapper;
import jakarta.annotation.Resource;
@@ -17,7 +16,6 @@ import org.springframework.validation.annotation.Validated;
import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.ACCOUNT_NOT_EXISTS;
import static com.zt.plat.module.base.enums.ErrorCodeConstants.WAREHOUSE_NOT_EXISTS;
/**

4
zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml
View File

@@ -17,7 +17,7 @@
c.NUM as erpNumber,
c.NAME as erpName,
d.NAME as companyName,
d.CODE as deptId,
d.CODE as companyNumber,
d.LEADER_USER_ID as leaderUserId,
d.IS_COMPANY as isCompany ,
d.IS_GROUP as isGroup,
@@ -26,7 +26,7 @@
d.STATUS as status,
d.CREATOR as creator
from SYSTEM_DEPT d
left join SPLY_CPN_REL r on r.NUM = d.CODE
left join SPLY_CPN_REL r on r.NUM = d.ID
left join SPLY_ERP_CPN c on r.ERP_NUM = c.NUM
where d.DELETED = 0
<if test="name != null">