From e61a5f3796653b292bba1576d93301c30e48ab29 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 8 Nov 2024 17:36:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 2 ++ .../purchase/PurOrderReceiveController.java | 3 +++ .../FilterOrderDetailDeptProductResultRequest.java | 2 ++ .../inout/impl/IoOrderDetailResultServiceImpl.java | 13 +++++++++++++ .../mybatis/mapper/auth/InvWarehouseDao.xml | 4 ++++ .../mybatis/mapper/inout/IoOrderDetailResultDao.xml | 7 ++++++- 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 46e807e2c..6b447eaf1 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/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; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 600748539..c6a0e11cf 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/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); } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptProductResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptProductResultRequest.java index 8bc4451be..c1548dd8d 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptProductResultRequest.java +++ b/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 fromInvCodes; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index af04e15b2..7edac8b3d 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/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 getOrderDeptProductResult(FilterOrderDetailDeptProductResultRequest orderDetailResultRequest) { if (null == orderDetailResultRequest) { return Collections.emptyList(); } + FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); + filterInvSubWarehouseRequest.setLyInvType(true); + List data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); + List 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()); } diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index 6df84e660..978d5a31a 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -294,6 +294,10 @@ a.sgInvType = 1 OR a.spUse = 1 ) + + AND ( + a.lyInvType = #{lyInvType} ) + AND a.id = #{id} diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index e27323654..ea1eaeac8 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -278,7 +278,6 @@ FROM LEFT JOIN basic_udirel bu on bu.id = a2.bindRlFk a1.status = 7 - and a1.fromInvCode = 1000000 AND a1.invCode = #{invCode} @@ -307,6 +306,12 @@ FROM AND date_format(a1.confirmTime, '%Y-%m-%d') between date_format(#{confirmStarTime}, '%Y-%m-%d') and date_format(#{confirmEndTime}, '%Y-%m-%d') + + AND a1.fromInvCode in + + #{item} + + AND a1.`action` in