委外修改

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<OutsourcingAndMaterialVo> 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("未找到对应的工单物料信息");

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;
+    }
+
 }