From 71ba93c7dbfe5303ca70a07db73f0e72900a3317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Thu, 22 Jan 2026 11:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=8B=86=E5=88=86=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/contract/AmountSplitRespDTO.java | 2 +- .../api/vo/contract/AmountDismantlePageReqVO.java | 2 +- .../api/vo/contract/AmountDismantleRespVO.java | 2 +- .../api/vo/contract/AmountDismantleSaveReqVO.java | 2 +- .../contractorder/api/vo/contract/ContractRespVO.java | 8 ++++++++ .../dataobject/amountdismantle/AmountDismantleDO.java | 4 ++-- .../mysql/amountdismantle/AmountDismantleMapper.java | 2 +- .../service/contract/ContractServiceImpl.java | 10 ++++++++++ 8 files changed, 25 insertions(+), 7 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/AmountSplitRespDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/AmountSplitRespDTO.java index f695409b..bde57997 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/AmountSplitRespDTO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/AmountSplitRespDTO.java @@ -15,7 +15,7 @@ public class AmountSplitRespDTO { private String materialName; @Schema(description = "物料编码") - private String materialCode; + private String materialNumber; @Schema(description = "元素缩写") private String elementAbbreviation; diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantlePageReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantlePageReqVO.java index 796f9b90..6e5e9523 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantlePageReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantlePageReqVO.java @@ -17,7 +17,7 @@ public class AmountDismantlePageReqVO extends PageParam { private String materialName; @Schema(description = "物料编码") - private String materialCode; + private String materialNumber; @Schema(description = "元素缩写") private String elementAbbreviation; diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleRespVO.java index ac94f076..fa38a7eb 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleRespVO.java @@ -22,7 +22,7 @@ public class AmountDismantleRespVO { @Schema(description = "物料编码") @ExcelProperty("物料编码") - private String materialCode; + private String materialNumber; @Schema(description = "元素缩写") @ExcelProperty("元素缩写") diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleSaveReqVO.java index dfd35a88..26f82402 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleSaveReqVO.java @@ -16,7 +16,7 @@ public class AmountDismantleSaveReqVO { private String materialName; @Schema(description = "物料编码") - private String materialCode; + private String materialNumber; @Schema(description = "元素缩写") private String elementAbbreviation; diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java index 982d4d72..625a3640 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java @@ -3,6 +3,8 @@ package com.zt.plat.module.contractorder.api.vo.contract; import com.zt.plat.module.base.controller.admin.templtp.vo.TmplInscDatBsnRespVO; import com.zt.plat.module.base.controller.admin.templtp.vo.TmplInscItmBsnRespVO; +import com.zt.plat.module.contractorder.api.dto.contract.AmountSplitRespDTO; +import com.zt.plat.module.contractorder.api.dto.contract.ContractReceiveSendRespDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -275,6 +277,12 @@ public class ContractRespVO { @Schema(description = "是否信用", example = "1") private String hasCredit; + @Schema(description = "收发货规则") + private List contractReceiveSends; + + @Schema(description = "金额拆分") + private List amountSplit; + // 物料信息 private List detail; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/amountdismantle/AmountDismantleDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/amountdismantle/AmountDismantleDO.java index 6c2559f0..b2d8c1a3 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/amountdismantle/AmountDismantleDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/amountdismantle/AmountDismantleDO.java @@ -40,8 +40,8 @@ public class AmountDismantleDO extends BusinessBaseDO { /** * 物料编码 */ - @TableField("MTRL_CD") - private String materialCode; + @TableField("MTRL_NUM") + private String materialNumber; /** * 元素缩写 */ diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/amountdismantle/AmountDismantleMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/amountdismantle/AmountDismantleMapper.java index 4eb7ed97..471c7b67 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/amountdismantle/AmountDismantleMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/amountdismantle/AmountDismantleMapper.java @@ -20,7 +20,7 @@ public interface AmountDismantleMapper extends BaseMapperX { default PageResult selectPage(AmountDismantlePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(AmountDismantleDO::getMaterialName, reqVO.getMaterialName()) - .eqIfPresent(AmountDismantleDO::getMaterialCode, reqVO.getMaterialCode()) + .eqIfPresent(AmountDismantleDO::getMaterialNumber, reqVO.getMaterialNumber()) .eqIfPresent(AmountDismantleDO::getElementAbbreviation, reqVO.getElementAbbreviation()) .likeIfPresent(AmountDismantleDO::getElementName, reqVO.getElementName()) .eqIfPresent(AmountDismantleDO::getElementCode, reqVO.getElementCode()) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 66fb695f..6d9bd555 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -420,6 +420,16 @@ public class ContractServiceImpl implements ContractService { respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS()); } } + //收发货 + List contractReceiveSendListByContractId = contractReceiveSendService.getContractReceiveSendListByContractId(contractMainDO.getId()); + if (contractReceiveSendListByContractId != null && !contractReceiveSendListByContractId.isEmpty()) { + respVO.setContractReceiveSends(contractReceiveSendListByContractId); + } + //金额拆分 + List amountDismantleListByContractId = amountDismantleService.getAmountDismantleListByContractId(contractMainDO.getId()); + if (amountDismantleListByContractId != null && !amountDismantleListByContractId.isEmpty()) { + respVO.setAmountSplit(BeanUtils.toBean(amountDismantleListByContractId, AmountDismantleRespVO.class)); + } return respVO; }