[feat]

基础资料 员工退料
修改查询关联领料单物料信息service方法，添加实际出库数查询；
修改mapper，添加订单类型字段；

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.exception.BusinessException;
@@ -12,6 +13,8 @@ import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.BaseEmpRequisiteOrderChildMapper;
 import com.ruoyi.system.mapper.BaseEmpRequisiteOrderMapper;
 import com.ruoyi.system.mapper.OutsourceRequisitionMapper;
+import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
+import com.ruoyi.warehouse.mapper.WarehouseOutOrderDetailMapper;
 import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,6 +44,9 @@ public class BaseReturnOrderDetailServiceImpl implements IBaseReturnOrderDetailS
     @Autowired
     private BaseEmpRequisiteOrderChildMapper empRequisiteOrderChildMapper;
 
+    @Autowired
+    private WarehouseOutOrderDetailMapper warehouseOutOrderDetailMapper;
+
     /**
      * 查询员工退料详情
      * 
@@ -161,6 +167,17 @@ public class BaseReturnOrderDetailServiceImpl implements IBaseReturnOrderDetailS
             if(StringUtils.isNotEmpty(details)){
                 for (OutsourceRequisitionDetail detail: details) {
                     BaseReturnOrderDetail returnOrderDetail = createReturnOrderDetailByOutDetail(detail);
+                    /** 获取出库单已出库数*/
+                    WarehouseOutOrderDetail tempWarehouseDetail = new WarehouseOutOrderDetail();
+                    tempWarehouseDetail.setRelatedOrderCode(pickNo);
+                    tempWarehouseDetail.setMaterialNo(detail.getMaterialNo());
+                    WarehouseOutOrderDetail warehouseOutOrderDetail = warehouseOutOrderDetailMapper.selectOutOrderDetailListByThreeCode(tempWarehouseDetail);
+                    if(warehouseOutOrderDetail == null){
+                        returnOrderDetail.setHasPickNum(0);
+                    }else{
+                        int outNum = Optional.ofNullable(warehouseOutOrderDetail.getHasOutOrderSum()).orElse(0);
+                        returnOrderDetail.setHasPickNum(outNum);
+                    }
                     returnOrderDetails.add(returnOrderDetail);
                 }
             }
@@ -176,6 +193,17 @@ public class BaseReturnOrderDetailServiceImpl implements IBaseReturnOrderDetailS
             if(StringUtils.isNotEmpty(details)){
                 for (BaseEmpRequisiteOrderChild detail: details) {
                     BaseReturnOrderDetail returnOrderDetail = createReturnOrderDetailByEmpDetail(detail);
+                    /** 获取出库单已出库数*/
+                    WarehouseOutOrderDetail tempWarehouseDetail = new WarehouseOutOrderDetail();
+                    tempWarehouseDetail.setRelatedOrderCode(pickNo);
+                    tempWarehouseDetail.setMaterialNo(detail.getMaterialCode());
+                    WarehouseOutOrderDetail warehouseOutOrderDetail = warehouseOutOrderDetailMapper.selectOutOrderDetailListByThreeCode(tempWarehouseDetail);
+                    if(warehouseOutOrderDetail == null){
+                        returnOrderDetail.setHasPickNum(0);
+                    }else{
+                        int outNum = Optional.ofNullable(warehouseOutOrderDetail.getHasOutOrderSum()).orElse(0);
+                        returnOrderDetail.setHasPickNum(outNum);
+                    }
                     returnOrderDetails.add(returnOrderDetail);
                 }
             }

ruoyi-admin/src/main/resources/mapper/system/BaseReturnOrderMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="baseReturnOrderCode"    column="base_return_order_code"    />
         <result property="pickNo"    column="pick_no"    />
         <result property="returnStatus"    column="return_status"    />
+        <result property="returnOrderType"    column="return_order_type"    />
         <result property="materialSum"    column="material_sum"    />
         <result property="returnSum"    column="return_sum"    />
         <result property="qualifiedNum"    column="qualified_num"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                return_sum, qualified_num, unqualified_num, storage_num, pick_user,
                create_by, create_time, update_by, update_time, audit_status, use_status,
                instance_id, instance_type, submit_instance_id, cancel_instance_id,
-               restore_instance_id, apply_title, apply_user, apply_time
+               restore_instance_id, apply_title, apply_user, apply_time,return_order_type
         from base_return_order
     </sql>
 
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="baseReturnOrderCode != null  and baseReturnOrderCode != ''"> and base_return_order_code = #{baseReturnOrderCode}</if>
             <if test="pickNo != null  and pickNo != ''"> and pick_no = #{pickNo}</if>
             <if test="returnStatus != null  and returnStatus != ''"> and return_status = #{returnStatus}</if>
+            <if test="returnOrderType != null  and returnOrderType != ''"> and return_order_type = #{returnOrderType}</if>
             <if test="materialSum != null "> and material_sum = #{materialSum}</if>
             <if test="returnSum != null "> and return_sum = #{returnSum}</if>
             <if test="qualifiedNum != null "> and qualified_num = #{qualifiedNum}</if>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="baseReturnOrderCode != null and baseReturnOrderCode != ''">base_return_order_code,</if>
             <if test="pickNo != null">pick_no,</if>
             <if test="returnStatus != null">return_status,</if>
+            <if test="returnOrderType != null">return_order_type,</if>
             <if test="materialSum != null">material_sum,</if>
             <if test="returnSum != null">return_sum,</if>
             <if test="qualifiedNum != null">qualified_num,</if>
@@ -103,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="baseReturnOrderCode != null and baseReturnOrderCode != ''">#{baseReturnOrderCode},</if>
             <if test="pickNo != null">#{pickNo},</if>
             <if test="returnStatus != null">#{returnStatus},</if>
+            <if test="returnOrderType != null">#{returnOrderType},</if>
             <if test="materialSum != null">#{materialSum},</if>
             <if test="returnSum != null">#{returnSum},</if>
             <if test="qualifiedNum != null">#{qualifiedNum},</if>
@@ -132,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="baseReturnOrderCode != null and baseReturnOrderCode != ''">base_return_order_code = #{baseReturnOrderCode},</if>
             <if test="pickNo != null">pick_no = #{pickNo},</if>
             <if test="returnStatus != null">return_status = #{returnStatus},</if>
+            <if test="returnOrderType != null">return_order_type = #{returnOrderType},</if>
             <if test="materialSum != null">material_sum = #{materialSum},</if>
             <if test="returnSum != null">return_sum = #{returnSum},</if>
             <if test="qualifiedNum != null">qualified_num = #{qualifiedNum},</if>