Merge branch 'develop' into release

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 库存流水接口
  */
+
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/inventoryManagement/inventoryFlow")

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 库存监控接口
  */
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inventoryManagement/inventoryMonitoring")

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

@@ -0,0 +1,53 @@
+package org.dromara.InventoryManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.InventorySheetBo;
+import org.dromara.InventoryManagement.domain.vo.InventorySheetVo;
+import org.dromara.InventoryManagement.service.InventorySheetService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 盘点单接口
+ */
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/inventorySheet")
+public class InventorySheetController extends BaseController {
+    private final InventorySheetService inventorySheetService;
+    /**
+     * 查询盘点单列表
+     * @param inventorySheet 盘点单Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<InventorySheetVo> selectPageInventorySheetList(InventorySheetBo inventorySheet, PageQuery pageQuery) {
+        return inventorySheetService.selectPageInventorySheetList(inventorySheet,pageQuery);
+    }
+
+    /**
+     * 新增盘点单数据
+     * @param inventorySheet 盘点单Bo对象
+     * @return 新增结果
+     */
+    @PostMapping()
+    public R<Void> insertInventorySheet(@Validated @RequestBody InventorySheetBo inventorySheet) {
+        return toAjax(inventorySheetService.insertInventorySheet(inventorySheet));
+    }
+
+    /**
+     * 删除盘点单数据
+     * @param inventorySheetIds 盘点单ID
+     * @return 删除结果
+     */
+    @DeleteMapping("/{inventorySheetIds}")
+    public R<Void> deleteInventorySheetByIds(@PathVariable Long[] inventorySheetIds) {
+        return toAjax(inventorySheetService.deleteInventorySheetByIds(inventorySheetIds));
+    }
+}

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

@@ -0,0 +1,28 @@
+package org.dromara.InventoryManagement.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.OutBoundOrderBo;
+import org.dromara.InventoryManagement.domain.vo.OutBoundOrderVo;
+import org.dromara.InventoryManagement.service.OutBoundOrderService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/outBoundOrder")
+public class OutBoundOrderController extends BaseController {
+    private final OutBoundOrderService outBoundOrderService;
+    @GetMapping("/PageList")
+    public TableDataInfo<OutBoundOrderVo> selectOutBoundOrderPageList(OutBoundOrderBo outBoundOrderBo, PageQuery pageQuery) {
+        return outBoundOrderService.selectOutBoundOrderPageList(outBoundOrderBo, pageQuery);
+    }
+    @PostMapping()
+    public R<Void> insertOutBoundOrder(@RequestBody OutBoundOrderBo outBoundOrderBo) {
+        return toAjax(outBoundOrderService.insertOutBoundOrder(outBoundOrderBo));
+    }
+}

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

@@ -59,13 +59,33 @@ public class PutInStorageController extends BaseController {
      * @param putInStorageBo 传入Bo类
      * @return 结果
      */
-    @PutMapping
+    @PutMapping("/updateStorage")
     public R<Void> update(@RequestBody PutInStorageBo putInStorageBo) {
         return toAjax(putInStorageService.updateStorage(putInStorageBo));
     }
 
+    /**
+     * 查询入库审核信息分页列表
+     * @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) {
+        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/controller/PutOutStorageController.java

@@ -0,0 +1,13 @@
+package org.dromara.InventoryManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/putOutStorage")
+public class PutOutStorageController extends BaseController {
+
+}

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

@@ -0,0 +1,63 @@
+package org.dromara.InventoryManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.SupplierBo;
+import org.dromara.InventoryManagement.domain.vo.SupplierVo;
+import org.dromara.InventoryManagement.service.impl.SupplierServiceImpl;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 供应商管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/Supplier")
+public class SupplierController extends BaseController {
+
+    private final SupplierServiceImpl supplierService;
+
+    /**
+     * 分页查询供应商管理
+     * @param supplierBo 查询条件
+     * @param pageQuery 分页条件
+     * @return 结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
+        return supplierService.selectPageSupplierList(supplierBo, pageQuery);
+    }
+
+    /**
+     * 新增供应商
+     * @param supplierBo 供应商BO对象
+     * @return 结果
+     */
+    @PostMapping()
+    public int insertSupplier(@Validated @RequestBody SupplierBo supplierBo) {
+        return supplierService.insertSupplier(supplierBo);
+    }
+
+    /**
+     * 修改供应商
+     * @param supplierBo 供应商BO对象
+     * @return 影响行数
+     */
+    @PutMapping()
+    public int updateSupplier(@Validated @RequestBody SupplierBo supplierBo) {
+        return supplierService.updateSupplier(supplierBo);
+    }
+
+    /**
+     * 删除供应商
+     * @param supplierIds 供应商ID
+     * @return 影响行数
+     */
+    @DeleteMapping("/{supplierIds}")
+    public int deleteSupplierById(@PathVariable Long[] supplierIds) {
+        return supplierService.deleteSupplierById(supplierIds);
+    }
+}

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

