Merge branch 'develop' into release

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")
-    public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
-        return putInStorageService.selectPutInStoragePageList(storageBo, pageQuery);
+    @GetMapping("/order/PageList")
+    public TableDataInfo<StorageVo> selectStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
+        return putInStorageService.selectStoragePageList(storageBo, pageQuery);
     }
 
     /**
@@ -54,8 +54,18 @@ public class PutInStorageController extends BaseController {
         return toAjax(putInStorageService.deleteById(ids));
     }
 
+    /**
+     * 修改入库订单
+     * @param putInStorageBo 传入Bo类
+     * @return 结果
+     */
     @PutMapping
     public R<Void> update(@RequestBody PutInStorageBo putInStorageBo) {
         return toAjax(putInStorageService.updateStorage(putInStorageBo));
     }
+
+    @GetMapping("/process/PageList")
+    public TableDataInfo<StorageVo> selectProcessPageList(StorageBo storageBo, PageQuery pageQuery) {
+        return putInStorageService.selectStorageProcessPageList(storageBo, pageQuery);
+    }
 }

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

@@ -2,6 +2,7 @@ package org.dromara.InventoryManagement.domain;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -26,15 +27,21 @@ public class Storage extends TenantEntity {
      */
     private String code;
 
+    /**
+     * 入库数总量
+     */
+    @TableField(value = "totalNums")
+    private double totalNums;
+
     /**
      * 库区
      */
     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

@@ -1,6 +1,7 @@
 package org.dromara.InventoryManagement.domain.bo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,15 +26,26 @@ public class StorageBo extends BaseEntity {
     private String code;
 
     /**
-     * 入库单状态
+     * 入库数总量
      */
-    private String status;
+    @TableField(value = "totalNums")
+    private double totalNums;
+
+    /**
+     * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
+     */
+    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

@@ -1,6 +1,7 @@
 package org.dromara.InventoryManagement.domain.vo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,15 +26,26 @@ public class StorageVo extends BaseEntity {
     private String code;
 
     /**
-     * 入库单状态
+     * 入库数总量
      */
-    private String status;
+    @TableField(value = "totalNums")
+    private double totalNums;
+
+    /**
+     * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
+     */
+    private String status = "0";
 
     /**
      * 库区
      */
     private int partitionId;
 
+    /**
+     * 入库类型
+     */
+    private int warehouseId;
+
     /**
      * 备注
      */

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

@@ -5,6 +5,8 @@ import org.dromara.InventoryManagement.domain.Storage;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 
 @Mapper
 public interface PutInStorageMapper extends BaseMapperPlus<Storage, StorageVo> {

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

@@ -10,11 +10,13 @@ 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);
 
     int deleteById(List<Integer> ids);
 
     int updateStorage(PutInStorageBo putInStorageBo);
+
+    TableDataInfo<StorageVo> selectStorageProcessPageList(StorageBo storageBo, PageQuery pageQuery);
 }

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

@@ -30,7 +30,7 @@ public class InventoryFlowServiceImpl implements InventoryFlowService {
     @Override
     public TableDataInfo<InventoryFlowVo> selectPageInventoryFlowList(InventoryFlowBo inventoryFlowBo, PageQuery pageQuery) {
         QueryWrapper<InventoryFlow> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(inventoryFlowBo.getName()),"name",inventoryFlowBo.getName());
+        qw.like(StringUtils.isNotBlank(inventoryFlowBo.getName()),"name",inventoryFlowBo.getName());
         Page<InventoryFlowVo> page= inventoryFlowMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }

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

@@ -31,7 +31,7 @@ public class InventoryMonitoringServiceImpl implements InventoryMonitoringServic
     @Override
     public TableDataInfo<InventoryMonitoringVo> selectPageInventoryMonitoringList(InventoryMonitoringBo inventoryMonitoringBo, PageQuery pageQuery) {
         QueryWrapper<InventoryMonitoring> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(inventoryMonitoringBo.getName()),"name", inventoryMonitoringBo.getName());
+        qw.like(StringUtils.isNotBlank(inventoryMonitoringBo.getName()),"name", inventoryMonitoringBo.getName());
         Page<InventoryMonitoringVo> page=inventoryMonitoringMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }

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());
@@ -56,18 +57,24 @@ public class PutInStorageServiceImpl implements PutInStorageService {
     @Transactional(rollbackFor = Exception.class)
     public int insertStorage(PutInStorageBo putInStorageBo) {
         try {
+            double totalNumber = 0;
             // 生成订单编号
             OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
             // 入库订单表注入
             Storage storage = newStorageMapstruct.toStorage(putInStorageBo, generator.generateOrderNumber("YKS"));
-            // 入库
-            putInStorageMapper.insert(storage);
+
             // 详情表注入
             for (StorageListBo storageListBo : putInStorageBo.getStorageList()){
+                // 获取总数量
+                totalNumber += storageListBo.getNums();
                 // 关联表注入
                 StorageProduct storageProduct = newStorageMapstruct.toStorageProduct(putInStorageBo,storageListBo,storage.getId());
                 putInStorageProductMapper.insert(storageProduct);
             }
+            // 总数量注入
+            storage.setTotalNums(totalNumber);
+            // 入库
+            putInStorageMapper.insert(storage);
             return 1;
         } catch (Exception e) {
             throw new RuntimeException("插入入库订单失败", e);
@@ -100,4 +107,15 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         }
         return putInStorageMapper.updateById(newStorageMapstruct.toStorage(putInStorageBo, putInStorageBo.getInCode()));
     }
+
+    @Override
+    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);
+    }
+
 }

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

@@ -4,5 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageMapper">
 
-
 </mapper>