[fix]

委外加工 委外计划
修改委外计划详情对象，新增可用库存数字段；
修改查询委外计划详情service方法，添加联查库存查询获取可用库存数语句；

ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java

@@ -158,7 +158,7 @@ public class OutsourcePlanController extends BaseController
     }
 
     /**
-     * 查询委外计划详情
+     * 查询委外计划详情（1阶物料）
      */
     @PostMapping("/getRequisitionMaterial")
     @ResponseBody

ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourcePlanDetail.java

@@ -81,9 +81,12 @@ public class OutsourcePlanDetail extends BaseEntity
     /** 委外订单号（不保存数据库，*/
     private String outsourceOrderNo;
 
-    /** 已委外领料数(不保存数据库*/
+    /** 已委外领料数(只做前端展示用）*/
     private int pickedNum;
 
+    /* 可用库存数（只做前端展示用）*/
+    private int stockNum;
+
     private OutsourceMaterial material;
 
     public OutsourceMaterial getMaterial() {
@@ -252,6 +255,14 @@ public class OutsourcePlanDetail extends BaseEntity
         this.pickedNum = pickedNum;
     }
 
+    public int getStockNum() {
+        return stockNum;
+    }
+
+    public void setStockNum(int stockNum) {
+        this.stockNum = stockNum;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourcePlanServiceImpl.java

@@ -8,9 +8,12 @@ import com.ruoyi.system.domain.Vo.OutsourceProcessVo;
 import com.ruoyi.system.domain.Vo.Supplier;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.IOutsourcePlanService;
+import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry;
+import com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.utils.StringUtils;
@@ -18,6 +21,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.ruoyi.common.core.text.Convert;
 
+import javax.swing.text.html.Option;
+
 /**
  * 委外计划Service业务层处理
  * 
@@ -41,6 +46,9 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService
 
     @Autowired
     private OutsourceRequisitionMapper requisitionMapper;
+
+    @Autowired
+    private WarehouseInventoryInquiryMapper inventoryInquiryMapper;
     /**
      * 查询委外计划
      * 
@@ -283,6 +291,7 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService
         List<OutsourcePlanDetail> details = outsourcePlanMapper.selectOutsourcePlanDetail(outsourcePlanDetail);
         if(StringUtils.isNotEmpty(details)){
             for (OutsourcePlanDetail plan: details) {
+                /** 获取已领料数*/
                 OutsourceRequisitionDetail requisitionDetail = new OutsourceRequisitionDetail();
                 requisitionDetail.setOutsourceOrderNo(outsoutceOrderNo);
                 requisitionDetail.setPlanDetailId(plan.getOutsourcePlanDetailId());
@@ -295,6 +304,14 @@ public class OutsourcePlanServiceImpl implements IOutsourcePlanService
                     int pikenNum = filtList.stream().mapToInt(item -> item.getTakingMaterial()).sum();
                     plan.setPickedNum(pikenNum);
                 }
+                /** 获取可用库存数*/
+                WarehouseInventoryInquiry inquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(plan.getMaterialNo());
+                if(inquiry == null){
+                    plan.setStockNum(0);
+                }else{
+                    int stockNum = Optional.ofNullable(inquiry.getAvailableStockNum()).orElse(0);
+                    plan.setStockNum(stockNum);
+                }
             }
         }
         return details;