fix:修复

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -22,9 +22,11 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.system.*;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
+import com.glxp.api.req.auth.FilterInvSubWarehouseRequest;
 import com.glxp.api.req.dev.DeviceInfoDetailQuery;
 import com.glxp.api.req.inout.*;
 import com.glxp.api.req.inv.FilterInvProductRequest;
+import com.glxp.api.res.auth.InvSubWarehouseResponse;
 import com.glxp.api.res.inout.*;
 import com.glxp.api.res.inv.InvProductResponse;
 import com.glxp.api.service.auth.CustomerService;

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -323,6 +323,7 @@ public class PurOrderReceiveController extends BaseController {
             // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
             request.setDiCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
+            request.setBatchNo(updateReceiveDetailRequest.getBatchNo());
             list = selectFilterInvPreProductRequest(request);
 
         } else if (invWarehouseEntity.getAdvanceType() == 2) {
@@ -331,6 +332,7 @@ public class PurOrderReceiveController extends BaseController {
             // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
             request.setDiCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
+            request.setBatchNo(updateReceiveDetailRequest.getBatchNo());
             listinvprein = selectfilterListStock(request);
 
         } else {
@@ -338,6 +340,7 @@ public class PurOrderReceiveController extends BaseController {
             // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
             request.setDiCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
+            request.setBatchNo(updateReceiveDetailRequest.getBatchNo());
             listInv = selectFilterInvProductRequest(request);
 
         }

src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptProductResultRequest.java

@@ -39,4 +39,6 @@ public class FilterOrderDetailDeptProductResultRequest extends ListPageRequest {
     private Boolean groupBuy;          //是否集采产品
 
     private Integer hcType;
+
+    private List<String> fromInvCodes;
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java

@@ -3,13 +3,16 @@ package com.glxp.api.service.inout.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.auth.InvWarehouseDao;
 import com.glxp.api.dao.inout.IoOrderDetailResultDao;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.auth.FilterInvSubWarehouseRequest;
 import com.glxp.api.req.inout.CptTraceRequest;
 import com.glxp.api.req.inout.FilterOrderDetailDeptProductResultRequest;
 import com.glxp.api.req.inout.FilterOrderDetailDeptResultRequest;
 import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.auth.InvSubWarehouseResponse;
 import com.glxp.api.res.inout.*;
 import com.glxp.api.service.inout.IoOrderDetailResultService;
 import org.springframework.stereotype.Service;
@@ -18,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -116,11 +120,20 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
         return orderDetailResultDao.filterOrderDeptSupList(orderDetailResultRequest);
     }
 
+    @Resource
+    InvWarehouseDao invWarehouseDao;
+
     @Override
     public List<IoOrderDetailDeptProductResultResponse> getOrderDeptProductResult(FilterOrderDetailDeptProductResultRequest orderDetailResultRequest) {
         if (null == orderDetailResultRequest) {
             return Collections.emptyList();
         }
+        FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+        filterInvSubWarehouseRequest.setLyInvType(true);
+        List<InvSubWarehouseResponse> data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
+        List<String> collect = data.stream().map(InvSubWarehouseResponse::getCode).collect(Collectors.toList());
+        orderDetailResultRequest.setFromInvCodes(collect);
+
         if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) {
             PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit());
         }

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -294,6 +294,10 @@
                 a.sgInvType = 1 OR
                 a.spUse = 1 )
             </if>
+           <if test="lyInvType != null ">
+                AND (
+                a.lyInvType = #{lyInvType} )
+            </if>
             <if test="id != '' and id != null">
                 AND a.id =
                     #{id}

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -278,7 +278,6 @@ FROM
         LEFT JOIN basic_udirel bu on bu.id = a2.bindRlFk
         <where>
             a1.status = 7
-            and a1.fromInvCode = 1000000
             <if test="invCode != null and invCode != ''">
                 AND a1.invCode = #{invCode}
             </if>
@@ -307,6 +306,12 @@ FROM
             <if test="confirmStarTime != null and confirmStarTime != '' and confirmEndTime != null and confirmEndTime != ''">
                 AND date_format(a1.confirmTime, '%Y-%m-%d') between date_format(#{confirmStarTime}, '%Y-%m-%d') and date_format(#{confirmEndTime}, '%Y-%m-%d')
             </if>
+            <if test="fromInvCodes != null and fromInvCodes.size() != 0">
+                AND a1.fromInvCode in
+                <foreach collection="fromInvCodes" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="actions != null and actions.size() != 0">
                 AND a1.`action` in
                 <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">