fix:更新入库审核模块审核功能代码

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

@@ -82,6 +82,10 @@ public class PutInStorageController extends BaseController {
      */
     @PutMapping("/updateStorageProcess")
     public R<Void> updateStorageProcess(@RequestBody StorageBo storageBo) {
-        return toAjax(putInStorageService.updateStorageProcess(storageBo));
+        if(storageBo.getReason() == null && storageBo.getStatus().equals("2")){
+            return R.fail("原因不能为空");
+        } else {
+            return toAjax(putInStorageService.updateStorageProcess(storageBo));
+        }
     }
 }

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

@@ -5,6 +5,7 @@ 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 jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
@@ -27,6 +28,46 @@ public class Storage extends TenantEntity {
      */
     private String code;
 
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 采购单Id
+     */
+    private int purchaseId;
+
+    /**
+     * 供应商Id
+     */
+    private int supplierId;
+
+    /**
+     * 联系人
+     */
+    private String contact;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 制单人
+     */
+    private int adminId;
+
+    /**
+     * 制单时间
+     */
+    private Date billingTime;
+
+    /**
+     * 交货时间
+     */
+    private Date deliveryTime;
+
     /**
      * 入库数总量
      */
@@ -34,10 +75,45 @@ public class Storage extends TenantEntity {
     private double totalNums;
 
     /**
-     * 库区
+     * 入库类型
+     */
+    private String inboundType;
+
+    /**
+     * 总金额
+     */
+    private double money;
+
+    /**
+     * 库区Id
      */
     private int partitionId;
 
+    /**
+     * 仓库类型Id
+     */
+    private int warehouseId;
+
+    /**
+     * 交货方式
+     */
+    private String theWay;
+
+    /**
+     * 所属区域
+     */
+    private String city;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 入库人Id
+     */
+    private int stromanId;
+
     /**
      * 入库单状态 0=未审核，1=待入库，2=审核未通过，3=已审核
      */
@@ -48,8 +124,34 @@ public class Storage extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 未通过审核原因
+     */
+    @NotNull(message = "原因不能为空")
+    private String reason;
+
+    /**
+     * 审核人Id
+     */
+    private int reviewerId;
+
+    /**
+     * 企业编号
+     */
+    private String firmid;
+
+    /**
+     * 创建时间
+     */
+    private Date createtime;
+
     /**
      * 入库单更新时间
      */
     private Date updatetime;
+
+    /**
+     * 删除时间
+     */
+    private Date deletetime;
 }

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

@@ -3,6 +3,7 @@ package org.dromara.InventoryManagement.domain.bo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -56,4 +57,10 @@ public class StorageBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 未通过审核原因
+     */
+    @NotNull(message = "原因不能为空")
+    private String reason;
+
 }

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

@@ -119,7 +119,7 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         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());
+        qw.eq(storageBo.getWarehouseId() != 0, "warehouse_id", storageBo.getWarehouseId());
         Page<StorageVo> page = putInStorageMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }