From 1c02f5b648cd3c58a7db7dcec761071d5daabb26 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 20 八月 2024 13:24:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeBindController.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeBindController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeBindController.java
index 28a1350..fad5aef 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeBindController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeBindController.java
@@ -4,6 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.Loc;
+import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
+import com.zy.asrs.wms.asrs.entity.param.InitLocTypeBindParam;
+import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -14,6 +18,7 @@
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -28,6 +33,8 @@
@Autowired
private LocTypeBindService locTypeBindService;
+ @Autowired
+ private LocService locService;
@PreAuthorize("hasAuthority('asrs:locTypeBind:list')")
@PostMapping("/locTypeBind/page")
@@ -50,6 +57,34 @@
}
@PreAuthorize("hasAuthority('asrs:locTypeBind:save')")
+ @OperationLog("鍒濆鍖栧簱浣嶇被鍨嬬粦瀹�")
+ @PostMapping("/locTypeBind/init")
+ @Transactional
+ public R init(@RequestBody InitLocTypeBindParam param) {
+ LambdaQueryWrapper<Loc> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.ge(Loc::getRow1, param.getStartRow());
+ queryWrapper.le(Loc::getRow1, param.getTargetRow());
+ queryWrapper.ge(Loc::getBay1, param.getStartBay());
+ queryWrapper.le(Loc::getBay1, param.getTargetBay());
+ queryWrapper.ge(Loc::getLev1, param.getStartLev());
+ queryWrapper.le(Loc::getLev1, param.getTargetLev());
+
+ List<Loc> list = locService.list(queryWrapper);
+ if (list.isEmpty()) {
+ return R.error("鏈壘鍒板簱浣嶄俊鎭�");
+ }
+
+ for (Loc loc : list) {
+ LocTypeBind locTypeBind = new LocTypeBind();
+ locTypeBind.setLocId(loc.getId());
+ locTypeBind.setTypeId(param.getTypeId());
+ locTypeBindService.save(locTypeBind);
+ }
+
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:locTypeBind:save')")
@OperationLog("娣诲姞搴撲綅绫诲瀷缁戝畾")
@PostMapping("/locTypeBind/save")
public R save(@RequestBody LocTypeBind locTypeBind) {
--
Gitblit v1.9.1