From 130734fae9297d84be9ea6d50a8e8c1a7f3747ce Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 21 四月 2025 16:04:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 56cda69..37db305 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -17,12 +17,11 @@
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.utils.Utils;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
+import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -67,6 +66,23 @@
excludeTrash(param);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+ RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/locMast/crn/list/auth")
+ @ManagerAuth
+ public R crnList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ wrapper.in("crn_no", 1,2);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -193,27 +209,24 @@
String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
// 鑾峰彇鍫嗗灈鏈哄彿
int crnNo = 0;
- if (basWhs.getIdentifying().equals("1") || basWhs.getIdentifying().equals("3")){
- try{
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
- for (List<Integer> node : shelves.nodes){
+ try{
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
+ for (List<Integer> node : shelves.nodes){
- if (node.contains(r)) {
- if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
- crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
- }else {
- crnNo = shelves.nodes.indexOf(node) + 1;
- }
-
- break;
+ if (node.contains(r)) {
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
}
+
+ break;
}
- }catch (Exception e){
- throw new Exception("瑙ｆ瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝ｇ‘鐨勬暟鎹�!!!");
}
- }else {
- crnNo = param.getStaCrn();
+ }catch (Exception e){
+ throw new Exception("瑙ｆ瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝ｇ‘鐨勬暟鎹�!!!");
}
+
Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
@@ -221,7 +234,7 @@
locMast.setRow1(r); // 鎺�
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
- locMast.setGro1(0); // 缁�
+ locMast.setGro1(r); // 缁�
locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
locMast.setLocType2(param.getLocType2());
--
Gitblit v1.9.1