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<>();