@@ -0,0 +1,49 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+
+/**
+ * 盘点单基类
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_ykjp_stock")
+public class InventorySheet extends TenantEntity {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String idSn;
+
+    /**
+     * 创建人
+     */
+    private Long adminId;
+
+    /**
+     * 盘点单状态
+     */
+    private Integer status;
+
+    /**
+     * 盘点数量
+     */
+    private int nums;
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+
+}

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

@@ -0,0 +1,117 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_ykjp_delivery")
+public class OutBoundOrder extends TenantEntity {
+    /**
+     * ID
+     */
+    @TableId(type = IdType.AUTO)
+    private int id;
+    /**
+     * 单据编号
+     */
+    private String code;
+    /**
+     * 销售单单号
+     */
+    private String sellCode;
+    /**
+     * 销售单ID
+     */
+    private int sellId;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 客户ID
+     */
+    private int customerInfoId;
+    /**
+     * 联系人
+     */
+    private String linkman;
+    /**
+     * 联系方式
+     */
+    private String phone;
+    /**
+     * 录单人员
+     */
+    private int adminId;
+    /**
+     * 制单时间
+     */
+    private Date billingTime;
+    /**
+     * 交货日期
+     */
+    private Date deliveryTime;
+    /**
+     * 合计
+     */
+    private double totalNums;
+    /**
+     * 交货方式:1=买家自提,2=卖方发货,3=代发
+     */
+    private String type;
+    /**
+     * 所属区域
+     */
+    private String city;
+    /**
+     * 详细地址
+     */
+    private String address;
+    /**
+     * 状态:-1=已作废,1=待审核,2=审核失败,3=待财务审核,4=财务审核失败,5=审核通过,6=确认出库
+     */
+    private String statusList;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 审核人ID
+     */
+    private int reviewerId;
+    /**
+     * 企业ID
+     */
+    private int firmid;
+    /**
+     * 删除时间
+     */
+    private Date deletetime;
+    /**
+     * 作废理由
+     */
+    private String reason;
+    /**
+     * 审核失败理由
+     */
+    private String cause;
+    /**
+     *
+     */
+    private String outboundType;
+    /**
+     *
+     */
+    private double money;
+    /**
+     *
+     */
+    private int financialUserId;
+}

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

@@ -0,0 +1,56 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_ykjp_delivery_product")
+public class OutBoundOrderProduct extends TenantEntity {
+    /**
+     * ID
+     */
+    private int id;
+    /**
+     * 销售出库表ID
+     */
+    private int deliveryId;
+    /**
+     * 产品ID
+     */
+    private int productId;
+    /**
+     * 关联表ID
+     */
+    private int wpId;
+    /**
+     * 销售单副单ID
+     */
+    private int sellProId;
+    /**
+     * 单价
+     */
+    private double price;
+    /**
+     * 出库数量
+     */
+    private double nums;
+    /**
+     * 总价小计
+     */
+    private double subtotal;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 企业ID
+     */
+    private int firmid;
+    /**
+     * 备注
+     */
+    private String remark;
+}

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/Supplier.java

