From 04f81dccecd25481e75afd3aba3b03ef4bec49ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Tue, 2 Dec 2025 11:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B0=83=E7=94=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/factory/entity/PartAttribute.java | 10 +++++++++-
 .../impl/PartAttributeServiceImpl.java        | 20 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/factory/entity/PartAttribute.java b/src/main/java/com/gaotao/modules/factory/entity/PartAttribute.java
index 2c0fde8..aeacc9f 100644
--- a/src/main/java/com/gaotao/modules/factory/entity/PartAttribute.java
+++ b/src/main/java/com/gaotao/modules/factory/entity/PartAttribute.java
@@ -1,6 +1,8 @@
 package com.gaotao.modules.factory.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.gaotao.common.utils.PartAttributeAware;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -10,7 +12,7 @@ import java.math.BigDecimal;
  */
 @Data
 @TableName("part_attribute")
-public class PartAttribute {
+public class PartAttribute implements PartAttributeAware {
 
     /**
      * 工厂/站点
@@ -71,4 +73,10 @@ public class PartAttribute {
      * 托盘类型
      */
     private String palletType;
+    
+    /**
+     * 可用库存数量（非数据库字段，通过fillIsInWh方法填充）- rqrq
+     */
+    @TableField(exist = false)
+    private BigDecimal availableQty;
 }
diff --git a/src/main/java/com/gaotao/modules/factory/service/impl/PartAttributeServiceImpl.java b/src/main/java/com/gaotao/modules/factory/service/impl/PartAttributeServiceImpl.java
index a7a7efa..f72c9dd 100644
--- a/src/main/java/com/gaotao/modules/factory/service/impl/PartAttributeServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/factory/service/impl/PartAttributeServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.PageUtils;
+import com.gaotao.common.utils.PartAttributeUtil;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.factory.dao.PartAttributeMapper;
 import com.gaotao.modules.factory.entity.PartAttribute;
@@ -29,6 +30,9 @@ public class PartAttributeServiceImpl extends ServiceImpl<PartAttributeMapper, P
 
     @Autowired
     private PartAttributeMapper partAttributeMapper;
+    
+    @Autowired
+    private PartAttributeUtil partAttributeUtil;  // 注入工具类 - rqrq
 
     @Override
     public PageUtils getPartAttributeList(PartAttributeQueryDto queryDto) {
@@ -257,14 +261,30 @@ public class PartAttributeServiceImpl extends ServiceImpl<PartAttributeMapper, P
 
     @Override
     public PageUtils getNoOrderList(NoOrderPartAttributeDto queryDto) {
+        System.out.println("开始查询非工单物料列表 - rqrq");
         Page<PartAttribute> page  = new Page<>(queryDto.getPage(),queryDto.getLimit());
         IPage<PartAttribute> iPage = partAttributeMapper.getNoOrderList(page, queryDto);
+        
+        // 批量填充可用库存字段 - rqrq
+        if (iPage.getRecords() != null && iPage.getRecords().size() > 0) {
+            partAttributeUtil.fillIsInWh(iPage.getRecords());
+        }
+        
+        System.out.println("查询非工单物料列表完成，共" + iPage.getTotal() + "条记录 - rqrq");
         return new PageUtils(iPage);
     }
 
     @Override
     public PartAttribute queryPartAttributeData(NoOrderPartAttributeDto queryDto) {
+        System.out.println("开始查询单个物料信息 - rqrq，partNo=" + queryDto.getComponentPartNo());
         PartAttribute partAttribute = partAttributeMapper.queryPartAttributeData(queryDto);
+        
+        // 填充可用库存字段 - rqrq
+        if (partAttribute != null) {
+            partAttributeUtil.fillIsInWh(partAttribute);
+        }
+        
+        System.out.println("查询单个物料信息完成 - rqrq");
         return partAttribute;
     }
 }