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

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
liss
2025-10-24 10:47:29 +08:00
parent 5c0d724619 2629521fc1
commit 3b26c22811
16 changed files with 164 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java
View File

@@ -1,6 +1,8 @@
package com.zt.plat.module.api;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.api.dto.AccountDTO;
import com.zt.plat.module.api.dto.ElementDTO;
import com.zt.plat.module.api.dto.MaterialOtherDTO;
import com.zt.plat.module.base.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
@@ -23,4 +25,8 @@ public interface BaseApi {
@GetMapping(PREFIX + "/getMaterialOtherNoPage")
@Operation(summary = "物料拓展关系数据不分页查询")
List<MaterialOtherDTO> getMaterialOtherNoPage(MaterialOtherDTO respVO);
@GetMapping(PREFIX + "/getElementNoPage")
@Operation(summary = "金属元素数据不分页查询")
CommonResult<List<ElementDTO>> getElementNoPage(ElementDTO respVO);
}

33
zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/ElementDTO.java Normal file
View File

@@ -0,0 +1,33 @@
package com.zt.plat.module.api.dto;
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 = "管理后台 - 金属元素 Response VO")
@Data
public class ElementDTO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21884")
private Long id;
@Schema(description = "金属元素缩写", requiredMode = Schema.RequiredMode.REQUIRED)
private String abbreviation;
@Schema(description = "金属元素名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
private String name;
@Schema(description = "金属元素编码", requiredMode = Schema.RequiredMode.REQUIRED)
private String coding;
@Schema(description = "小数位数", requiredMode = Schema.RequiredMode.REQUIRED)
private Long decimalValue;
@Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED)
private String gradeUnit;
}

22
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/BaseApiImpl.java
View File

@@ -1,16 +1,30 @@
package com.zt.plat.module.base.api;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.module.api.BaseApi;
import com.zt.plat.module.api.dto.AccountDTO;
import com.zt.plat.module.api.dto.ElementDTO;
import com.zt.plat.module.api.dto.MaterialOtherDTO;
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.dal.dataobject.base.ElementDO;
import com.zt.plat.module.base.service.base.AccountService;
import com.zt.plat.module.base.service.base.ElementService;
import com.zt.plat.module.base.service.base.MaterialOtherService;
import io.swagger.v3.oas.annotations.Operation;
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.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
/**
* ERP Api 实现类
*
@@ -27,6 +41,9 @@ public class BaseApiImpl implements BaseApi {
@Resource
private MaterialOtherService materialOtherService;
@Resource
private ElementService elementService;
@Override
public List<AccountDTO> getAccountNoPage(AccountDTO respVO) {
return accountService.getAccountNoPage(respVO);
@@ -36,4 +53,9 @@ public class BaseApiImpl implements BaseApi {
public List<MaterialOtherDTO> getMaterialOtherNoPage(MaterialOtherDTO respVO) {
return materialOtherService.getMaterialOtherNoPage(respVO);
}
public CommonResult<List<ElementDTO>> getElementNoPage(ElementDTO respVO) {
List<ElementDO> list = elementService.getElementNoPage(respVO);
return success(BeanUtils.toBean(list, ElementDTO.class));
}
}

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

@@ -3,10 +3,13 @@ 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.api.dto.ElementDTO;
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;
import java.util.List;
/**
* 金属元素 Mapper
*
@@ -27,4 +30,14 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
}
String selectMaxCode();
default List<ElementDO> getElementNoPage(ElementDTO dto) {
return selectList(new LambdaQueryWrapperX<ElementDO>()
.eqIfPresent(ElementDO::getAbbreviation, dto.getAbbreviation())
.likeIfPresent(ElementDO::getName, dto.getName())
.eqIfPresent(ElementDO::getDecimalValue, dto.getDecimalValue())
.eqIfPresent(ElementDO::getCoding, dto.getCoding())
.eqIfPresent(ElementDO::getGradeUnit, dto.getGradeUnit())
.orderByDesc(ElementDO::getId));
}
}

3
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java
View File

@@ -1,6 +1,7 @@
package com.zt.plat.module.base.service.base;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.module.api.dto.ElementDTO;
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;
@@ -62,4 +63,6 @@ public interface ElementService {
PageResult<ElementDO> getElementPage(ElementPageReqVO pageReqVO);
void enableElementList(List<ElementRespVO> saveReqVOS);
List<ElementDO> getElementNoPage(ElementDTO respVO);
}

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

@@ -3,6 +3,7 @@ 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.api.dto.ElementDTO;
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;
@@ -107,4 +108,9 @@ public class ElementServiceImpl implements ElementService {
}
}
@Override
public List<ElementDO> getElementNoPage(ElementDTO respVO) {
return elementMapper.getElementNoPage(respVO);
}
}

1
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java
View File

@@ -15,4 +15,5 @@ public interface ErrorCodeConstants {
ErrorCode ORDER_ID_NOT_EXISTS = new ErrorCode(1_008_000_010, "订单id不能为空");
ErrorCode PRCH_ORD_DTL_NOT_EXISTS = new ErrorCode(1_008_001_001, "采购订单明细不存在");
ErrorCode PURCHASE_ORDER_STATUS_ERROR = new ErrorCode(1_008_001_020, "非法的订单状态");
ErrorCode Sales_ORDER_NOT_EXISTS = new ErrorCode(1_008_000_001, "销售订单不存在");
}

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java
View File

@@ -192,4 +192,8 @@ public class PurchaseOrderDetailsRespVO {
*/
private List<PrchOrdDtlDetailsRespVO> orderDetails;
/**
* 订单类型
*/
private String splyBsnTp;
}

22
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.controller.admin.salesorder.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.zt.plat.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -134,4 +135,25 @@ public class SalesOrderPageReqVO extends PageParam {
private String splyBsnTp;
@Schema(description = "销售组织名称")
@ExcelProperty("销售组织名称")
private String saleOrgzName;
@Schema(description = "销售组织编码")
@ExcelProperty("销售组织编码")
private String saleOrgzCd;
@Schema(description = "销售部门名称")
@ExcelProperty("销售部门名称")
private String saleAcsName;
@Schema(description = "销售部门编码")
@ExcelProperty("销售部门编码")
private String saleAcsCdg;
@Schema(description = "产品组名")
@ExcelProperty("产品组名")
private String pdtGrpName;
@Schema(description = "产品组编码")
@ExcelProperty("产品组编码")
private String pdtGrpCdg;
}

20
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java
View File

@@ -191,10 +191,28 @@ public class SalesOrderRespVO {
@Schema(description = "流程当前任务节点id")
@ExcelProperty("流程当前任务节点id")
private String taskId;
@Schema(description = " 审批意见")
@ExcelProperty(" 审批意见")
private String reviewOpinion;
@Schema(description = "销售组织名称")
@ExcelProperty("销售组织名称")
private String saleOrgzName;
@Schema(description = "销售组织编码")
@ExcelProperty("销售组织编码")
private String saleOrgzCd;
@Schema(description = "分销聚道名称")
@ExcelProperty("分销聚道名称")
private String saleAcsName;
@Schema(description = "分销聚道编码")
@ExcelProperty("分销聚道编码")
private String saleAcsCdg;
@Schema(description = "产品组名")
@ExcelProperty("产品组名")
private String pdtGrpName;
@Schema(description = "产品组编码")
@ExcelProperty("产品组编码")
private String pdtGrpCdg;
}

Some files were not shown because too many files have changed in this diff Show More