From 7964ad29dc282c472a56945b857343105463fd0a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 31 十月 2024 13:40:05 +0800
Subject: [PATCH] 入库呼叫agv取货
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 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..1b3ad84 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -71,6 +71,21 @@
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));
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
boolean sign = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -193,27 +208,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 +233,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