退库管理

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseLog.java

@@ -0,0 +1,52 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 日志对象 sys_oa_warehouse_log
+ *
+ * @author ruoyi
+ * @date 2025-06-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_warehouse_log")
+public class SysOaWarehouseLog extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "log_id")
+    private Long logId;
+    /**
+     * 单据id
+     */
+    private Long masterId;
+    /**
+     * 物料id
+     */
+    private Long warehouseId;
+    /**
+     * 操作数量
+     */
+    private Long num;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java

@@ -59,5 +59,6 @@ public class SysOaWarehouseMaster extends BaseEntity {
 
 
     private Long status;
+    private Integer returnType;
 
 }

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

@@ -0,0 +1,10 @@
+package com.ruoyi.oa.domain.bo;
+
+import lombok.Data;
+
+@Data  // 退库明细DTO
+public class ReturnDetailBo {
+    private Long detailId;    // 出库明细id
+    private Integer returnNum; // 退回数量
+    // getter/setter
+}

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

@@ -0,0 +1,50 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 日志业务对象 sys_oa_warehouse_log
+ *
+ * @author ruoyi
+ * @date 2025-06-28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaWarehouseLogBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long logId;
+
+    /**
+     * 单据id
+     */
+    private Long masterId;
+
+    /**
+     * 物料id
+     */
+    private Long warehouseId;
+
+    /**
+     * 操作数量
+     */
+    private Long num;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -72,4 +72,6 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
 
     private Long status;
 
+    private  Integer returnType;
+
 }

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

@@ -0,0 +1,55 @@
+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;
+
+
+
+/**
+ * 日志视图对象 sys_oa_warehouse_log
+ *
+ * @author ruoyi
+ * @date 2025-06-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaWarehouseLogVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long logId;
+
+    /**
+     * 单据id
+     */
+    @ExcelProperty(value = "单据id")
+    private Long masterId;
+
+    /**
+     * 物料id
+     */
+    @ExcelProperty(value = "物料id")
+    private Long warehouseId;
+
+    /**
+     * 操作数量
+     */
+    @ExcelProperty(value = "操作数量")
+    private Long num;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

@@ -80,5 +80,6 @@ public class SysOaWarehouseMasterVo {
     private Long status;
 
     private Date nearestEndTime;
+    private Integer returnType;
 
 }