@@ -0,0 +1,115 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 供应商管理基类
+ */
+@Data
+@TableName("fa_ykjp_info_supplier")
+@EqualsAndHashCode(callSuper = true)
+public class Supplier extends TenantEntity {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 供应商编码
+     */
+    private String code;
+
+    /**
+     * 供应商名称
+     */
+    private String name;
+
+    /**
+     * 简称
+     */
+    @TableField("abbname")
+    private String abbreviation;
+
+    /**
+     * 联系人
+     */
+    private String contact;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 区域
+     */
+    private String city;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 传真
+     */
+    private String fax;
+
+    /**
+     * 公司电话
+     */
+    private String mobile;
+
+    /**
+     * 开户银行
+     */
+    private String bank;
+
+    /**
+     * 银行账号
+     */
+    @TableField("banknums")
+    private String bankNumber;
+
+    /**
+     * 账期(天)
+     */
+    private int term;
+
+    /**
+     * 纳税人识别号
+     */
+    private String identifier;
+
+    /**
+     * 社会信用代码
+     */
+    private String credit;
+
+    /**
+     * 信用额度
+     */
+    private int amount;
+
+    /**
+     * 说明
+     */
+    private String description;
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+    /**
+     * 状态
+     */
+    private int status;
+}

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

@@ -0,0 +1,49 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.InventorySheet;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 盘点单业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventorySheet.class,reverseConvertGenerate = false)
+public class InventorySheetBo extends BaseEntity {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String idSn;
+
+    /**
+     * 创建人
+     */
+    private Long adminId;
+
+    /**
+     * 盘点单状态
+     */
+    private Integer status;
+
+    /**
+     * 盘点数量
+     */
+    private int nums;
+
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+}

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

@@ -0,0 +1,117 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OutBoundOrderBo extends BaseEntity {
+    /**
+     * ID
+     */
+    private int id;
+    /**
+     * 单据编号
+     */
+    private String code;
+    /**
+     * 销售单单号
+     */
+    private String sellCode;
+    /**
+     * 销售单ID
+     */
+    private int sellId;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 客户ID
+     */
+    private int customerInfoId;
+    /**
+     * 联系人
+     */
+    private String linkman;
+    /**
+     * 联系方式
+     */
+    private String phone;
+    /**
+     * 录单人员
+     */
+    private int adminId;
+    /**
+     * 制单时间
+     */
+    private Date billingTime;
+    /**
+     * 交货日期
+     */
+    private Date deliveryTime;
+    /**
+     * 合计
+     */
+    private double totalNums;
+    /**
+     * 交货方式:1=买家自提,2=卖方发货,3=代发
+     */
+    private String type;
+    /**
+     * 所属区域
+     */
+    private String city;
+    /**
+     * 详细地址
+     */
+    private String address;
+    /**
+     * 状态:-1=已作废,1=待审核,2=审核失败,3=待财务审核,4=财务审核失败,5=审核通过,6=确认出库
+     */
+    private String statusList;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 审核人ID
+     */
+    private int reviewerId;
+    /**
+     * 企业ID
+     */
+    private int firmid;
+    /**
+     * 删除时间
+     */
+    private Date deletetime;
+    /**
+     * 作废理由
+     */
+    private String reason;
+    /**
+     * 审核失败理由
+     */
+    private String cause;
+    /**
+     *
+     */
+    private String outboundType;
+    /**
+     *
+     */
+    private double money;
+    /**
+     *
+     */
+    private int financialUserId;
+    /**
+     * 出库产品集合
+     */
+    private List<OutBoundOrderProductBo> outBoundOrderProductBoList;
+}

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

@@ -0,0 +1,52 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import lombok.Data;
+
+
+@Data
+public class OutBoundOrderProductBo  {
+    /**
+     * ID
+     */
+    private int id;
+    /**
+     * 销售出库表ID
+     */
+    private int deliveryId;
+    /**
+     * 产品ID
+     */
+    private int productId;
+    /**
+     * 关联表ID
+     */
+    private int wpId;
+    /**
+     * 销售单副单ID
+     */
+    private int sellProId;
+    /**
+     * 单价
+     */
+    private double price;
+    /**
+     * 出库数量
+     */
+    private double nums;
+    /**
+     * 总价小计
+     */
+    private double subtotal;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 企业ID
+     */
+    private int firmid;
+    /**
+     * 备注
+     */
+    private String remark;
+}

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/domain/bo/SupplierBo.java

