From 37e9844691f90977ab7964459c1b0ee862186ca1 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Tue, 9 Dec 2025 14:44:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutsourcingNotifyController.java | 9 +++++++++ .../entity/vo/OutsourcingAndMaterialVo.java | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingNotifyController.java b/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingNotifyController.java index 207e628..f97f1ee 100644 --- a/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingNotifyController.java +++ b/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingNotifyController.java @@ -55,6 +55,15 @@ public class OutsourcingNotifyController { public R getShopOrderAndMaterialByShoporder(@RequestBody IfsOutsourcingOrderDto data) throws Exception { List rows = outsourcingNotifyService.getShopOrderAndMaterialByShoporder(data); if(rows != null && rows.size() > 0){ + // 提前赋值：用contract赋值给site，用componentPartNo赋值给partQuery - rqrq + for (OutsourcingAndMaterialVo row : rows) { + row.setSite(row.getContract()); + row.setPartQuery(row.getComponentPartNo()); // componentPartNo用于fillIsInWh查询 - rqrq + } + + // 批量填充isInWh字段 - rqrq + partAttributeUtil.fillIsInWh(rows); + return R.ok().put("rows", rows); } return R.error("未找到对应的工单物料信息"); diff --git a/src/main/java/com/gaotao/modules/outsourcing/entity/vo/OutsourcingAndMaterialVo.java b/src/main/java/com/gaotao/modules/outsourcing/entity/vo/OutsourcingAndMaterialVo.java index ef36183..4bc7b4f 100644 --- a/src/main/java/com/gaotao/modules/outsourcing/entity/vo/OutsourcingAndMaterialVo.java +++ b/src/main/java/com/gaotao/modules/outsourcing/entity/vo/OutsourcingAndMaterialVo.java @@ -1,6 +1,7 @@ package com.gaotao.modules.outsourcing.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.gaotao.common.utils.PartAttributeAware; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -8,7 +9,7 @@ import java.math.BigDecimal; import java.util.Date; @Data -public class OutsourcingAndMaterialVo { +public class OutsourcingAndMaterialVo implements PartAttributeAware { /**--------------------------------------详情Materical---------------------------------------------*/ // 订单编号（关联的父订单编号） private String orderNo; @@ -164,4 +165,16 @@ public class OutsourcingAndMaterialVo { private String objstate; private String authorizationRequired; + + private String partQuery; + + private String isInWh; + + private BigDecimal availableQty; + + @Override + public String getPartQuery() { + return partQuery != null ? partQuery : partNo; + } + }