From 3086a72dd9e2f74a3c26a373ffaa286a5e4de5c8 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 29 Jun 2022 15:46:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=92=8C=E5=BD=93=E5=89=8D=E5=88=86=E5=BA=93?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/StockOrderController.java | 22 +++++-------------- .../admin/res/inout/StockOrderResponse.java | 6 +++++ .../admin/service/inout/OrderService.java | 7 ++++++ .../service/inout/impl/OrderServiceImpl.java | 18 +++++++++++++++ 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index 3f00063..fc1dccf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -1,7 +1,6 @@ package com.glxp.sale.admin.controller.inout; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; @@ -10,11 +9,9 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.*; -import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.inout.*; -import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.req.inventory.PostStockPrintRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; @@ -268,21 +265,9 @@ public class StockOrderController { Integer userId = customerService.getUserId(); stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUserId(customerService.getUserId()); -// if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { -// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); -// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); -// filterInvUserRequest.setCode(invWarehouseEntity.getCode()); -// filterInvUserRequest.setUserid(userId.longValue()); -// filterInvUserRequest.setIsDirector(true); -// List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); -// if (CollUtil.isEmpty(warehouseUserEntities)) { -// stockOrderFilterRequest.setUnionUser(userId); -// } -// } else { -// return ResultVOUtils.error(500, "请先选择当前仓库"); -// } - } else + } else { stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); + } stockOrderFilterRequest.setCorpId(null); } @@ -292,6 +277,8 @@ public class StockOrderController { //判断订单是否可以补单 List resultList = orderService.checkSupplementOrder(stockOrderEntityList); + //查询仓库名称 + orderService.queryInvName(resultList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(resultList); @@ -388,6 +375,7 @@ public class StockOrderController { originOrder.setFromCorp(addStockOrderChangeRequest.getFromCorp()); originOrder.setFromSubInvCode(addStockOrderChangeRequest.getFromSubInvCode()); originOrder.setInvWarehouseCode(addStockOrderChangeRequest.getInvWarehouseCode()); + originOrder.setInvStorageCode(addStockOrderChangeRequest.getLocStorageCode()); originOrder.setFromCorpId(addStockOrderChangeRequest.getFromCorpId()); originOrder.setCorpOrderId(CustomUtil.getId() + "x"); originOrder.setMainAction(addStockOrderChangeRequest.getMainAction()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderResponse.java index d9cd794..8fb5734 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderResponse.java @@ -8,4 +8,10 @@ public class StockOrderResponse extends StockOrderEntity { private boolean enableSupplementOrder; + //当前仓库名称 + private String locStorageName; + + //当前分库名称 + private String invWarehouseName; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java index 30ca70f..761eabc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java @@ -113,4 +113,11 @@ public interface OrderService { * @return */ boolean updateReplicateNo(String orderId, String replicateNo); + + /** + * 查询仓库名称 + * + * @param responseList + */ + void queryInvName(List responseList); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index aa2f128..1fa1c97 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -11,6 +11,7 @@ import com.glxp.sale.admin.dao.basic.BussinessTypeDao; import com.glxp.sale.admin.dao.inout.*; import com.glxp.sale.admin.dao.inventory.InvProductDao; import com.glxp.sale.admin.dao.inventory.InvProductDetailDao; +import com.glxp.sale.admin.dao.inventory.InvSubWarehouseDao; import com.glxp.sale.admin.dao.inventory.InvWarehouseDao; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; @@ -75,6 +76,8 @@ public class OrderServiceImpl implements OrderService { private StockOrderDetailDao stockOrderDetailDao; @Resource private OrderDetailDao orderDetailDao; + @Resource + private InvSubWarehouseDao invSubWarehouseDao; @Override public List listOrders(OrderQueryRequest orderQueryRequest) { @@ -420,6 +423,21 @@ public class OrderServiceImpl implements OrderService { return orderDao.updateReplicateNo(orderId, replicateNo); } + @Override + public void queryInvName(List responseList) { + if (CollUtil.isNotEmpty(responseList)) { + responseList.forEach(stockOrderResponse -> { + //查询仓库名称 + String locStorageName = invWarehouseDao.getNameByCode(stockOrderResponse.getLocStorageCode()); + //查询分库名称 + String invWarehouseName = invSubWarehouseDao.selectNameByCode(stockOrderResponse.getInvWarehouseCode()); + + stockOrderResponse.setLocStorageName(locStorageName); + stockOrderResponse.setInvWarehouseName(invWarehouseName); + }); + } + } + @Transactional(rollbackFor = Exception.class) @Override public void deleteOrders(List ids) {