修复仓库相关接口

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/store/StoreListVO.java

@@ -71,6 +71,16 @@ public class StoreListVO implements Serializable {
     @Schema(description = "未发货机具数量")
     private Integer unfilledTotal;
 
+    /**
+     * 库存数量
+     */
+    private Integer stockNum;
+
+    /**
+     * 预发机数量
+     */
+    private Integer prePosNum;
+
 	
 
 }

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeOrder/StoreOrderDetailVO.java

@@ -96,14 +96,19 @@ public class StoreOrderDetailVO implements Serializable {
      * 用户姓名
      */
     @Schema(description = "用户姓名")
-    private Object username;
+    private String username;
 
 
     /**
      * 用户编号
      */
     @Schema(description = "用户编号")
-    private Object userCode;
+    private String userCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
 
 
     /**

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/StoreController.java

@@ -50,13 +50,16 @@ public class StoreController {
 
 
     /**
+     * 列表
      * 用户所属仓库
      *
+     * @param reqType 要求类型
      * @return 用户所属仓库
      */
     @GetMapping("/list")
-    public R list() {
-        return R.ok(kxsWarehouseService.userStoreList());
+    public R list(@RequestParam("reqType") Integer reqType) {
+
+        return R.ok(kxsWarehouseService.userStoreList(reqType));
     }
 
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/KxsWarehouseService.java

@@ -33,7 +33,7 @@ public interface KxsWarehouseService extends IService<KxsWarehouse> {
      *
      * @return {@link StoreListVO}
      */
-    List<StoreListVO> userStoreList();
+    List<StoreListVO> userStoreList(Integer reqType);
 
     /**
      * 仓库数据

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsWarehouseServiceImpl.java

@@ -1,6 +1,5 @@
 package com.kxs.store.biz.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,23 +11,20 @@ import com.kxs.common.core.exception.GlobalCustomerException;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.RetOps;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.product.api.feign.RemoteKxsProductService;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
 import com.kxs.store.api.model.*;
-import com.kxs.store.api.vo.kxsapp.store.StoreBrandListVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreDataVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreListVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreSearchListVO;
-import com.kxs.store.biz.constant.enums.MachineOrderEnum;
 import com.kxs.store.biz.constant.enums.MachineOrderStatusEnum;
 import com.kxs.store.biz.mapper.*;
 import com.kxs.store.biz.service.KxsWarehouseService;
 import com.kxs.user.api.feign.RemoteKxsUserService;
 import com.kxs.user.api.model.KxsUser;
 import lombok.RequiredArgsConstructor;
-import org.checkerframework.checker.units.qual.K;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -51,6 +47,7 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
     private final KxsWarehouseMapper kxsWarehouseMapper;
 
     private final RemoteKxsUserService remoteKxsUserService;
+    private final RemoteKxsProductService remoteKxsProductService;
 
     @Override
     public IPage<StoreSearchListVO> searchList(Page<StoreSearchListVO> page, StoreSearchListDTO param) {
@@ -68,15 +65,26 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
     }
 
     @Override
-    public List<StoreListVO> userStoreList() {
+    public List<StoreListVO> userStoreList(Integer reqType) {
         Long userId = SecurityUtils.getUser().getId();
         List<StoreListVO> storeListVOS = baseMapper.userStoreList(userId);
         for (StoreListVO storeListVO : storeListVOS) {
-            //待发货
-            Long unSendCount = kxsMachineApplyMapper.selectCount(Wrappers.<KxsMachineApply>lambdaQuery()
-                    .eq(KxsMachineApply::getStatus, MachineOrderStatusEnum.UNDER_REVIEW.getType())
-                    .eq(KxsMachineApply::getWarehouseId, storeListVO.getId()));
-            storeListVO.setUnfilledTotal(unSendCount.intValue());
+            if(reqType == 0){
+                //待发货
+                Long unSendCount = kxsMachineApplyMapper.selectCount(Wrappers.<KxsMachineApply>lambdaQuery()
+                        .eq(KxsMachineApply::getStatus, MachineOrderStatusEnum.UNDER_REVIEW.getType())
+                        .eq(KxsMachineApply::getWarehouseId, storeListVO.getId()));
+                storeListVO.setUnfilledTotal(unSendCount.intValue());
+            }
+            if(reqType == 1){
+                //查询仓库库存
+                KxsWarehouseStock warehouseStock = kxsWarehouseStockMapper.selectOne(Wrappers.<KxsWarehouseStock>lambdaQuery()
+                        .eq(KxsWarehouseStock::getWarehouseId, storeListVO.getId()));
+                storeListVO.setStockNum(warehouseStock.getStockNum());
+                //查询预发机数量
+                Long preMachineCount = kxsMachineAdvanceMapper.selectWarehouseUserCount(storeListVO.getId());
+                storeListVO.setPrePosNum(preMachineCount.intValue());
+            }
         }
         return storeListVOS;
     }

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsMachineApplyMapper.xml

@@ -49,6 +49,7 @@
                 '%'))
             </if>
         </where>
+        order by a.create_time desc
     </select>
     <select id="orderMonthTotal" resultType="com.kxs.store.api.vo.kxsapp.storeOrder.OrderMonthTotalVO">
         select * from

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsWarehouseMapper.xml

@@ -60,6 +60,7 @@
         from kxs_warehouse
         where user_id = #{userId}
           and del_flag = 0
+          and  warehouse_type < 2
     </select>