diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java index b2cab75e..df09b770 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java @@ -1,129 +1,128 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck; + +import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.StorageSaveReqVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO; +import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; import javax.validation.*; -package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck; - -import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.StorageSaveReqVO; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO; -import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.time.LocalDateTime; -import java.util.*; -import java.io.IOException; - -import com.chanko.yunxi.mes.framework.common.pojo.PageParam; -import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; -import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; -import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; - -import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; - -import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; -import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO; -import com.chanko.yunxi.mes.module.heli.service.storagecheck.StorageCheckService; - -@Tag(name = "管理后台 - 入/出库盘点") -@RestController -@RequestMapping("/heli/storage-check") -@Validated -public class StorageCheckController { - - @Resource - private StorageCheckService storageCheckService; - - @Resource - private StorageCheckMatService storageCheckMatService; - - @PostMapping("/create") - @Operation(summary = "创建入/出库盘点") - @PreAuthorize("@ss.hasPermission('heli:storage-check:create')") - public CommonResult createStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO createReqVO) { - return success(storageCheckService.createStorageCheck(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新入/出库盘点") - @PreAuthorize("@ss.hasPermission('heli:storage-check:update')") - public CommonResult updateStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) { - storageCheckService.updateStorageCheck(updateReqVO); - return success(true); - } - - @PutMapping("/update-status") - @Operation(summary = "更新盘点状态") - @PreAuthorize("@ss.hasPermission('heli:storage:update')") - public CommonResult updateStorageCheckStatus(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) { - - // 提交或者删除时记录相关操作人 - LocalDateTime currTime = LocalDateTime.now(); - if(updateReqVO.getStatus().equals(2)){ - // 已提交时间更新 - updateReqVO.setKeeperTime(currTime); - } else if(updateReqVO.getStatus().equals(3)){ - // 已删除时间更新 - updateReqVO.setCancelTime(currTime); - } - // 盘点信息保存 - storageCheckService.updateStorageCheck(updateReqVO); - - // TODO保存物料列表信息 - - // TODO生成入库/出库单据 - - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除入/出库盘点") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('heli:storage-check:delete')") - public CommonResult deleteStorageCheck(@RequestParam("id") Long id) { - storageCheckService.deleteStorageCheck(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得入/出库盘点") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('heli:storage-check:query')") - public CommonResult getStorageCheck(@RequestParam("id") Long id) { - StorageCheckDO storageCheck = storageCheckService.getStorageCheck(id); - return success(BeanUtils.toBean(storageCheck, StorageCheckRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得入/出库盘点分页") - @PreAuthorize("@ss.hasPermission('heli:storage-check:query')") - public CommonResult> getStorageCheckPage(@Valid StorageCheckPageReqVO pageReqVO) { - PageResult pageResult = storageCheckService.getStorageCheckPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, StorageCheckRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出入/出库盘点 Excel") - @PreAuthorize("@ss.hasPermission('heli:storage-check:export')") - @OperateLog(type = EXPORT) - public void exportStorageCheckExcel(@Valid StorageCheckPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = storageCheckService.getStorageCheckPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "入/出库盘点.xls", "数据", StorageCheckRespVO.class, - BeanUtils.toBean(list, StorageCheckRespVO.class)); - } - -} +import javax.servlet.http.*; +import java.time.LocalDateTime; +import java.util.*; +import java.io.IOException; + +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; + +import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; + +import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; +import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO; +import com.chanko.yunxi.mes.module.heli.service.storagecheck.StorageCheckService; + +@Tag(name = "管理后台 - 入/出库盘点") +@RestController +@RequestMapping("/heli/storage-check") +@Validated +public class StorageCheckController { + + @Resource + private StorageCheckService storageCheckService; + + @Resource + private StorageCheckMatService storageCheckMatService; + + @PostMapping("/create") + @Operation(summary = "创建入/出库盘点") + @PreAuthorize("@ss.hasPermission('heli:storage-check:create')") + public CommonResult createStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO createReqVO) { + return success(storageCheckService.createStorageCheck(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新入/出库盘点") + @PreAuthorize("@ss.hasPermission('heli:storage-check:update')") + public CommonResult updateStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) { + storageCheckService.updateStorageCheck(updateReqVO); + return success(true); + } + + @PutMapping("/update-status") + @Operation(summary = "更新盘点状态") + @PreAuthorize("@ss.hasPermission('heli:storage:update')") + public CommonResult updateStorageCheckStatus(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) { + + // 提交或者删除时记录相关操作人 + LocalDateTime currTime = LocalDateTime.now(); + if(updateReqVO.getStatus().equals(2)){ + // 已提交时间更新 + updateReqVO.setKeeperTime(currTime); + } else if(updateReqVO.getStatus().equals(3)){ + // 已删除时间更新 + updateReqVO.setCancelTime(currTime); + } + // 盘点信息保存 + storageCheckService.updateStorageCheck(updateReqVO); + + // TODO保存物料列表信息 + + // TODO生成入库/出库单据 + + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除入/出库盘点") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('heli:storage-check:delete')") + public CommonResult deleteStorageCheck(@RequestParam("id") Long id) { + storageCheckService.deleteStorageCheck(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得入/出库盘点") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:storage-check:query')") + public CommonResult getStorageCheck(@RequestParam("id") Long id) { + StorageCheckDO storageCheck = storageCheckService.getStorageCheck(id); + return success(BeanUtils.toBean(storageCheck, StorageCheckRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得入/出库盘点分页") + @PreAuthorize("@ss.hasPermission('heli:storage-check:query')") + public CommonResult> getStorageCheckPage(@Valid StorageCheckPageReqVO pageReqVO) { + PageResult pageResult = storageCheckService.getStorageCheckPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, StorageCheckRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出入/出库盘点 Excel") + @PreAuthorize("@ss.hasPermission('heli:storage-check:export')") + @OperateLog(type = EXPORT) + public void exportStorageCheckExcel(@Valid StorageCheckPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = storageCheckService.getStorageCheckPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "入/出库盘点.xls", "数据", StorageCheckRespVO.class, + BeanUtils.toBean(list, StorageCheckRespVO.class)); + } + +}