From 180a71c6cce5954cbd774db63a968f8f61994e4a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 21 三月 2025 13:33:55 +0800 Subject: [PATCH] 修改 # 库位初始化添加空管 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 12 ++++++------ rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java | 5 +++-- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java | 4 ++++ rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 24 ++++++++++++++++++++++++ rsf-server/src/main/resources/application-dev.yml | 2 +- 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java index b99f16b..5c18951 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java @@ -166,6 +166,8 @@ if (Objects.isNull(locs)) { throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } + locs.setCreateBy(getLoginUser().getId()); + locs.setUpdateBy(getLoginUser().getId()); return locService.batchBindLocs(locs); } @@ -177,9 +179,31 @@ if (Objects.isNull(param)) { throw new CoolException("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�"); } + if (Objects.isNull(param.getWarehouseId())) { + throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒"); + } if (Objects.isNull(param.getAreaId())) { throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒"); } + if (Objects.isNull(param.getStartRow())) { + throw new CoolException("璧峰鎺掍笉鑳戒负绌猴紒锛�"); + } + if (Objects.isNull(param.getEndRow())) { + throw new CoolException("缁堟鎺掍笉鑳戒负绌猴紒锛�"); + } + if (Objects.isNull(param.getStartBay())) { + throw new CoolException("璧峰鍒椾笉鑳戒负绌猴紒锛�"); + } + if (Objects.isNull(param.getEndBay())) { + throw new CoolException("缁堟鍒椾笉鑳戒负绌猴紒锛�"); + } + if (Objects.isNull(param.getStartLev())) { + throw new CoolException("璧峰灞備笉鑳戒负绌猴紒锛�"); + } + if (Objects.isNull(param.getEndLev())) { + throw new CoolException("缁堟灞備笉鑳戒负绌猴紒锛�"); + } + return locService.initLocs(param); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java index 4fe8167..0014dea 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java @@ -15,6 +15,9 @@ @Accessors(chain = true) public class LocMastInitParam implements Serializable { + @ApiModelProperty("浠撳簱ID") + private Long warehouseId; + @ApiModelProperty("搴撳尯ID") private Long areaId; @@ -46,7 +49,5 @@ @NotBlank(message = "搴撲綅绫诲瀷") private String type; - @ApiModelProperty("瀹界獎绫诲瀷") - private String locType; } 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 c3108d3..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 @@ -28,4 +28,8 @@ @ApiModelProperty("搴撲綅淇℃伅") private Loc loc; + private Long createBy; + + private Long updateBy; + } 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 6cb941a..91c28af 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 @@ -79,11 +79,12 @@ if (this.baseMapper.delete(new LambdaUpdateWrapper<>()) < 0) { throw new CoolException("鏁版嵁搴撳垵濮嬪寲澶辫触锛氳�佹暟鎹垹闄ゅけ璐ワ紒锛�"); } - WarehouseAreas warehouseAreas = warehouseAreasService.getById(param.getAreaId()); + WarehouseAreas warehouseAreas = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>() + .eq(WarehouseAreas::getWarehouseId, param.getWarehouseId()) + .eq(WarehouseAreas::getId, param.getAreaId())); if (Objects.isNull(warehouseAreas)) { throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�"); } - List<Loc> list = new ArrayList<>(); for (int r = param.getStartRow(); r <= param.getEndRow(); r++) { for (int b = param.getStartBay(); b <= param.getEndBay(); b++) { @@ -99,7 +100,6 @@ .setAreaId(param.getAreaId()) .setWarehouseId(warehouseAreas.getWarehouseId()) .setType(param.getType()); - list.add(loc); } } @@ -146,8 +146,7 @@ if (locs.getId().isEmpty()) { throw new CoolException("搴撲綅ID涓嶈兘涓虹┖锛侊紒"); } - Loc loc = locs.getLoc(); - if (Objects.isNull(loc)) { + if (Objects.isNull(locs.getLocAreaId())) { throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒"); } List<LocArea> locAreas = locAreaService.list(new LambdaQueryWrapper<LocArea>().eq(LocArea::getId, locs.getLocAreaId())); @@ -157,7 +156,8 @@ List<LocAreaRela> relas = new ArrayList<>(); locs.getId().forEach(id -> { LocAreaRela locAreaRela = new LocAreaRela(); - locAreaRela.setLocId(id).setLocAreaId(locs.getLocAreaId()); + locAreaRela.setLocId(id) + .setLocAreaId(locs.getLocAreaId()); relas.add(locAreaRela); }); if (!locAreaRelaService.saveBatch(relas)) { diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml index 294179e..3f84f94 100644 --- a/rsf-server/src/main/resources/application-dev.yml +++ b/rsf-server/src/main/resources/application-dev.yml @@ -12,7 +12,7 @@ matching-strategy: ANT_PATH_MATCHER datasource: driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root # url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: rsf -- Gitblit v1.9.1