@@ -0,0 +1,118 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.Supplier;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 供应商管理BO类
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Supplier.class, reverseConvertGenerate = false)
+public class SupplierBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 供应商编号
+     */
+    private String code;
+
+    /**
+     * 供应商名称
+     */
+    @NotNull(message = "供应商名称不能为空")
+    private String name;
+
+    /**
+     * 简称
+     */
+    private String abbreviation;
+
+    /**
+     * 联系人
+     */
+    private String contact;
+
+    /**
+     * 联系方式
+     */
+    @NotNull(message = "联系方式不能为空")
+    @Size(min = 11, max = 11, message = "联系方式长度不能超过11个字符")
+    private String phone;
+
+    /**
+     * 区域
+     */
+    private String city;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 传真
+     */
+    private String fax;
+
+    /**
+     * 公司电话
+     */
+    private String mobile;
+
+    /**
+     * 开户银行
+     */
+    private String bank;
+
+    /**
+     * 银行账号
+     */
+    private String bankNumber;
+
+    /**
+     * 账期(天)
+     */
+    private int term;
+
+    /**
+     * 纳税人识别号
+     */
+    private String identifier;
+
+    /**
+     * 社会信用代码
+     */
+    private String credit;
+
+    /**
+     * 信用额度
+     */
+    private int amount;
+
+    /**
+     * 说明
+     */
+    private String description;
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+    /**
+     * 状态
+     */
+    private int status;
+}

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

@@ -0,0 +1,49 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.InventorySheet;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 盘点单值对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventorySheet.class)
+public class InventorySheetVo  extends BaseEntity {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String idSn;
+
+    /**
+     * 创建人
+     */
+    private Long adminId;
+
+    /**
+     * 盘点单状态
+     */
+    private Integer status;
+
+    /**
+     * 盘点数量
+     */
+    private int nums;
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+
+}

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

@@ -0,0 +1,51 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class OutBoundOrderProductVo {
+    /**
+     * ID
+     */
+    private int id;
+    /**
+     * 销售出库表ID
+     */
+    private int deliveryId;
+    /**
+     * 产品ID
+     */
+    private int productId;
+    /**
+     * 关联表ID
+     */
+    private int wpId;
+    /**
+     * 销售单副单ID
+     */
+    private int sellProId;
+    /**
+     * 单价
+     */
+    private double price;
+    /**
+     * 出库数量
+     */
+    private double nums;
+    /**
+     * 总价小计
+     */
+    private double subtotal;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 企业ID
+     */
+    private int firmid;
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -0,0 +1,118 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.bo.OutBoundOrderProductBo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OutBoundOrderVo extends BaseEntity {
+    /**
+     * ID
+     */
+    private int id;
+    /**
+     * 单据编号
+     */
+    private String code;
+    /**
+     * 销售单单号
+     */
+    private String sellCode;
+    /**
+     * 销售单ID
+     */
+    private int sellId;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 客户ID
+     */
+    private int customerInfoId;
+    /**
+     * 联系人
+     */
+    private String linkman;
+    /**
+     * 联系方式
+     */
+    private String phone;
+    /**
+     * 录单人员
+     */
+    private int adminId;
+    /**
+     * 制单时间
+     */
+    private Date billingTime;
+    /**
+     * 交货日期
+     */
+    private Date deliveryTime;
+    /**
+     * 合计
+     */
+    private double totalNums;
+    /**
+     * 交货方式:1=买家自提,2=卖方发货,3=代发
+     */
+    private String type;
+    /**
+     * 所属区域
+     */
+    private String city;
+    /**
+     * 详细地址
+     */
+    private String address;
+    /**
+     * 状态:-1=已作废,1=待审核,2=审核失败,3=待财务审核,4=财务审核失败,5=审核通过,6=确认出库
+     */
+    private String statusList;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 审核人ID
+     */
+    private int reviewerId;
+    /**
+     * 企业ID
+     */
+    private int firmid;
+    /**
+     * 删除时间
+     */
+    private Date deletetime;
+    /**
+     * 作废理由
+     */
+    private String reason;
+    /**
+     * 审核失败理由
+     */
+    private String cause;
+    /**
+     *
+     */
+    private String outboundType;
+    /**
+     *
+     */
+    private double money;
+    /**
+     *
+     */
+    private int financialUserId;
+    /**
+     * 出库产品集合
+     */
+    private List<OutBoundOrderProductBo> outBoundOrderProductBoList;
+}

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

@@ -0,0 +1,113 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.Supplier;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 供应商VO对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Supplier.class)
+public class SupplierVo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 供应商编码
+     */
+    private String code;
+
+    /**
+     * 供应商名称
+     */
+    private String name;
+
+    /**
+     * 简称
+     */
+    private String abbreviation;
+
+    /**
+     * 联系人
+     */
+    private String contact;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 区域
+     */
+    private String city;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 传真
+     */
+    private String fax;
+
+    /**
+     * 公司电话
+     */
+    private String mobile;
+
+    /**
+     * 开户银行
+     */
+    private String bank;
+
+    /**
+     * 银行账号
+     */
+    private String bankNumber;
+
+    /**
+     * 账期(天)
+     */
+    private int term;
+
+    /**
+     * 纳税人识别号
+     */
+    private String identifier;
+
+    /**
+     * 社会信用代码
+     */
+    private String credit;
+
+    /**
+     * 信用额度
+     */
+    private int amount;
+
+    /**
+     * 说明
+     */
+    private String description;
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
+    /**
+     * 状态
+     */
+    private int status;
+}

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

