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

计划相关Feign接口

Browse Source
This commit is contained in:
潘荣晟
2026-02-10 15:54:46 +08:00
parent 7ccb6e09e2
commit 70634dbb6d
13 changed files with 361 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingController.java
View File

@@ -91,6 +91,14 @@ public class OriginalMaterialProcessingController {
OriginalMaterialProcessingRespVO bean = BeanUtils.toBean(originalMaterialProcessingDO, OriginalMaterialProcessingRespVO.class);
if (bean != null) {
bean.setDetails(originalMaterialProcessingService.getOriginalMaterialProcessingDetailListByOrderId(bean.getId()));
if (bean.getRelatedOrderId() != null){//获取关联订单
OriginalMaterialProcessingDO relatedOrder = originalMaterialProcessingService.getOriginalMaterialProcessing(id);
OriginalMaterialProcessingRespVO relatedBean = BeanUtils.toBean(relatedOrder, OriginalMaterialProcessingRespVO.class);
if (relatedBean != null){
relatedBean.setDetails(originalMaterialProcessingService.getOriginalMaterialProcessingDetailListByOrderId(relatedBean.getId()));
bean.setRelatedOrder(relatedBean);
}
}
}
return success(bean);
}

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

@@ -169,4 +169,8 @@ public class OriginalMaterialProcessingRespVO {
@ExcelProperty("相关订单ID")
private Long relatedOrderId;
//绑定的来料采购订单
@Schema(description = "绑定的来料采购订单")
private OriginalMaterialProcessingRespVO relatedOrder;
}

1
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java
View File

@@ -60,6 +60,7 @@ public interface EntrustOrderOrderMapper extends BaseMapperX<EntrustOrderOrderDO
.eqIfPresent(EntrustOrderOrderDO::getStatus, reqVO.getStatus())
.likeIfPresent(EntrustOrderOrderDO::getPurchaseGroupName, reqVO.getPurchaseGroupName())
.likeIfPresent(EntrustOrderOrderDO::getUnit, reqVO.getUnit())
.likeIfPresent(EntrustOrderOrderDO::getSplyBsnTp, reqVO.getSplyBsnTp())
.orderByDesc(EntrustOrderOrderDO::getId));
}