Commit 2eb3e8dfb0f3243433c24383a3b4e5f4c9c56119
1 parent
c76f8fdd
入库出库迁移
Showing
4 changed files
with
3 additions
and
16 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialtype/MaterialTypeController.java
| @@ -80,7 +80,7 @@ public class MaterialTypeController { | @@ -80,7 +80,7 @@ public class MaterialTypeController { | ||
| 80 | return success(BeanUtils.toBean(materialType, MaterialTypeRespVO.class)); | 80 | return success(BeanUtils.toBean(materialType, MaterialTypeRespVO.class)); |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | - @GetMapping("/listForPage") | 83 | + @GetMapping("/page") |
| 84 | @Operation(summary = "获得物料类型分页") | 84 | @Operation(summary = "获得物料类型分页") |
| 85 | @PreAuthorize("@ss.hasPermission('garden:material-type:query')") | 85 | @PreAuthorize("@ss.hasPermission('garden:material-type:query')") |
| 86 | public CommonResult<PageResult<MaterialTypeRespVO>> getMaterialTypePage(@Valid MaterialTypePageReqVO pageReqVO) { | 86 | public CommonResult<PageResult<MaterialTypeRespVO>> getMaterialTypePage(@Valid MaterialTypePageReqVO pageReqVO) { |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/materialtype/MaterialTypeDO.java
| @@ -63,18 +63,6 @@ public class MaterialTypeDO extends BaseDO { | @@ -63,18 +63,6 @@ public class MaterialTypeDO extends BaseDO { | ||
| 63 | * 备注 | 63 | * 备注 |
| 64 | */ | 64 | */ |
| 65 | private String remark; | 65 | private String remark; |
| 66 | - /** | ||
| 67 | - * 状态（0正常 1停用） | ||
| 68 | - */ | ||
| 69 | - private String status; | ||
| 70 | - /** | ||
| 71 | - * 创建者 | ||
| 72 | - */ | ||
| 73 | - private String creator; | ||
| 74 | - /** | ||
| 75 | - * 更新者 | ||
| 76 | - */ | ||
| 77 | - private String updater; | ||
| 78 | 66 | ||
| 79 | 67 | ||
| 80 | } | 68 | } |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java
| @@ -116,10 +116,10 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ | @@ -116,10 +116,10 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ | ||
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | @Override | 118 | @Override |
| 119 | - public void deleteMaterialInventoryOutListByIds(List<Long> ids) { | 119 | + public void deleteMaterialInventoryOutListByIds(List<Long> ids) { |
| 120 | // 删除 | 120 | // 删除 |
| 121 | materialInventoryOutMapper.deleteByIds(ids); | 121 | materialInventoryOutMapper.deleteByIds(ids); |
| 122 | - } | 122 | + } |
| 123 | 123 | ||
| 124 | 124 | ||
| 125 | private void validateMaterialInventoryOutExists(Long id) { | 125 | private void validateMaterialInventoryOutExists(Long id) { |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialtype/MaterialTypeServiceImpl.java
| @@ -54,7 +54,6 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { | @@ -54,7 +54,6 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { | ||
| 54 | MaterialTypeDO materialType = BeanUtils.toBean(createReqVO, MaterialTypeDO.class); | 54 | MaterialTypeDO materialType = BeanUtils.toBean(createReqVO, MaterialTypeDO.class); |
| 55 | materialType.setParentTypeId(createReqVO.getTypeId()); | 55 | materialType.setParentTypeId(createReqVO.getTypeId()); |
| 56 | materialType.setMaterialParentTypeId(createReqVO.getMaterialTypeId()); | 56 | materialType.setMaterialParentTypeId(createReqVO.getMaterialTypeId()); |
| 57 | - materialType.setStatus("0"); | ||
| 58 | materialType.setCreator(String.valueOf(getLoginUserDeptId())); | 57 | materialType.setCreator(String.valueOf(getLoginUserDeptId())); |
| 59 | materialType.setUpdater(materialType.getCreator()); | 58 | materialType.setUpdater(materialType.getCreator()); |
| 60 | materialTypeMapper.insert(materialType); | 59 | materialTypeMapper.insert(materialType); |