From 49a09e24aa65e9f3839a42447ac59226dd51af93 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 21 Dec 2023 19:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BC=A0=E8=BE=93=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../location/LocationController.java | 11 ++++----- .../location/vo/LocationRecommendVO.java | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationRecommendVO.java diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index 253d13cb..074001a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -210,13 +210,12 @@ public class LocationController { } @PermitAll - @GetMapping("/recommendLocation") - @Operation(summary = "推荐库位(测试用)") + @PostMapping("/recommendLocation") + @Operation(summary = "推荐库位") @PreAuthorize("@ss.hasPermission('wms:location:recommendLocation')") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - public CommonResult inspectLocation(@RequestParam("supplierCode") String supplierCode,@RequestParam("itemCode") String itemCode, @RequestParam("batch") String batch, @RequestParam("batch") String inventoryStatus) { - RuleRespVO ruleRespVO = ruleService.grounding(supplierCode, null, itemCode, inventoryStatus, null, null, null, null, null); - return success(locationService.recommendLocation(ruleRespVO, itemCode, batch, inventoryStatus)); + public CommonResult inspectLocation(@Valid @RequestBody LocationRecommendVO recommendVO) { + RuleRespVO ruleRespVO = ruleService.grounding(recommendVO.getSupplierCode(), null, recommendVO.getItemCode(), recommendVO.getInventoryStatus(), null, null, null, null, null); + return success(locationService.recommendLocation(ruleRespVO, recommendVO.getItemCode(), recommendVO.getItemCode(), recommendVO.getItemCode())); } @PostMapping("/validate") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationRecommendVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationRecommendVO.java new file mode 100644 index 00000000..e1f21c3e --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationRecommendVO.java @@ -0,0 +1,24 @@ +package com.win.module.wms.controller.location.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Schema(description = "APP直接上架校验库位和item") +@Data +public class LocationRecommendVO { + + @Schema(description = "物品代码") + @NotBlank(message = "物品代码不能为空") + private String itemCode; + + @Schema(description = "供应商代码") + private String supplierCode; + + @Schema(description = "批次") + private String batch; + + @Schema(description = "库存状态") + private String inventoryStatus; +}