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

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

Browse Source
This commit is contained in:
qianshijiang
2025-11-05 10:36:53 +08:00
parent 078de8d7d4 73ae9563c5
commit 0e66bdd8c9
5 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java
View File

@@ -5,6 +5,7 @@ import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO;
import com.zt.plat.module.contractorder.api.dto.order.SalesOrdDtlDTO;
import com.zt.plat.module.contractorder.api.vo.contract.international.IntContract;
import com.zt.plat.module.contractorder.api.vo.contract.international.IntContractPageReq;
import com.zt.plat.module.contractorder.enums.ApiConstants;
@@ -47,4 +48,12 @@ public interface ContractApi {
@GetMapping(PREFIX + "/logistics/list/page")
@Operation(summary = "国贸2.0系统合同分页查询")
CommonResult<PageResult<IntContract>> logisticsListPage(IntContractPageReq pageReq);
@GetMapping(PREFIX + "/sales-order-detail-by-id")
@Operation(summary = "通过消费订单详情id获取消费订单详情")
CommonResult<SalesOrdDtlDTO> getSalesOrderDetailById(@RequestParam("id") Long id);
@GetMapping(PREFIX + "/sales-order-detail-by-ids")
@Operation(summary = "通过消费订单详情id批量获取消费订单详情")
CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailByIds(@RequestParam("ids") List<Long> ids);
}

12
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
View File

@@ -627,4 +627,16 @@ public class ContractApiImpl implements ContractApi {
});
return purchaseOrderWithDetailsDTOS;
}
@Override
public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailById(Long id) {
SalesOrderDetailDO salesOrderDetailDO = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getId, id);
return success(BeanUtils.toBean(salesOrderDetailDO, SalesOrdDtlDTO.class));
}
@Override
public CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailByIds(List<Long> ids) {
List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids);
return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));
}
}

12
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java
View File

@@ -19,7 +19,17 @@ public interface ContractDemoteMapper extends BaseMapperX<ContractDemoteDO> {
@Select({
"<script>",
"select *",
"select ID id",
", CTRT_ID contractId",
", ELEM_NUM elementNumber",
", ELEM_ABBR elementAbbreviation",
", ELEM_NAME elementName",
", GRD_UP gradeUp",
", RNG_WY rangeWay",
", GRD_DOWN gradeDown",
", MTRL_NAME materialName",
", MTRL_NUM materialNumber",
", CREATE_TIME createTime",
", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName",
", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber",
"from bse_ctrt_dmot",

14
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java
View File

@@ -19,7 +19,19 @@ public interface ContractFormulaMapper extends BaseMapperX<ContractFormulaDO> {
@Select({
"<script>",
"select *",
"select ID id",
", CTRT_ID contractId",
", FMU_TP formulaType",
", FMU_CALT formulaCalculate",
", NUM_FMU numberFormula",
", MTRL_NAME materialName",
", MTRL_NUM materialNumber",
", DEC_PNT decimalPoint",
", ELEM_NUM elementNumber",
", ELEM_ABBR elementAbbreviation",
", ELEM_NAME elementName",
", STLM_TP settlementType",
", CREATE_TIME createTime",
", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName",
", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber",
"from bse_ctrt_fmu",

12
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java
View File

@@ -19,7 +19,17 @@ public interface ContractNotMapper extends BaseMapperX<ContractNotDO> {
@Select({
"<script>",
"select *",
"select ID id",
", CTRT_ID contractId",
", ELEM_NUM elementNumber",
", ELEM_ABBR elementAbbreviation",
", ELEM_NAME elementName",
", GRD_UP gradeUp",
", GRD_DOWN gradeDown",
", RNG_WY rangeWay",
", MTRL_NAME materialName",
", MTRL_NUM materialNumber",
", CREATE_TIME createTime",
", (select ctrt_name from BSE_CTRT_MAIN where id = ctrt_id) contractName",
", (select ctrt_ppr_num from BSE_CTRT_MAIN where id = ctrt_id) contractPaperNumber",
"from bse_ctrt_nt",