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..857ec50c 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; } @@ -966,7 +976,9 @@ public class ContractServiceImpl implements ContractService { if (reqVO.getContractReceiveSends() != null && !reqVO.getContractReceiveSends().isEmpty()) { //通过合同id删除收发货规则 List contractReceiveSendListByContract = contractReceiveSendService.getContractReceiveSendListByContractId(id); - contractReceiveSendService.deleteContractReceiveSendListByIds(contractReceiveSendListByContract.stream().map(ContractReceiveSendRespVO::getId).toList()); + if (!contractReceiveSendListByContract.isEmpty()){ + contractReceiveSendService.deleteContractReceiveSendListByIds(contractReceiveSendListByContract.stream().map(ContractReceiveSendRespVO::getId).toList()); + } //重新插入收发货规则 reqVO.getContractReceiveSends().forEach(item -> { item.setContractId(id); @@ -977,7 +989,9 @@ public class ContractServiceImpl implements ContractService { //更新资金拆分表(直接先删除后面再插入) if (reqVO.getAmountSplit() != null && !reqVO.getAmountSplit().isEmpty()) { List amountDismantleList = amountDismantleService.getAmountDismantleListByContractId(id); - amountDismantleService.deleteAmountDismantleListByIds(amountDismantleList.stream().map(AmountDismantleDO::getId).toList()); + if(!amountDismantleList.isEmpty()){ + amountDismantleService.deleteAmountDismantleListByIds(amountDismantleList.stream().map(AmountDismantleDO::getId).toList()); + } reqVO.getAmountSplit().forEach(item -> { item.setContractId(id); item.setId(null); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java index a94835e3..2e92f76a 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java @@ -33,6 +33,8 @@ public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{ .materialParentId(reqVO.getMaterialParentId()) .materialParentCode(reqVO.getMaterialParentCode()) .materialId(materials.getMaterialId()) + .deptId(reqVO.getDeptId()) + .companyCode(reqVO.getCompanyCode()) .materialCode(materials.getMaterialCode()) .build()); });