Эх сурвалжийг харах

fix:修改和补充注释

kgy 5 сар өмнө
parent
commit
b1ec475a8c

+ 3 - 0
.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

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

@@ -10,40 +10,93 @@ 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 +105,11 @@ public class PutInStorageTypeController extends BaseController {
         }
         return R.fail("该回收站中不存在此入库类型或已被删除");
     }
+
+    /**
+     * 销毁回收站中所有入库类型
+     * @return 销毁结果
+     */
     @DeleteMapping("recycle/all")
     public R<Void> deleteRecyclePutInStorageTypeAll(){
         return toAjax(putInStorageTypeService.deleteRecyclePutInStorageTypeAll());

+ 3 - 1
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 {

+ 3 - 0
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 {

+ 3 - 0
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 {

+ 3 - 1
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> {
 }

+ 48 - 0
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();
 }

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

@@ -19,10 +19,20 @@ 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<>();
@@ -31,16 +41,34 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         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 +76,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 +95,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 +108,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 +132,11 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         qw.isNotNull("deletetime");
         return putInStorageTypeMapper.delete(qw);
     }
+
+    /**
+     * 销毁回收站中所有的入库类型
+     * @return 销毁结果
+     */
     @Override
     public int deleteRecyclePutInStorageTypeAll() {
         QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();

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

@@ -66,7 +66,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 将指定id的工厂移入回收站
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 删除结果
      */
     @Override
@@ -79,7 +79,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 还原回收站中指定id的工厂
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 还原结果
      */
     @Override
@@ -111,7 +111,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 销毁回收站中指定id的工厂
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 销毁结果
      */
     @Override