From 440040fcd67579bc9fff14a95765314e7d6f04f4 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 25 三月 2025 18:02:49 +0800 Subject: [PATCH] 修改 # 库位绑定库位类型优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 4 ++-- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java | 3 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java | 8 ++++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java index 817f37d..c1be3fc 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java @@ -57,10 +57,14 @@ @OperationLog("Create loc areas mats") @PostMapping("/locAreaMat/save") public R save(@RequestBody LocAreaMat locAreaMat) { + if (Objects.isNull(locAreaMat.getWarehouseId())) { + return R.error("浠撳簱涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(locAreaMat.getAreaId())) { + return R.error("搴撳尯涓嶈兘涓虹┖锛侊紒"); + } locAreaMat.setCreateBy(getLoginUserId()); - locAreaMat.setCreateTime(new Date()); locAreaMat.setUpdateBy(getLoginUserId()); - locAreaMat.setUpdateTime(new Date()); if (!locAreaMatService.save(locAreaMat)) { return R.error("Save Fail"); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java index 9ead924..b91b7ee 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java @@ -25,9 +25,6 @@ @ApiModelProperty("鍒嗗尯ID") private Long locAreaId; - @ApiModelProperty("搴撲綅绫诲瀷") - private List<Long> typeIds; - @ApiModelProperty("搴撲綅淇℃伅") private Loc loc; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java index 15f42fa..e2de606 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java @@ -50,8 +50,8 @@ } String join = locs.getLoc().getType(); - if (!Objects.isNull(locs.getTypeIds()) && !locs.getTypeIds().isEmpty()) { - join = StringUtils.join(locs.getTypeIds(), ","); + if (!Objects.isNull(loc.getTypeIds()) && !loc.getTypeIds().isEmpty()) { + join = StringUtils.join(loc.getTypeIds(), ","); } boolean update = this.update(new LambdaUpdateWrapper<Loc>() .in(Loc::getId, locs.getId()) -- Gitblit v1.9.1