@@ -0,0 +1,13 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.InventorySheet;
+import org.dromara.InventoryManagement.domain.vo.InventorySheetVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 盘点单Mapper接口
+ */
+@Mapper
+public interface InventorySheetMapper extends BaseMapperPlus<InventorySheet, InventorySheetVo> {
+}

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

@@ -0,0 +1,9 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.OutBoundOrder;
+import org.dromara.InventoryManagement.domain.vo.OutBoundOrderVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+@Mapper
+public interface OutBoundOrderMapper extends BaseMapperPlus<OutBoundOrder, OutBoundOrderVo> {
+}

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

@@ -0,0 +1,9 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.OutBoundOrderProduct;
+import org.dromara.InventoryManagement.domain.vo.OutBoundOrderProductVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+@Mapper
+public interface OutBoundOrderProductMapper extends BaseMapperPlus<OutBoundOrderProduct, OutBoundOrderProductVo> {
+}

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

@@ -0,0 +1,13 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.Supplier;
+import org.dromara.InventoryManagement.domain.vo.SupplierVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 供应商表 Mapper
+ */
+@Mapper
+public interface SupplierMapper extends BaseMapperPlus<Supplier, SupplierVo> {
+}

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

@@ -0,0 +1,33 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.InventorySheetBo;
+import org.dromara.InventoryManagement.domain.vo.InventorySheetVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 盘点单Service接口
+ */
+public interface InventorySheetService {
+    /**
+     * 分页查询盘点单管理
+     * @param inventorySheet 盘点单Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    TableDataInfo<InventorySheetVo> selectPageInventorySheetList(InventorySheetBo inventorySheet, PageQuery pageQuery);
+
+    /**
+     * 新增盘点单数据
+     * @param inventorySheet 盘点单Bo对象
+     * @return 影响行数
+     */
+    int insertInventorySheet(InventorySheetBo inventorySheet);
+
+    /**
+     * 删除盘点单数据
+     * @param inventorySheetIds 盘点单ID
+     * @return 影响行数
+     */
+    int deleteInventorySheetByIds(Long[] inventorySheetIds);
+}

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

@@ -0,0 +1,16 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.OutBoundOrderBo;
+import org.dromara.InventoryManagement.domain.vo.OutBoundOrderProductVo;
+import org.dromara.InventoryManagement.domain.vo.OutBoundOrderVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+public interface OutBoundOrderService {
+    TableDataInfo <OutBoundOrderVo> selectOutBoundOrderPageList(OutBoundOrderBo outBoundOrderBo, PageQuery pageQuery);
+    int insertOutBoundOrder(OutBoundOrderBo outBoundOrderBo);
+    List<OutBoundOrderProductVo> selectOutBoundOrderProductList(int id);
+    int updateOutBoundOrder(OutBoundOrderBo outBoundOrderBo);
+}

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

@@ -19,4 +19,6 @@ public interface PutInStorageService {
     int updateStorage(PutInStorageBo putInStorageBo);
 
     TableDataInfo<StorageVo> selectStorageProcessPageList(StorageBo storageBo, PageQuery pageQuery);
+
+    int updateStorageProcess(StorageBo storageBo);
 }

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

