Merge remote-tracking branch 'origin/develop' into develop

.gitignore

@@ -46,3 +46,6 @@ nbdist/
 !*/build/*.xml
 src/main/resources/application-druid.yml
 src/main/resources/application.yml
+src/main/resources/application-dev.yml
+src/main/resources/application-test.yml
+src/main/resources/application-prod.yml

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

@@ -1,7 +1,9 @@
 package org.dromara.InventoryManagement.controller;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
 import org.dromara.InventoryManagement.domain.bo.StorageBo;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.InventoryManagement.service.PutInStorageService;
@@ -11,6 +13,7 @@ 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/putInStorage")
@@ -30,7 +33,8 @@ public class PutInStorageController extends BaseController {
     }
 
     @PostMapping
-    public R<Void> insert(@RequestBody StorageBo storageBo){
-        return toAjax(putInStorageService.insertInventory(storageBo));
+    public R<Void> insert(@RequestBody PutInStorageBo putInStorageBo){
+        return toAjax(putInStorageService.insertStorage(putInStorageBo));
     }
+
 }

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

@@ -9,41 +9,92 @@ 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.*;
-
 import java.util.List;
+/**
+ * 入库类型管理接口
+ */
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inventoryManagement/putinstoragetype")
 public class PutInStorageTypeController extends BaseController {
     private final PutInStorageTypeService putInStorageTypeService;
+
+    /**
+     * 根据条件获取入库类型管理列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return  查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery){
         return putInStorageTypeService.selectPutInStorageTypePageList(putInStorageTypeBo,pageQuery);
     }
+
+    /**
+     * 新增入库类型
+     * @param putInStorageTypeBo 入库累心Bo对象
+     * @return 新增结果
+     */
     @PostMapping
     public R<Void> insertPutInStorageType(@RequestBody PutInStorageTypeBo putInStorageTypeBo){
         return toAjax(putInStorageTypeService.insertPutInStorageType(putInStorageTypeBo));
     }
+
+    /**
+     * 修改入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 修改结果
+     */
     @PutMapping
     public R<Void> updatePutInStorageType(@RequestBody PutInStorageTypeBo putInStorageTypeBo){
         return toAjax(putInStorageTypeService.updatePutInStorageType(putInStorageTypeBo));
     }
+
+    /**
+     * 将入库类型放入回收站
+     * @param ids 入库类型ids
+     * @return 回收结果
+     */
     @DeleteMapping("/{ids}")
     public R<Void> deletePutInStorageTypeByIds(@PathVariable List<Integer> ids){
         return toAjax(putInStorageTypeService.deletePutInStorageTypeByIds(ids));
     }
+
+    /**
+     * 根据条件查询回收站入库类型列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/recycle")
     public TableDataInfo<PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery){
         return putInStorageTypeService.selectRecyclePutInStorageTypeList(putInStorageTypeBo,pageQuery);
     }
+
+    /**
+     * 还原回收站中指定id的入库类型
+     * @param ids 入库类型Ids
+     * @return 还原结果
+     */
     @PostMapping("/recycle/back/{ids}")
     public R<Void> backPutInStorageTypeByIds(@PathVariable List<Integer> ids){
         return toAjax(putInStorageTypeService.backPutInStorageTypeByIds(ids));
     }
+
+    /**
+     * 还原回收站中所有入库类型
+     * @return 还原结果
+     */
     @PostMapping("/recycle/back/all")
     public R<Void> backPutInStorageTypeAll(){
         return toAjax(putInStorageTypeService.backPutInStorageTypeAll());
     }
+
+    /**
+     * 销毁回收站中指定id的入库类型
+     * @param ids 入库类型Ids
+     * @return 销毁结果
+     */
     @DeleteMapping("/recycle/{ids}")
     public R<Void> deleteRecyclePutInStorageTypeByIds(@PathVariable List<Integer> ids){
         int status = putInStorageTypeService.deleteRecyclePutInStorageTypeByIds(ids);
@@ -52,6 +103,11 @@ public class PutInStorageTypeController extends BaseController {
         }
         return R.fail("该回收站中不存在此入库类型或已被删除");
     }
+
+    /**
+     * 销毁回收站中所有入库类型
+     * @return 销毁结果
+     */
     @DeleteMapping("recycle/all")
     public R<Void> deleteRecyclePutInStorageTypeAll(){
         return toAjax(putInStorageTypeService.deleteRecyclePutInStorageTypeAll());

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

@@ -0,0 +1,117 @@
+package org.dromara.InventoryManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.PutOutStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutOutStorageTypeVo;
+import org.dromara.InventoryManagement.service.PutOutStorageTypeService;
+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.*;
+
+import java.util.List;
+
+/**
+ * 出库类型管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/putoutstoragetype")
+public class PutOutStorageTypeController extends BaseController {
+    private final PutOutStorageTypeService putOutStorageTypeService;
+
+    /**
+     * 根据条件获取出库类型管理列表
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<PutOutStorageTypeVo> selectPutOutStorageTypePageList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery) {
+        return putOutStorageTypeService.selectPutOutStorageTypePageList(putOutStorageTypeBo, pageQuery);
+    }
+
+    /**
+     * 新增出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 新增结果
+     */
+    @PostMapping
+    public R<Void> insertPutOutStorageType(@RequestBody PutOutStorageTypeBo putOutStorageTypeBo) {
+        return toAjax(putOutStorageTypeService.insertPutOutStorageType(putOutStorageTypeBo));
+    }
+
+    /**
+     * 修改出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 修改结果
+     */
+    @PutMapping
+    public R<Void> updatePutOutStorageType(@RequestBody PutOutStorageTypeBo putOutStorageTypeBo) {
+        return toAjax(putOutStorageTypeService.updatePutOutStorageType(putOutStorageTypeBo));
+    }
+
+    /**
+     * 将出库类型放入回收站
+     * @param ids 出库类型Ids
+     * @return 回收结果
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> deletePutOutStorageTypeByIds(@PathVariable List<Integer> ids) {
+        return toAjax(putOutStorageTypeService.deletePutOutStorageTypeByIds(ids));
+    }
+
+    /**
+     * 根据条件查询回收站出库类型列表
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/recycle")
+    public TableDataInfo<PutOutStorageTypeVo> selectRecyclePutOutStorageTypeList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery) {
+        return putOutStorageTypeService.selectRecyclePutOutStorageTypeList(putOutStorageTypeBo, pageQuery);
+    }
+
+    /**
+     * 还原回收站中指定id的出库类型
+     * @param ids 出库类型Ids
+     * @return 还原结果
+     */
+    @PostMapping("/recycle/back/{ids}")
+    public R<Void> backPutOutStorageTypeByIds(@PathVariable List<Integer> ids) {
+        return toAjax(putOutStorageTypeService.backPutOutStorageTypeByIds(ids));
+    }
+
+    /**
+     * 还原回收站中所有出库类型
+     * @return 还原结果
+     */
+    @PostMapping("/recycle/back/all")
+    public R<Void> backPutOutStorageTypeAll() {
+        return toAjax(putOutStorageTypeService.backPutOutStorageTypeAll());
+    }
+
+    /**
+     * 销毁回收站中指定id的出库类型
+     * @param ids 出库类型Ids
+     * @return 销毁结果
+     */
+    @DeleteMapping("/recycle/{ids}")
+    public R<Void> deleteRecyclePutOutStorageTypeByIds(@PathVariable List<Integer> ids) {
+        int status = putOutStorageTypeService.deleteRecyclePutOutStorageTypeByIds(ids);
+        if(status==1){
+            return toAjax(1);
+        }
+        return R.fail("该回收站中不存在此出库类型或已被删除");
+    }
+
+    /**
+     * 销毁回收站中所有出库类型
+     * @return 销毁结果
+     */
+    @DeleteMapping("recycle/all")
+    public R<Void> deleteRecyclePutOutStorageTypeAll() {
+        return toAjax(putOutStorageTypeService.deleteRecyclePutOutStorageTypeAll());
+    }
+}

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

@@ -3,7 +3,9 @@ package org.dromara.InventoryManagement.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-
+/**
+ * 入库类型基类
+ */
 @Data
 @TableName("fa_ykjp_warehouse_in")
 public class PutInStorageType {

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

@@ -0,0 +1,32 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 出库类型基类
+ */
+@Data
+@TableName("fa_ykjp_warehouse_out")
+public class PutOutStorageType {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 出库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+}

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

@@ -1,6 +1,8 @@
 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;
@@ -16,6 +18,7 @@ public class Storage extends TenantEntity {
     /**
      * 主键Id
      */
+    @TableId(type = IdType.AUTO)
     private int id;
 
     /**
@@ -23,11 +26,6 @@ public class Storage extends TenantEntity {
      */
     private String code;
 
-    /**
-     * 入库类型 0=采购入库，1=销售退货入库
-     */
-    private int inboundType;
-
     /**
      * 库区
      */
@@ -38,6 +36,11 @@ public class Storage extends TenantEntity {
      */
     private String status;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 入库单更新时间
      */

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

@@ -4,6 +4,7 @@ package org.dromara.InventoryManagement.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.DiBu;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.util.Date;
@@ -24,12 +25,12 @@ public class StorageProduct extends TenantEntity {
     private int storageId;
 
     /**
-     * 产品编号
+     * 底布Id
      */
     private int productId;
 
     /**
-     * 仓库编号
+     * 仓库Id
      */
     private int warehouseId;
 

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

@@ -0,0 +1,33 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PutInStorageBo extends BaseEntity {
+
+    /**
+     * 仓库Id
+     */
+    private int warehouseId;
+
+    /**
+     * 库区ID
+     */
+    private int partitionId;
+
+    /**
+     * 入库表备注
+     */
+    private String remarkStorage;
+
+    /**
+     * 入库单
+     */
+    private List<StorageListBo> storageList;
+
+}

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

@@ -9,6 +9,9 @@ import org.dromara.InventoryManagement.domain.PutInStorageType;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * 入库类型业务对象
+ */
 @Data
 @AutoMapper(target = PutInStorageType.class, reverseConvertGenerate = false)
 public class PutInStorageTypeBo {

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

@@ -0,0 +1,44 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.InventoryManagement.domain.PutOutStorageType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 出库类型业务对象
+ */
+@Data
+@AutoMapper(target = PutOutStorageType.class, reverseConvertGenerate = false)
+public class PutOutStorageTypeBo {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 出库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+}

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

@@ -29,6 +29,11 @@ public class StorageBo extends BaseEntity {
      */
     private String status;
 
+    /**
+     * 库区
+     */
+    private int partitionId;
+
     /**
      * 入库单更新时间
      */
@@ -37,6 +42,6 @@ public class StorageBo extends BaseEntity {
     /**
      * 备注
      */
-    private String storageRemark;
+    private String remark;
 
 }

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

@@ -0,0 +1,42 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class StorageListBo {
+
+    /**
+     * 布料Id
+     */
+    private int productId;
+
+    /**
+     * 布料名称
+     */
+    private String clothName;
+
+    /**
+     * 布料颜色
+     */
+    private String clothColor;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 入库数
+     */
+    private double nums;
+
+    /**
+     * 仓库产品关联表备注
+     */
+    private String remarkStorageProduct;
+}

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

@@ -1,47 +0,0 @@
-package org.dromara.InventoryManagement.domain.bo;
-
-
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.InventoryManagement.domain.StorageProduct;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = StorageProduct.class, reverseConvertGenerate = false)
-public class StorageProductBo extends BaseEntity {
-
-    /**
-     * 主键Id
-     */
-    private int id;
-
-    /**
-     * 采购单ID
-     */
-    private int storageId;
-
-    /**
-     * 产品编号
-     */
-    private int productId;
-
-    /**
-     * 仓库编号
-     */
-    private int warehouseId;
-
-    /**
-     * 入库数
-     */
-    private double nums;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-}

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

@@ -4,6 +4,9 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.InventoryManagement.domain.PutInStorageType;
 
+/**
+ * 入库类型值对象
+ */
 @Data
 @AutoMapper(target = PutInStorageType.class)
 public class PutInStorageTypeVo {

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

@@ -0,0 +1,33 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.InventoryManagement.domain.PutOutStorageType;
+
+/**
+ * 出库类型值对象
+ */
+@Data
+@AutoMapper(target = PutOutStorageType.class)
+public class PutOutStorageTypeVo {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 出库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+}

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

@@ -1,15 +1,10 @@
 package org.dromara.InventoryManagement.domain.vo;
-
-
-import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.InventoryManagement.domain.StorageProduct;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = StorageProduct.class)
 public class StorageProductVo extends BaseEntity {
 
     /**
@@ -23,7 +18,7 @@ public class StorageProductVo extends BaseEntity {
     private int storageId;
 
     /**
-     * 产品编号
+     * 底布Id
      */
     private int productId;
 
@@ -41,6 +36,4 @@ public class StorageProductVo extends BaseEntity {
      * 备注
      */
     private String remark;
-
-
 }

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

@@ -29,6 +29,16 @@ public class StorageVo extends BaseEntity {
      */
     private String status;
 
+    /**
+     * 库区
+     */
+    private int partitionId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 入库单更新时间
      */

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

@@ -1,14 +1,12 @@
 package org.dromara.InventoryManagement.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.InventoryManagement.domain.bo.StorageBo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.InventoryManagement.domain.Storage;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
 
 @Mapper
 public interface PutInStorageMapper extends BaseMapperPlus<Storage, StorageVo> {
 
-    public int insertInventory(StorageBo storageBo);
-
 }

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

@@ -0,0 +1,12 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.StorageProduct;
+import org.dromara.InventoryManagement.domain.vo.StorageProductVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+
+@Mapper
+public interface PutInStorageProductMapper extends BaseMapperPlus<StorageProduct, StorageProductVo> {
+
+}

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

@@ -5,7 +5,9 @@ import org.dromara.InventoryManagement.domain.PutInStorageType;
 import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
-
+/**
+ * 入库类型Mapper
+ */
 @Mapper
 public interface PutInStorageTypeMapper extends BaseMapperPlus<PutInStorageType, PutInStorageTypeVo> {
 }

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

@@ -0,0 +1,14 @@
+package org.dromara.InventoryManagement.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.PutOutStorageType;
+import org.dromara.InventoryManagement.domain.vo.PutOutStorageTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 出库类型Mapper
+ */
+@Mapper
+public interface PutOutStorageTypeMapper extends BaseMapperPlus<PutOutStorageType, PutOutStorageTypeVo> {
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapstruct/NewStorageMapstruct.java

@@ -0,0 +1,26 @@
+package org.dromara.InventoryManagement.mapstruct;
+
+import org.dromara.InventoryManagement.domain.Storage;
+import org.dromara.InventoryManagement.domain.StorageProduct;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
+import org.dromara.InventoryManagement.domain.bo.StorageListBo;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+/**
+ * 新增入库订单映射
+ */
+@Mapper(componentModel = "spring")
+public interface NewStorageMapstruct {
+
+    @Mapping(target = "remark", source = "putInStorageBo.remarkStorage")
+    Storage toStorage(PutInStorageBo putInStorageBo,
+                      String code);
+
+    @Mapping(target = "remark", source = "storageListBo.remarkStorageProduct")
+    @Mapping(target = "storageId", source = "storageId")
+    StorageProduct toStorageProduct(PutInStorageBo putInStorageBo,
+                                    StorageListBo storageListBo,
+                                    int storageId);
+
+}

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

@@ -1,5 +1,6 @@
 package org.dromara.InventoryManagement.service;
 
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
 import org.dromara.InventoryManagement.domain.bo.StorageBo;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -9,5 +10,5 @@ public interface PutInStorageService {
 
     TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery);
 
-    int insertInventory(StorageBo storageBo);
+    int insertStorage(PutInStorageBo putInStorageBo);
 }

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

@@ -7,22 +7,70 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 import java.util.List;
 
+/**
+ * 入库类型服务层
+ */
 public interface PutInStorageTypeService {
+    /**
+     * 根据条件查询入库类型列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery);
 
+    /**
+     * 新增入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 影响行数
+     */
     int insertPutInStorageType(PutInStorageTypeBo putInStorageTypeBo);
 
+    /**
+     * 修改入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 影响行数
+     */
     int updatePutInStorageType(PutInStorageTypeBo putInStorageTypeBo);
 
+    /**
+     * 将入库类型放入回收站
+     * @param ids 入库类型ids
+     * @return 影响行数
+     */
     int deletePutInStorageTypeByIds(List<Integer> ids);
 
+    /**
+     * 查询回收站中的入库类型列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery);
 
+    /**
+     * 将指定id的入库类型从回收站中恢复
+     * @param ids 入库类型ids
+     * @return 影响行数
+     */
     int backPutInStorageTypeByIds(List<Integer> ids);
 
+    /**
+     * 将回收站中的入库类型全部恢复
+     * @return 影响行数
+     */
     int backPutInStorageTypeAll();
 
+    /**
+     * 销毁回收站中指定id的入库类型
+     * @param ids 入库类型ids
+     * @return 影响行数
+     */
     int deleteRecyclePutInStorageTypeByIds(List<Integer> ids);
 
+    /**
+     * 销毁回收站中的全部入库类型
+     * @return 影响行数
+     */
     int deleteRecyclePutInStorageTypeAll();
 }

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

@@ -0,0 +1,76 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.PutOutStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutOutStorageTypeVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 出库类型服务层
+ */
+public interface PutOutStorageTypeService {
+    /**
+     * 根据条件查询出库类型列表
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    TableDataInfo<PutOutStorageTypeVo> selectPutOutStorageTypePageList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery);
+
+    /**
+     * 新增出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 影响行数
+     */
+    int insertPutOutStorageType(PutOutStorageTypeBo putOutStorageTypeBo);
+
+    /**
+     * 修改出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 影响行数
+     */
+    int updatePutOutStorageType(PutOutStorageTypeBo putOutStorageTypeBo);
+
+    /**
+     * 将出库类型放入回收站
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 影响行数
+     */
+    int deletePutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds);
+
+    /**
+     * 查询回收站中的出库类型类别
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    TableDataInfo<PutOutStorageTypeVo> selectRecyclePutOutStorageTypeList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery);
+
+    /**
+     * 将指定id的出库类型从回收站中回复
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 影响行数
+     */
+    int backPutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds);
+
+    /**
+     * 将回收站中的出库类型全部回复
+     * @return 影响行数
+     */
+    int backPutOutStorageTypeAll();
+
+    /**
+     * 销毁回收站中指定id的出库类型
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 影响行数
+     */
+    int deleteRecyclePutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds);
+
+    /**
+     * 销毁回收站中的全部出库类型
+     * @return 影响行数
+     */
+    int deleteRecyclePutOutStorageTypeAll();
+}

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

@@ -3,16 +3,24 @@ 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.PutInStorageType;
 import org.dromara.InventoryManagement.domain.Storage;
+import org.dromara.InventoryManagement.domain.StorageProduct;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
 import org.dromara.InventoryManagement.domain.bo.StorageBo;
+import org.dromara.InventoryManagement.domain.bo.StorageListBo;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.InventoryManagement.mapper.PutInStorageMapper;
+import org.dromara.InventoryManagement.mapper.PutInStorageProductMapper;
+import org.dromara.InventoryManagement.mapstruct.NewStorageMapstruct;
 import org.dromara.InventoryManagement.service.PutInStorageService;
+import org.dromara.commodityManagement.domain.DiBu;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.OrderNumberGenerator;
 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;
 
@@ -22,6 +30,8 @@ import java.util.List;
 public class PutInStorageServiceImpl implements PutInStorageService {
 
     private final PutInStorageMapper putInStorageMapper;
+    private final PutInStorageProductMapper putInStorageProductMapper;
+    private final NewStorageMapstruct newStorageMapstruct;
 
     /**
      * 查询入库订单分页列表
@@ -40,9 +50,25 @@ public class PutInStorageServiceImpl implements PutInStorageService {
     }
 
     @Override
-    public int insertInventory(StorageBo storageBo) {
-        OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
-        storageBo.setCode(generator.generateOrderNumber("YKS"));
-        return putInStorageMapper.insertInventory(storageBo);
+    @Transactional(rollbackFor = Exception.class)
+    public int insertStorage(PutInStorageBo putInStorageBo) {
+        try {
+            // 生成订单编号
+            OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
+            // 入库订单表注入
+            Storage storage = newStorageMapstruct.toStorage(putInStorageBo, generator.generateOrderNumber("YKS"));
+            // 入库
+            putInStorageMapper.insert(storage);
+            // 详情表注入
+            for (StorageListBo storageListBo : putInStorageBo.getStorageList()){
+                // 关联表注入
+                StorageProduct storageProduct = newStorageMapstruct.toStorageProduct(putInStorageBo,storageListBo,storage.getId());
+                putInStorageProductMapper.insert(storageProduct);
+            }
+            return 1;
+        } catch (Exception e) {
+            throw new RuntimeException("插入入库订单失败", e);
+        }
     }
+
 }

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

@@ -19,28 +19,57 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 入库类型业务实现
+ */
 @Service
 @RequiredArgsConstructor
 public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
     private final PutInStorageTypeMapper putInStorageTypeMapper;
+
+    /**
+     * 查询入库类型管理列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @Override
     public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
         QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
+        qw.isNull("deletetime");
         qw.like(putInStorageTypeBo.getID() != 0,"id",putInStorageTypeBo.getID());
         qw.like(StringUtils.isNotBlank(putInStorageTypeBo.getName()),"name",putInStorageTypeBo.getName());
         Page<PutInStorageTypeVo>page= putInStorageTypeMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 新增结果
+     */
     @Override
     public int insertPutInStorageType(PutInStorageTypeBo putInStorageTypeBo) {
         PutInStorageType putInStorageType = MapstructUtils.convert(putInStorageTypeBo, PutInStorageType.class);
         return putInStorageTypeMapper.insert(putInStorageType);
     }
+
+    /**
+     * 修改入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 修改结果
+     */
     @Override
     public int updatePutInStorageType(PutInStorageTypeBo putInStorageTypeBo) {
         PutInStorageType putInStorageType = MapstructUtils.convert(putInStorageTypeBo, PutInStorageType.class);
         return putInStorageTypeMapper.updateById(putInStorageType);
     }
+
+    /**
+     * 将指定id的入库类型移入回收站
+     * @param putInStorageTypeIds 入库类型ids
+     * @return 回收结果
+     */
     @Override
     public int deletePutInStorageTypeByIds(List<Integer> putInStorageTypeIds){
         UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
@@ -48,6 +77,13 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         updateWrapper.set("deletetime",new Date());
         return putInStorageTypeMapper.update(updateWrapper);
     }
+
+    /**
+     * 查询回收站中的入库类型列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @Override
     public TableDataInfo <PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
         QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
@@ -60,6 +96,12 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         Page<PutInStorageTypeVo> page = putInStorageTypeMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 还原回收站中指定id的入库类型
+     * @param putInStorageTypeIds 入库类型ids
+     * @return 还原结果
+     */
     @Override
     public int backPutInStorageTypeByIds(List<Integer> putInStorageTypeIds) {
         UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
@@ -67,12 +109,23 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         updateWrapper.set("deletetime",null);
         return putInStorageTypeMapper.update(updateWrapper);
     }
+
+    /**
+     * 还原回收站中所有入库类型
+     * @return 还原结果
+     */
     @Override
     public int backPutInStorageTypeAll() {
         UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
         updateWrapper.set("deletetime",null);
         return putInStorageTypeMapper.update(updateWrapper);
     }
+
+    /**
+     * 销毁回收站中指定id的入库类型
+     * @param putInStorageTypeIds 入库类型ids
+     * @return 销毁结果
+     */
     @Override
     public int deleteRecyclePutInStorageTypeByIds(List<Integer> putInStorageTypeIds) {
         QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();
@@ -80,6 +133,11 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         qw.isNotNull("deletetime");
         return putInStorageTypeMapper.delete(qw);
     }
+
+    /**
+     * 销毁回收站中所有的入库类型
+     * @return 销毁结果
+     */
     @Override
     public int deleteRecyclePutInStorageTypeAll() {
         QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();

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

@@ -0,0 +1,150 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.PutOutStorageType;
+import org.dromara.InventoryManagement.domain.bo.PutOutStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutOutStorageTypeVo;
+import org.dromara.InventoryManagement.mapper.PutOutStorageTypeMapper;
+import org.dromara.InventoryManagement.service.PutOutStorageTypeService;
+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.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 出库类型业务实现
+ */
+@Service
+@RequiredArgsConstructor
+public class PutOutStorageTypeServiceImpl implements PutOutStorageTypeService {
+    private final PutOutStorageTypeMapper putOutStorageTypeMapper;
+
+    /**
+     * 查询出库类型管理列表
+     * @param putOutStorage 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @Override
+    public TableDataInfo<PutOutStorageTypeVo> selectPutOutStorageTypePageList(PutOutStorageTypeBo putOutStorage, PageQuery pageQuery) {
+        QueryWrapper<PutOutStorageType> qw = new QueryWrapper<>();
+        qw.isNull("deletetime");
+        qw.like(putOutStorage.getID() != 0, "id", putOutStorage.getID());
+        qw.like(StringUtils.isNotBlank(putOutStorage.getName()), "name", putOutStorage.getName());
+        Page<PutOutStorageTypeVo> page = putOutStorageTypeMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 新增结果
+     */
+    @Override
+    public int insertPutOutStorageType(PutOutStorageTypeBo putOutStorageTypeBo) {
+        PutOutStorageType putOutStorageType = MapstructUtils.convert(putOutStorageTypeBo, PutOutStorageType.class);
+        return putOutStorageTypeMapper.insert(putOutStorageType);
+    }
+
+    /**
+     * 修改出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 修改结果
+     */
+    @Override
+    public int updatePutOutStorageType(PutOutStorageTypeBo putOutStorageTypeBo) {
+        PutOutStorageType putOutStorageType = MapstructUtils.convert(putOutStorageTypeBo, PutOutStorageType.class);
+        return putOutStorageTypeMapper.updateById(putOutStorageType);
+    }
+
+    /**
+     * 将指定id的出库类型移入回收站
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return  回收结果
+     */
+    @Override
+    public int deletePutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds) {
+        UpdateWrapper<PutOutStorageType> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", putOutStorageTypeIds);
+        updateWrapper.set("deletetime", new Date());
+        return putOutStorageTypeMapper.update(updateWrapper);
+    }
+
+    /**
+     * 查询回收站中的出库类型列表
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @Override
+    public TableDataInfo<PutOutStorageTypeVo> selectRecyclePutOutStorageTypeList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery) {
+        QueryWrapper<PutOutStorageType> qw = new QueryWrapper<>();
+        Map<String, Object> params = putOutStorageTypeBo.getParams();
+        qw.eq(0 != putOutStorageTypeBo.getID(), "id", putOutStorageTypeBo.getID());
+        qw.like(StringUtils.isNotBlank(putOutStorageTypeBo.getName()), "name", putOutStorageTypeBo.getName());
+        qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
+            "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
+        qw.isNotNull("deletetime");
+        Page<PutOutStorageTypeVo> page = putOutStorageTypeMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 还原回收站中指定id的出库类型
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 还原结果
+     */
+    @Override
+    public int backPutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds) {
+        UpdateWrapper<PutOutStorageType> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", putOutStorageTypeIds);
+        updateWrapper.set("deletetime", null);
+        return putOutStorageTypeMapper.update(updateWrapper);
+    }
+
+    /**
+     * 还原回收站中所有出库类型
+     * @return 还原结果
+     */
+    @Override
+    public int backPutOutStorageTypeAll() {
+        UpdateWrapper<PutOutStorageType> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("deletetime", null);
+        return putOutStorageTypeMapper.update(updateWrapper);
+    }
+
+    /**
+     * 销毁回收站中指定id的出库类型
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 销毁结果
+     */
+    @Override
+    public int deleteRecyclePutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds) {
+        QueryWrapper<PutOutStorageType> qw=new QueryWrapper<>();
+        qw.in("id",putOutStorageTypeIds);
+        qw.isNotNull("deletetime");
+        return putOutStorageTypeMapper.delete(qw);
+    }
+
+    /**
+     * 销毁回收站中所有出库类型
+     * @return 销毁结果
+     */
+    @Override
+    public int deleteRecyclePutOutStorageTypeAll() {
+        QueryWrapper<PutOutStorageType> qw=new QueryWrapper<>();
+        qw.isNotNull("deletetime");
+        return putOutStorageTypeMapper.delete(qw);
+    }
+
+}
+
+

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

@@ -4,16 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageMapper">
 
-    <insert id="insertInventory">
-        INSERT INTO fa_ykjp_storage_product (
-            warehouse_id,
-            storage_id,
-            product_id,
-            nums,
-            remark
-        )
-        values (#{warehouseId},#{storageId},#{productId},#{nums},#{remark})
-    </insert>
-
+<!--    <insert id="insert" useGeneratedKeys="true" keyProperty="id">-->
+<!--        INSERT INTO fa_ykjp_storage-->
+<!--        VALUES (#{code}, #{status}, #{otherColumn})-->
+<!--    </insert>-->
 
 </mapper>

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutInStorageProductMapper.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.PutInStorageProductMapper">
+
+</mapper>

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutOutStorageTypeMapper.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.PutOutStorageTypeMapper">
+
+</mapper>

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/FactoryServiceImpl.java

@@ -34,10 +34,11 @@ public class FactoryServiceImpl implements FactoryService {
     @Override
     public TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery){
         QueryWrapper<Factory> qw=new QueryWrapper<>();
+        qw.isNull("deletetime");
         qw.like(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
         qw.like(StringUtils.isNotBlank(factoryBo.getAddress()),"address",factoryBo.getAddress());
         qw.like(StringUtils.isNotBlank(factoryBo.getLinkman()),"linkman",factoryBo.getLinkman());
-        qw.isNull("deletetime");
+
         Page<FactoryVo> page= factoryMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
@@ -66,7 +67,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 将指定id的工厂移入回收站
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 删除结果
      */
     @Override
@@ -79,7 +80,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 还原回收站中指定id的工厂
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 还原结果
      */
     @Override
@@ -111,7 +112,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 销毁回收站中指定id的工厂
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 销毁结果
      */
     @Override