From 76517dc3a5521b6bb0dfb2e842dd3c4a0123f8a7 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Wed, 11 Mar 2026 10:06:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/api/controller/ToWmsApiController.java | 8 ++++++++ .../out/outStockoutDetail/domain/OutStockoutDetail.java | 6 +++--- ruoyi-ui/src/views/out/outStockoutManage.vue | 4 ++-- ruoyi-ui/src/views/stock/pointOut.vue | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java index be1c869..93b0481 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java @@ -47,6 +47,14 @@ public class ToWmsApiController { requestLogService.insertRequestLog(requestLog); return ajaxResult; } + @PostMapping("/sendCargoSpace") + public AjaxResult sendCargoSpace(@RequestBody RequestEnter requestEnter) { + AjaxResult ajaxResult = toWmsService.requestEnterByTaskNo(requestEnter); + RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求",ajaxResult); + requestLogService.insertRequestLog(requestLog); + return ajaxResult; + } + /** * 请求补码作业 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java index 3761d77..4027dd2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java @@ -48,7 +48,7 @@ public class OutStockoutDetail extends BaseEntity /** 计划数量（箱） */ @Excel(name = "计划数量", readConverterExp = "箱=") - private String quantityX; + private BigDecimal quantityX; /** 计划数量（件） */ @Excel(name = "计划数量", readConverterExp = "件=") @@ -407,12 +407,12 @@ public class OutStockoutDetail extends BaseEntity return quantity; } - public void setQuantityX(String quantityX) + public void setQuantityX(BigDecimal quantityX) { this.quantityX = quantityX; } - public String getQuantityX() + public BigDecimal getQuantityX() { return quantityX; } diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index c796934..6109f29 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -379,8 +379,8 @@ export default { }, // 出口选项 exitOptions: [ - { exitId: '1', exitName: '一楼'}, - { exitId: '2', exitName: '二楼'}, + { exitId: '1', exitName: '缓存'}, + { exitId: '2', exitName: '线边'}, ], diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue index af34c89..82dd584 100644 --- a/ruoyi-ui/src/views/stock/pointOut.vue +++ b/ruoyi-ui/src/views/stock/pointOut.vue @@ -244,8 +244,8 @@ export default { }, // 出口选项 exitOptions: [ - {exitId: '1', exitName: '一楼'}, - {exitId: '2', exitName: '二楼'}, + {exitId: '1', exitName: '缓存'}, + {exitId: '2', exitName: '线边'}, ],