From 44b6b79dd5dee0ebbd2d11b08abbc2be275bed58 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 16:10:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 723e3f6..a0cc17c 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -46,6 +46,12 @@
private WrkMastLogService wrkMastLogService;
@Resource
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private BasAreasService basAreasService;
+ @Autowired
+ private LocAroundBindService locAroundBindService;
+ @Autowired
+ private BasDeviceService basDeviceService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -76,6 +82,7 @@
@RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ wrapper.eq("deleted", 0);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
@@ -282,6 +289,15 @@
if (Cools.isEmpty(basWhsType)) {
return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
}
+
+ if (Objects.isNull(param.getAreaId())) {
+ throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒锛�");
+ }
+ BasAreas basAreas = basAreasService.selectById(param.getAreaId());
+ if (Cools.isEmpty(basAreas)) {
+ return R.error("搴撳尯涓嶅瓨鍦紒锛侊紒");
+ }
+
for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
@@ -320,6 +336,8 @@
locMast.setAppeUser(getUserId());
locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
+ locMast.setAreaId(basAreas.getId());
+ locMast.setAreaName(basAreas.getName());
locMast.setModiTime(now);
locMast.setWhsType(basWhsType.getId());
list.add(locMast);
@@ -335,4 +353,52 @@
return R.error("鍒濆鍖栧け璐�===>" + e.getMessage());
}
}
+
+ @GetMapping(value = "/locMast/jt")
+ @ManagerAuth
+ public R jt() {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("whs_type", 2)
+ .eq("loc_sts", "O")
+ .orderBy("loc_no"));
+ //鏈哄彴鍙�
+ long i = 1;
+ //鏈哄彴鎺掑簭
+ int j = 0;
+ int[] arr = {3,4,1,5,2,6};
+ for (LocMast locMast : locMasts) {
+ LocAroundBind locAroundBind = new LocAroundBind(
+ i,
+ i+"",
+ locMast.getLocNo(),
+ "O",
+ arr[j++]
+ );
+ locAroundBindService.insert(locAroundBind);
+ if(j==6){
+ j = 0;
+ i++;
+ }
+ }
+ return R.ok();
+ }
+
+ @GetMapping(value = "/locMast/addjt")
+ @ManagerAuth
+ public R addjt() {
+ Date date = new Date();
+ for (int i =1 ;i<52;i++){
+ BasDevice basDevice =new BasDevice(
+ i+"",
+ i+"",
+ date,
+ "9995",
+ date,
+ "9995",
+ 1
+ );
+ basDeviceService.insert(basDevice);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.1