@@ -0,0 +1,38 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.SupplierBo;
+import org.dromara.InventoryManagement.domain.vo.SupplierVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+public interface SupplierService {
+
+    /**
+     * 分页查询供应商
+     * @param supplierBo 供应商BO对象
+     * @param pageQuery 分页参数
+     * @return 分页结果
+     */
+    TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery);
+
+    /**
+     * 新增供应商
+     * @param supplierBo 供应商BO对象
+     * @return 结果
+     */
+    int insertSupplier(SupplierBo supplierBo);
+
+    /**
+     * 修改供应商
+     * @param supplierBo 供应商BO对象
+     * @return 影响行数
+     */
+    int updateSupplier(SupplierBo supplierBo);
+
+    /**
+     * 删除供应商
+     * @param supplierIds 供应商ID
+     * @return 影响行数
+     */
+    int deleteSupplierById(Long[] supplierIds);
+}

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

@@ -0,0 +1,64 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.InventorySheet;
+import org.dromara.InventoryManagement.domain.bo.InventorySheetBo;
+import org.dromara.InventoryManagement.domain.vo.InventorySheetVo;
+import org.dromara.InventoryManagement.mapper.InventorySheetMapper;
+import org.dromara.InventoryManagement.service.InventorySheetService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+/**
+ * 盘点单服务实现
+ */
+@Service
+@RequiredArgsConstructor
+public class InventorySheetServiceImpl implements InventorySheetService {
+    private final InventorySheetMapper inventorySheetMapper;
+
+    /**
+     * 根据InventorySheet对象分页查询盘点单数据
+     *
+     * @param inventorySheetBo   inventorySheetBo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<InventorySheetVo> selectPageInventorySheetList(InventorySheetBo inventorySheetBo, PageQuery pageQuery) {
+        QueryWrapper<InventorySheet> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(inventorySheetBo.getIdSn()), "id_sn", inventorySheetBo.getIdSn());
+        qw.like(inventorySheetBo.getStatus() != null, "status", inventorySheetBo.getStatus());
+        Page<InventorySheetVo> page=inventorySheetMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增盘点单数据
+     *
+     * @param inventorySheetBo 盘点单Bo对象
+     * @return 结果
+     */
+    @Override
+    public int insertInventorySheet(InventorySheetBo inventorySheetBo) {
+        InventorySheet inventorySheet = MapstructUtils.convert(inventorySheetBo, InventorySheet.class);
+        return inventorySheetMapper.insert(inventorySheet);
+    }
+
+    /**
+     * 批量删除盘点单数据
+     * @param inventorySheetIds InventorySheetIds
+     * @return 结果
+     */
+    @Override
+    public int deleteInventorySheetByIds(Long[] inventorySheetIds) {
+        return inventorySheetMapper.deleteByIds(Arrays.asList(inventorySheetIds));
+    }
+}

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

@@ -0,0 +1,73 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.OutBoundOrder;
+import org.dromara.InventoryManagement.domain.OutBoundOrderProduct;
+import org.dromara.InventoryManagement.domain.bo.OutBoundOrderBo;
+import org.dromara.InventoryManagement.domain.bo.OutBoundOrderProductBo;
+import org.dromara.InventoryManagement.domain.vo.OutBoundOrderProductVo;
+import org.dromara.InventoryManagement.domain.vo.OutBoundOrderVo;
+import org.dromara.InventoryManagement.mapper.OutBoundOrderMapper;
+import org.dromara.InventoryManagement.mapper.OutBoundOrderProductMapper;
+import org.dromara.InventoryManagement.service.OutBoundOrderService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.OrderNumberGenerator;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class OutBoundOrderServiceImpl implements OutBoundOrderService {
+    private final OutBoundOrderMapper outBoundOrderMapper;
+    private final OutBoundOrderProductMapper outBoundOrderProductMapper;
+
+    @Override
+    public TableDataInfo<OutBoundOrderVo> selectOutBoundOrderPageList(OutBoundOrderBo outBoundOrderBo, PageQuery pageQuery) {
+        QueryWrapper<OutBoundOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(outBoundOrderBo.getCode()), "code", outBoundOrderBo.getCode());
+        queryWrapper.like(StringUtils.isNotBlank(outBoundOrderBo.getCustomerName()), "customer_name", outBoundOrderBo.getCustomerName());
+        queryWrapper.eq(StringUtils.isNotBlank(outBoundOrderBo.getStatusList()), "status_list", outBoundOrderBo.getStatusList());
+        Page<OutBoundOrderVo> page = outBoundOrderMapper.selectVoPage(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertOutBoundOrder(OutBoundOrderBo outBoundOrderBo) {
+        OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
+        OutBoundOrder outBoundOrder = MapstructUtils.convert(outBoundOrderBo, OutBoundOrder.class);
+        if (outBoundOrder != null) {
+            outBoundOrder.setCode(generator.generateOrderNumber("YK"));
+        } else {
+            throw new RuntimeException("outBoundOrder is null");
+        }
+        outBoundOrderMapper.insert(outBoundOrder);
+        for (OutBoundOrderProductBo outBoundOrderProductBo : outBoundOrderBo.getOutBoundOrderProductBoList()) {
+            outBoundOrderProductBo.setDeliveryId(outBoundOrder.getId());
+            outBoundOrderProductMapper.insert(MapstructUtils.convert(outBoundOrderProductBo, OutBoundOrderProduct.class));
+        }
+        return 1;
+    }
+
+    @Override
+    public List<OutBoundOrderProductVo> selectOutBoundOrderProductList(int id) {
+        QueryWrapper<OutBoundOrderProduct> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("delivery_id", id);
+        return MapstructUtils.convert(outBoundOrderProductMapper.selectList(queryWrapper), OutBoundOrderProductVo.class);
+    }
+
+    @Override
+    public int updateOutBoundOrder(OutBoundOrderBo outBoundOrderBo) {
+        for (OutBoundOrderProductBo outBoundOrderProductBo : outBoundOrderBo.getOutBoundOrderProductBoList()){
+            outBoundOrderProductMapper.updateById(MapstructUtils.convert(outBoundOrderProductBo, OutBoundOrderProduct.class));
+        }
+        return outBoundOrderMapper.updateById(MapstructUtils.convert(outBoundOrderBo, OutBoundOrder.class));
+    }
+}

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

@@ -108,14 +108,31 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         return putInStorageMapper.updateById(newStorageMapstruct.toStorage(putInStorageBo, putInStorageBo.getInCode()));
     }
 
