From 70634dbb6d396e14c9c4e99319dc37e8793ba299 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: Tue, 10 Feb 2026 15:54:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9B=B8=E5=85=B3Feign?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/plandate/PlanApi.java | 24 ++++ ...thProductivePlanCheckDetailSaveReqDTO.java | 51 +++++++++ ...ErpMonthProductivePlanCheckSaveReqDTO.java | 54 +++++++++ .../plandate/dto/PlanDateSaveReqDTO.java | 103 ++++++++++++++++++ .../module/base/api/plan/PlanApiImpl.java | 36 ++++++ ...nthProductivePlanCheckDetailSaveReqVO.java | 23 ++++ .../ErpMonthProductivePlanCheckSaveReqVO.java | 22 ++++ .../admin/plandate/PlanDateController.java | 9 ++ .../admin/plandate/vo/PlanDateSaveReqVO.java | 22 ++++ .../plandate/PlanOrderServiceImpl.java | 5 +- .../OriginalMaterialProcessingController.java | 8 ++ .../vo/OriginalMaterialProcessingRespVO.java | 4 + .../entrustorder/EntrustOrderOrderMapper.java | 1 + 13 files changed, 361 insertions(+), 1 deletion(-) create mode 100644 zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/PlanApi.java create mode 100644 zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/ErpMonthProductivePlanCheckDetailSaveReqDTO.java create mode 100644 zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/ErpMonthProductivePlanCheckSaveReqDTO.java create mode 100644 zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/PlanDateSaveReqDTO.java create mode 100644 zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/plan/PlanApiImpl.java diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/PlanApi.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/PlanApi.java new file mode 100644 index 00000000..fab708bc --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/PlanApi.java @@ -0,0 +1,24 @@ +package com.zt.plat.module.plandate; + +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.base.enums.ApiConstants; +import com.zt.plat.module.plandate.dto.ErpMonthProductivePlanCheckSaveReqDTO; +import com.zt.plat.module.plandate.dto.PlanDateSaveReqDTO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +@FeignClient(name = ApiConstants.NAME) +@Tag(name = "RPC 服务 - base") +public interface PlanApi { + String PREFIX = ApiConstants.PREFIX + "/api/plan"; + + @PostMapping(PREFIX + "/create") + @Operation(summary = "计划创建") + CommonResult planCreate(PlanDateSaveReqDTO reqDTO); + + @PostMapping(PREFIX + "/monthProductivePlanCheckCreate") + @Operation(summary = "月 productive plan check 创建") + CommonResult monthProductivePlanCheckCreate(ErpMonthProductivePlanCheckSaveReqDTO reqDTO); +} diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/ErpMonthProductivePlanCheckDetailSaveReqDTO.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/ErpMonthProductivePlanCheckDetailSaveReqDTO.java new file mode 100644 index 00000000..f6248208 --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/ErpMonthProductivePlanCheckDetailSaveReqDTO.java @@ -0,0 +1,51 @@ +package com.zt.plat.module.plandate.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.validation.annotation.Validated; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - ERP月度产品计划核对明细新增 Request DTO") +@Data +@Validated +public class ErpMonthProductivePlanCheckDetailSaveReqDTO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14111") + private Long id; + + @Schema(description = "日期（格式：YYYY-MM-DD）") + private String date; + + @Schema(description = "排序") + private Integer sort; + + @Schema(description = "值") + private BigDecimal value; + + @Schema(description = "主数据ID（关联主表ID）", example = "3745") + private Long mainId; + + @Schema(description = "公司ID") + private Long companyId; + @Schema(description = "公司名称") + private String companyName; + @Schema(description = "部门ID") + private Long deptId; + @Schema(description = "部门名称") + private Long postId; + @Schema(description = "岗位ID") + private Long tenantId; + @Schema(description = "创建人名称") + private String creatorName; + @Schema(description = "更新人名称") + private String updaterName; + @Schema(description = "创建时间") + private LocalDateTime createTime; + @Schema(description = "更新时间") + private LocalDateTime updateTime; + @Schema(description = "删除标志") + private int deleted; + +} \ No newline at end of file diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/ErpMonthProductivePlanCheckSaveReqDTO.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/ErpMonthProductivePlanCheckSaveReqDTO.java new file mode 100644 index 00000000..94f9b39f --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/ErpMonthProductivePlanCheckSaveReqDTO.java @@ -0,0 +1,54 @@ +package com.zt.plat.module.plandate.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.validation.annotation.Validated; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +@Schema(description = "管理后台 - ERP月度产品计划核对新增 Request DTO") +@Data +@Validated +public class ErpMonthProductivePlanCheckSaveReqDTO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19081") + private Long id; + + @Schema(description = "产品名") + private String product; + + @Schema(description = "年度") + private String year; + + @Schema(description = "月份") + private String month; + + @Schema(description = "月计划量") + private BigDecimal monthPlan; + + @Schema(description = "月计划明细") + private List details; + @Schema(description = "公司ID") + private Long companyId; + @Schema(description = "公司名称") + private String companyName; + @Schema(description = "部门ID") + private Long deptId; + @Schema(description = "部门名称") + private Long postId; + @Schema(description = "岗位ID") + private Long tenantId; + @Schema(description = "创建人名称") + private String creatorName; + @Schema(description = "更新人名称") + private String updaterName; + @Schema(description = "创建时间") + private LocalDateTime createTime; + @Schema(description = "更新时间") + private LocalDateTime updateTime; + @Schema(description = "删除标志") + private int deleted; + +} \ No newline at end of file diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/PlanDateSaveReqDTO.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/PlanDateSaveReqDTO.java new file mode 100644 index 00000000..942c76c3 --- /dev/null +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/plandate/dto/PlanDateSaveReqDTO.java @@ -0,0 +1,103 @@ +package com.zt.plat.module.plandate.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDateTime; +import java.util.*; +import jakarta.validation.constraints.*; +import org.springframework.validation.annotation.Validated; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 计划数据新增 Request DTO") +@Data +@Validated +public class PlanDateSaveReqDTO { + + @Schema(description = "主键 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10584") + private Long id; + + @Schema(description = "计划名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @NotEmpty(message = "计划名称不能为空") + private String planName; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "计划编码不能为空") + private String planCoding; + + @Schema(description = "父级ID", example = "6059") + private Long parentId; + + @Schema(description = "年份") + private String year; + + @Schema(description = "初始值") + private BigDecimal initialValue; + + @Schema(description = "平均值") + private BigDecimal averageValue; + + @Schema(description = "合计值") + private BigDecimal sumValue; + + @Schema(description = "一月") + private BigDecimal january; + + @Schema(description = "二月") + private BigDecimal february; + + @Schema(description = "三月") + private BigDecimal march; + + @Schema(description = "四月") + private BigDecimal april; + + @Schema(description = "五月") + private BigDecimal may; + + @Schema(description = "六月") + private BigDecimal june; + + @Schema(description = "七月") + private BigDecimal july; + + @Schema(description = "八月") + private BigDecimal august; + + @Schema(description = "九月") + private BigDecimal september; + + @Schema(description = "十月") + private BigDecimal october; + + @Schema(description = "十一月") + private BigDecimal november; + + @Schema(description = "十二月") + private BigDecimal december; + + @Schema(description = "子节点") + private List children; + @Schema(description = "公司ID") + private Long companyId; + @Schema(description = "公司名称") + private String companyName; + @Schema(description = "部门ID") + private Long deptId; + @Schema(description = "部门名称") + private Long postId; + @Schema(description = "岗位ID") + private Long tenantId; + @Schema(description = "创建人名称") + private String creatorName; + @Schema(description = "更新人名称") + private String updaterName; + @Schema(description = "创建时间") + private LocalDateTime createTime; + @Schema(description = "更新时间") + private LocalDateTime updateTime; + @Schema(description = "删除标志") + private int deleted; + +} \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/plan/PlanApiImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/plan/PlanApiImpl.java new file mode 100644 index 00000000..e53c78ca --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/api/plan/PlanApiImpl.java @@ -0,0 +1,36 @@ +package com.zt.plat.module.base.api.plan; + +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo.ErpMonthProductivePlanCheckSaveReqVO; +import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDateSaveReqVO; +import com.zt.plat.module.base.service.erpmonthproductiveplancheck.ErpMonthProductivePlanCheckService; +import com.zt.plat.module.base.service.plandate.PlanDateService; +import com.zt.plat.module.plandate.PlanApi; +import com.zt.plat.module.plandate.dto.ErpMonthProductivePlanCheckSaveReqDTO; +import com.zt.plat.module.plandate.dto.PlanDateSaveReqDTO; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Validated +public class PlanApiImpl implements PlanApi { + @Resource + private PlanDateService planDateService; + @Resource + private ErpMonthProductivePlanCheckService erpMonthProductivePlanCheckService; + @Override + public CommonResult planCreate(PlanDateSaveReqDTO reqDTO) { + PlanDateSaveReqVO planDateSaveReqVO = BeanUtils.toBean(reqDTO, PlanDateSaveReqVO.class); + planDateService.createPlanDate(planDateSaveReqVO); + return CommonResult.success(true); + } + + @Override + public CommonResult monthProductivePlanCheckCreate(ErpMonthProductivePlanCheckSaveReqDTO reqDTO) { + ErpMonthProductivePlanCheckSaveReqVO erpMonthProductivePlanCheckSaveReqVO = BeanUtils.toBean(reqDTO, ErpMonthProductivePlanCheckSaveReqVO.class); + erpMonthProductivePlanCheckService.createErpMonthProductivePlanCheck(erpMonthProductivePlanCheckSaveReqVO); + return CommonResult.success(true); + } +} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckDetailSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckDetailSaveReqVO.java index 48e790dd..67ec8b1e 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckDetailSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckDetailSaveReqVO.java @@ -2,6 +2,8 @@ package com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import jakarta.validation.constraints.*; import java.math.BigDecimal; @@ -25,4 +27,25 @@ public class ErpMonthProductivePlanCheckDetailSaveReqVO { @Schema(description = "主数据ID（关联主表ID）", example = "3745") private Long mainId; + @Schema(description = "公司ID") + private Long companyId; + @Schema(description = "公司名称") + private String companyName; + @Schema(description = "部门ID") + private Long deptId; + @Schema(description = "部门名称") + private Long postId; + @Schema(description = "岗位ID") + private Long tenantId; + @Schema(description = "创建人名称") + private String creatorName; + @Schema(description = "更新人名称") + private String updaterName; + @Schema(description = "创建时间") + private LocalDateTime createTime; + @Schema(description = "更新时间") + private LocalDateTime updateTime; + @Schema(description = "删除标志") + private int deleted; + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckSaveReqVO.java index 20e8ef21..2bf019cd 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckSaveReqVO.java @@ -2,6 +2,8 @@ package com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import jakarta.validation.constraints.*; import java.math.BigDecimal; @@ -27,5 +29,25 @@ public class ErpMonthProductivePlanCheckSaveReqVO { @Schema(description = "月计划明细") private List details; + @Schema(description = "公司ID") + private Long companyId; + @Schema(description = "公司名称") + private String companyName; + @Schema(description = "部门ID") + private Long deptId; + @Schema(description = "部门名称") + private Long postId; + @Schema(description = "岗位ID") + private Long tenantId; + @Schema(description = "创建人名称") + private String creatorName; + @Schema(description = "更新人名称") + private String updaterName; + @Schema(description = "创建时间") + private LocalDateTime createTime; + @Schema(description = "更新时间") + private LocalDateTime updateTime; + @Schema(description = "删除标志") + private int deleted; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java index 7ac04f9c..1763cc81 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java @@ -5,6 +5,9 @@ import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDateRespVO; import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDateSaveReqVO; import com.zt.plat.module.base.dal.dataobject.plandate.PlanDateDO; import com.zt.plat.module.base.service.plandate.PlanDateService; +import com.zt.plat.module.plandate.PlanApi; +import com.zt.plat.module.plandate.dto.ErpMonthProductivePlanCheckSaveReqDTO; +import com.zt.plat.module.plandate.dto.PlanDateSaveReqDTO; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -46,6 +49,8 @@ public class PlanDateController implements BusinessControllerMarker { @Resource private PlanDateService planDateService; + @Resource + private PlanApi planApi; @PostMapping("/create") @Operation(summary = "创建计划数据") @@ -116,4 +121,8 @@ public class PlanDateController implements BusinessControllerMarker { public CommonResult> listAllPlanDateTree(@Valid PlanDatePageReqVO pageReqVO) { return success(planDateService.listPlanDateTree(pageReqVO)); } + @PostMapping("/planApi") + public CommonResult planApi(@RequestBody ErpMonthProductivePlanCheckSaveReqDTO reqDTO) { + return success(planApi.monthProductivePlanCheckCreate(reqDTO)); + } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/vo/PlanDateSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/vo/PlanDateSaveReqVO.java index 87b56998..5e8d5a77 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/vo/PlanDateSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/vo/PlanDateSaveReqVO.java @@ -2,6 +2,8 @@ package com.zt.plat.module.base.controller.admin.plandate.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import jakarta.validation.constraints.*; import java.math.BigDecimal; @@ -74,5 +76,25 @@ public class PlanDateSaveReqVO { @Schema(description = "子节点") private List children; + @Schema(description = "公司ID") + private Long companyId; + @Schema(description = "公司名称") + private String companyName; + @Schema(description = "部门ID") + private Long deptId; + @Schema(description = "部门名称") + private Long postId; + @Schema(description = "岗位ID") + private Long tenantId; + @Schema(description = "创建人名称") + private String creatorName; + @Schema(description = "更新人名称") + private String updaterName; + @Schema(description = "创建时间") + private LocalDateTime createTime; + @Schema(description = "更新时间") + private LocalDateTime updateTime; + @Schema(description = "删除标志") + private int deleted; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanOrderServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanOrderServiceImpl.java index f9d6b1f0..43e96db5 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanOrderServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanOrderServiceImpl.java @@ -62,7 +62,10 @@ public class PlanOrderServiceImpl implements PlanOrderService { } private void validateExists(PlanOrderSaveReqVO reqVO) { - if (planOrderMapper.exists(new LambdaQueryWrapper().eq(PlanOrderDO::getPlanId, reqVO.getPlanId()).eq(PlanOrderDO::getOrderType, reqVO.getOrderType()).eq(PlanOrderDO::getOrderNumber, reqVO.getOrderNumber()))) { + if (planOrderMapper.exists(new LambdaQueryWrapper() + .eq(PlanOrderDO::getPlanId, reqVO.getPlanId()) + .eq(PlanOrderDO::getOrderType, reqVO.getOrderType()) + .eq(PlanOrderDO::getOrderNumber, reqVO.getOrderNumber()))) { throw exception(PLAN_ORD_EXISTS); } } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingController.java index c5deff63..6476f8ec 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingController.java @@ -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); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java index 412bd68f..5524b3a3 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java @@ -169,4 +169,8 @@ public class OriginalMaterialProcessingRespVO { @ExcelProperty("相关订单ID") private Long relatedOrderId; + //绑定的来料采购订单 + @Schema(description = "绑定的来料采购订单") + private OriginalMaterialProcessingRespVO relatedOrder; + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java index 1724eff6..4b24943e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java @@ -60,6 +60,7 @@ public interface EntrustOrderOrderMapper extends BaseMapperX