From e51467657854f329c819fdf538d3af505f2dcd1a Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 31 Mar 2023 17:15:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9=E8=BD=AC?= =?UTF-8?q?=E5=8D=95=E9=94=81=E5=BA=93=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=8D=95=E6=8D=AE=E6=9C=AA=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E9=94=81=E5=BA=93=E5=AD=98=EF=BC=8C?= =?UTF-8?q?=E5=BE=85=E5=90=8E=E7=BB=AD=E5=BA=93=E5=AD=98=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=8E=E5=86=8D=E6=94=BE=E5=BC=80=E6=AD=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inv/impl/InvCountOrderServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java index be1b96009..1c912758f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java @@ -39,7 +39,6 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.InvCountCodesService; import com.glxp.api.service.inv.InvCountOrderService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; @@ -380,15 +379,17 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { FilterInvProductDetailRequest invProductDetailRequest = new FilterInvProductDetailRequest(); invProductDetailRequest.setDeptCode(invCountOrder.getDeptCode()); invProductDetailRequest.setInvCode(invCountOrder.getInvCode()); - //锁库存，查询库存更新时间早于或等于盘点单创建时间的数据 - invProductDetailRequest.setUpdateTime(DateUtil.toDateStr(invCountOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - //判断是否是按货位盘点的单据，如果是，则查询库存详情的参数需要添加货位 - invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvSpaceCode()); + //锁库存，查询库存更新时间早于或等于盘点单创建时间的数据 TODO 暂时注释掉锁库存的逻辑，盘点单转业务单暂不锁库存 + //invProductDetailRequest.setUpdateTime(DateUtil.toDateStr(invCountOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + //判断盘点单据的货位字段是否为空，不为空则添加货位查询参数 + if (StrUtil.isNotBlank(invCountOrder.getInvSpaceCode())) { + invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvSpaceCode()); + } //查询盘点单据详情 FilterInvCountOrderDetailRequest countOrderDetailRequest = new FilterInvCountOrderDetailRequest(); countOrderDetailRequest.setOrderIdFk(invCountOrder.getOrderId()); - countOrderDetailRequest.setStatus(type.equals("in") ? 1 : 0); + countOrderDetailRequest.setStatus(type.equals("in") ? 1 : 0); //查询盈利/亏损的盘点单据详情 List detailList = invCountOrderDetailDao.filterList(countOrderDetailRequest); List codeList = new ArrayList<>();