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

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/PutInStorageController.java

@@ -29,9 +29,9 @@ public class PutInStorageController extends BaseController {
      * @param pageQuery 分页信息
      * @return 结果
      */
-    @GetMapping("/PageList")
+    @GetMapping("/order/PageList")
     public TableDataInfo<StorageVo> selectStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
-        return putInStorageService.selectPutInStoragePageList(storageBo, pageQuery);
+        return putInStorageService.selectStoragePageList(storageBo, pageQuery);
     }
 
     /**
@@ -59,13 +59,29 @@ public class PutInStorageController extends BaseController {
      * @param putInStorageBo 传入Bo类
      * @return 结果
      */
-    @PutMapping
+    @PutMapping("/updateStorage")
     public R<Void> update(@RequestBody PutInStorageBo putInStorageBo) {
         return toAjax(putInStorageService.updateStorage(putInStorageBo));
     }
 
-    @GetMapping("/List")
-    public List<StorageVo> selectStorageList(StorageBo storageBo) {
-        return putInStorageService.selectStorageList(storageBo);
+    /**
+     * 查询入库审核信息分页列表
+     * @param storageBo 入库订单表
+     * @param pageQuery 分页信息
+     * @return 结果
+     */
+    @GetMapping("/process/PageList")
+    public TableDataInfo<StorageVo> selectProcessPageList(StorageBo storageBo, PageQuery pageQuery) {
+        return putInStorageService.selectStorageProcessPageList(storageBo, pageQuery);
+    }
+
+    /**
+     * 修改入库审核信息
+     * @param storageBo 入库订单表
+     * @return 结果
+     */
+    @PutMapping("/updateStorageProcess")
+    public R<Void> updateStorageProcess(@RequestBody StorageBo storageBo) {
+        return toAjax(putInStorageService.updateStorageProcess(storageBo));
     }
 }

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/Storage.java

@@ -39,9 +39,9 @@ public class Storage extends TenantEntity {
     private int partitionId;
 
     /**
-     * 入库单状态
+     * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
      */
-    private String status;
+    private String status = "0";
 
     /**
      * 备注

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/StorageProduct.java

@@ -30,7 +30,7 @@ public class StorageProduct extends TenantEntity {
     private int productId;
 
     /**
-     * 仓库Id
+     * 入库类型
      */
     private int warehouseId;
 

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/PutInStorageBo.java

@@ -11,7 +11,7 @@ import java.util.List;
 public class PutInStorageBo extends BaseEntity {
 
     /**
-     * Id
+     * 主键Id
      */
     private int id;
 

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/StorageBo.java

@@ -32,15 +32,20 @@ public class StorageBo extends BaseEntity {
     private double totalNums;
 
     /**
-     * 入库单状态
+     * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
      */
-    private String status;
+    private String status = "0";
 
     /**
      * 库区
      */
     private int partitionId;
 
+    /**
+     * 入库类型
+     */
+    private int warehouseId;
+
     /**
      * 入库单更新时间
      */

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/StorageListBo.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class StorageListBo {
     /**
-     * Id
+     * 主键Id
      */
     private int id;
 

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/PutInStorageTypeVo.java

@@ -11,7 +11,7 @@ import org.dromara.InventoryManagement.domain.PutInStorageType;
 @AutoMapper(target = PutInStorageType.class)
 public class PutInStorageTypeVo {
     /**
-     * ID
+     * 主键ID
      */
     private int ID;
     /**

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/StorageProductVo.java

@@ -23,7 +23,7 @@ public class StorageProductVo extends BaseEntity {
     private int productId;
 
     /**
-     * 仓库编号
+     * 入库类型
      */
     private int warehouseId;
 

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/StorageVo.java

@@ -32,15 +32,20 @@ public class StorageVo extends BaseEntity {
     private double totalNums;
 
     /**
-     * 入库单状态
+     * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
      */
-    private String status;
+    private String status = "0";
 
     /**
      * 库区
      */
     private int partitionId;
 
+    /**
+     * 入库类型
+     */
+    private int warehouseId;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/PutInStorageMapper.java

@@ -11,5 +11,4 @@ import java.util.List;
 @Mapper
 public interface PutInStorageMapper extends BaseMapperPlus<Storage, StorageVo> {
 
-    List<StorageVo> selectStorageList();
 }

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/PutInStorageService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface PutInStorageService {
 
-    TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery);
+    TableDataInfo<StorageVo> selectStoragePageList(StorageBo storageBo, PageQuery pageQuery);
 
     int insertStorage(PutInStorageBo putInStorageBo);
 
@@ -18,5 +18,7 @@ public interface PutInStorageService {
 
     int updateStorage(PutInStorageBo putInStorageBo);
 
-    List<StorageVo> selectStorageList(StorageBo storageBo);
+    TableDataInfo<StorageVo> selectStorageProcessPageList(StorageBo storageBo, PageQuery pageQuery);
+
+    int updateStorageProcess(StorageBo storageBo);
 }

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/PutInStorageServiceImpl.java

@@ -2,6 +2,7 @@ package org.dromara.InventoryManagement.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.InventoryManagement.domain.Storage;
 import org.dromara.InventoryManagement.domain.StorageProduct;
@@ -38,7 +39,7 @@ public class PutInStorageServiceImpl implements PutInStorageService {
      * @return  结果
      */
     @Override
-    public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
+    public TableDataInfo<StorageVo> selectStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
         QueryWrapper<Storage> qw = new QueryWrapper<>();
         qw.like(StringUtils.isNotBlank(storageBo.getCode()), "code", storageBo.getCode());
         qw.eq(StringUtils.isNotBlank(storageBo.getStatus()), "status", storageBo.getStatus());
@@ -107,8 +108,31 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         return putInStorageMapper.updateById(newStorageMapstruct.toStorage(putInStorageBo, putInStorageBo.getInCode()));
     }
 
+    /**
+     * 查询入库审核信息分页列表
+     * @param storageBo 入库订单表
+     * @param pageQuery 分页信息
+     * @return 结果
+     */
     @Override
-    public List<StorageVo> selectStorageList(StorageBo storageBo) {
-        return putInStorageMapper.selectStorageList();
+    public TableDataInfo<StorageVo> selectStorageProcessPageList(StorageBo storageBo, PageQuery pageQuery) {
+        QueryWrapper<Storage> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(storageBo.getCode()), "code", storageBo.getCode());
+        qw.eq(StringUtils.isNotBlank(storageBo.getStatus()), "status", storageBo.getStatus());
+        qw.eq(storageBo.getWarehouseId() != 0, "warehouse_id", storageBo.getStatus());
+        Page<StorageVo> page = putInStorageMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
     }
+
+    /**
+     * 修改入库审核信息
+     * @param storageBo 入库订单表
+     * @return 结果
+     */
+    @Override
+    public int updateStorageProcess(StorageBo storageBo) {
+        Storage storage = MapstructUtils.convert(storageBo, Storage.class);
+        return putInStorageMapper.updateById(storage);
+    }
+
 }

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutInStorageMapper.xml

@@ -4,11 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageMapper">
 
-
-    <select id="selectStorageList" resultType="org.dromara.InventoryManagement.domain.vo.StorageVo">
-
-
-    </select>
-
-
 </mapper>