仓库业务逻辑补全2.0 : 1、出库修改删除数据时库存相应改变;2、出库的列表查询 新增更多查询参数 ;3、修复一些BUG

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java

@@ -26,8 +26,8 @@ public class SysOaOutWarehouseBo extends BaseEntity {
     /**
      * 主键id
      */
+    @NotNull(message = "出库数量不能为空", groups = { EditGroup.class })
     @TableId(value = "id",type = IdType.AUTO)
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -52,5 +52,13 @@ public class SysOaOutWarehouseBo extends BaseEntity {
     @NotNull(message = "出库对象id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long warehouseId;
 
+    /**
+     * 项目名
+     */
+    private String projectName;
 
+    /**
+     * 物料名
+     */
+    private String warehouseName;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo2.java

@@ -0,0 +1,47 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 仓库出库业务对象 sys_oa_out_warehouse
+ *
+ * @author liuzongkun999
+ * @date 2024-11-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaOutWarehouseBo2 extends BaseEntity {
+
+    /**
+     * 物料id
+     */
+    @NotNull(message = "出库对象id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long warehouseId;
+
+    /**
+     * 出库数量
+     */
+    @NotNull(message = "出库数量不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long amount;
+
+    /**
+     * 出库备注
+     */
+    private String remark;
+
+    /**
+     * 对应项目id
+     */
+    private Long projectId;
+
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java

@@ -0,0 +1,30 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+/**
+ * 仓库批量出库业务对象 sys_oa_out_warehouse
+ *
+ * @author liuzongkun999
+ * @date 2024-11-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaOutWarehouseBoList extends BaseEntity {
+    /**
+     * 该项目对应的出库数据
+     */
+    private List<SysOaOutWarehouseBo2> outWareHouseList;
+
+    /**
+     * 项目id
+     */
+    @NotNull(message = "项目id不能为空", groups = AddGroup.class)
+    private Long projectId;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java

@@ -0,0 +1,56 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+
+
+/**
+ * 仓库出库查询对象 sys_oa_out_warehouse
+ *
+ * @author liuzongkun999
+ * @date 2024-11-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaOutWarehouseListVo {
+
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 出库后对应的项目id
+     */
+    private Long projectId;
+
+    /**
+     * 出库数量
+     */
+    private Long amount;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 出库备注
+     */
+    private String remark;
+
+    /**
+     * 出库对象id
+     */
+    private Long warehouseId;
+
+    /**
+     * 出库物料名称
+     */
+    private String warehouseName;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseVo.java

@@ -2,10 +2,7 @@ package com.ruoyi.oa.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
-import java.util.Date;