+    /**
+     * 查询入库审核信息分页列表
+     * @param storageBo 入库订单表
+     * @param pageQuery 分页信息
+     * @return 结果
+     */
     @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());
+        qw.eq(storageBo.getWarehouseId() != 0, "warehouse_id", storageBo.getWarehouseId());
         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/java/org/dromara/InventoryManagement/service/impl/SupplierServiceImpl.java

@@ -0,0 +1,71 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.Supplier;
+import org.dromara.InventoryManagement.domain.bo.SupplierBo;
+import org.dromara.InventoryManagement.domain.vo.SupplierVo;
+import org.dromara.InventoryManagement.mapper.SupplierMapper;
+import org.dromara.InventoryManagement.service.SupplierService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.OrderNumberGenerator;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+@Service
+@RequiredArgsConstructor
+public class SupplierServiceImpl implements SupplierService {
+
+    private final SupplierMapper supplierMapper;
+    private final OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
+
+    /**
+     * 分页查询供应商
+     * @param supplierBo 供应商BO对象
+     * @param pageQuery  分页参数
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
+        QueryWrapper<Supplier> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(supplierBo.getCode()),"code", supplierBo.getCode());
+        Page<SupplierVo> page = supplierMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增供应商
+     * @param supplierBo 供应商BO对象
+     * @return 结果
+     */
+    @Override
+    public int insertSupplier(SupplierBo supplierBo) {
+        supplierBo.setCode(generator.generateOrderNumber("SP"));
+        return supplierMapper.insert(MapstructUtils.convert(supplierBo, Supplier.class));
+    }
+
+    /**
+     * 修改供应商
+     * @param supplierBo 供应商BO对象
+     * @return 影响行数
+     */
+    @Override
+    public int updateSupplier(SupplierBo supplierBo) {
+        return supplierMapper.updateById(MapstructUtils.convert(supplierBo, Supplier.class));
+    }
+
+    /**
+     * 删除供应商
+     * @param supplierIds 供应商ID
+     * @return 影响行数
+     */
+    @Override
+    public int deleteSupplierById(Long[] supplierIds) {
+        return supplierMapper.deleteByIds(Arrays.asList(supplierIds));
+    }
+}

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.InventoryManagement.mapper.InventorySheetMapper">
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.InventoryManagement.mapper.OutBoundOrderMapper">
+
+
+</mapper>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.InventoryManagement.mapper.OutBoundOrderProductMapper">
+
+
+</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.InventoryManagement.mapper.SupplierMapper">
+
+</mapper>