From c0f6e2b954cdcbbf3cb5e309523c57b90768f43b Mon Sep 17 00:00:00 2001 From: xia Date: Tue, 5 Jul 2022 13:19:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=202.=E6=A1=A3=E6=A1=88=E7=9B=92=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=87=BA=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StorageController.java | 29 +++++++++++++++++++ .../modules/archives/domain/ArchivesCase.java | 4 +++ .../service/impl/ArchivesCaseServiceImpl.java | 1 + 3 files changed, 34 insertions(+) create mode 100644 archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java new file mode 100644 index 0000000..6728450 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java @@ -0,0 +1,29 @@ +package com.storeroom.modules.archives.controller; + +import com.storeroom.modules.archives.service.ArchivesCaseService; +import com.storeroom.utils.ApiResponse; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@Api(tags = "出入库管理") +@RequestMapping("/api/storage") +public class StorageController { + + private final ArchivesCaseService caseService; + + @ApiOperation("入库列表") + @GetMapping("/readyInto") + public ApiResponse readyInto( + String tid, String caseName,String barcode, Pageable page + ){ + return ApiResponse.success(caseService.initCaseList(tid,caseName,barcode,page)); + } + +} diff --git a/archives/src/main/java/com/storeroom/modules/archives/domain/ArchivesCase.java b/archives/src/main/java/com/storeroom/modules/archives/domain/ArchivesCase.java index ca9a19f..da17ac0 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/domain/ArchivesCase.java +++ b/archives/src/main/java/com/storeroom/modules/archives/domain/ArchivesCase.java @@ -49,4 +49,8 @@ public class ArchivesCase extends BaseEntity implements Serializable { @ApiModelProperty(value = "存放数量") private Integer depositNum; + @Column(name = "storage_type") + @ApiModelProperty(value = "入库状态 0.未入 1.待入 2.已入") + private Integer storageType; + } diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java index 8fc48a4..a06e2ab 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java @@ -97,6 +97,7 @@ public class ArchivesCaseServiceImpl implements ArchivesCaseService { archivesCase.setId(NanoIdUtils.randomNanoId()); archivesCase.setCaseType(0); archivesCase.setDepositNum(0); + archivesCase.setStorageType(0); } archivesCase.setCaseName(dto.getCaseName()); archivesCase.setBarcode(dto.getBarcode());