Merge remote-tracking branch 'origin/fencang' into fencang

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<WarehouseUserEntity> 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<StockOrderResponse> resultList = orderService.checkSupplementOrder(stockOrderEntityList);
+        //查询仓库名称
+        orderService.queryInvName(resultList);
         PageSimpleResponse<StockOrderResponse> 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());

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;
+
 }

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<StockOrderResponse> responseList);
 }

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<OrderEntity> listOrders(OrderQueryRequest orderQueryRequest) {
@@ -420,6 +423,21 @@ public class OrderServiceImpl implements OrderService {
         return orderDao.updateReplicateNo(orderId, replicateNo);
     }
 
+    @Override
+    public void queryInvName(List<StockOrderResponse> 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<String> ids) {