From f5f7889cd423667b4b6d63d12ff9c78750952262 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 17 五月 2023 16:48:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 4b17fd5..f096994 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -19,6 +19,7 @@
import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -30,6 +31,14 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Value("${channel.equipmentRow}")
+ private Integer equipmentRow;
+ @Value("${channel.quietRow}")
+ private Integer quietRow;
+ @Value("${channel.equipmentCount}")
+ private Integer equipmentCount;
+ @Value("${channel.channelMax}")
+ private Integer channelMax;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -73,7 +82,11 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ if (entry.getKey().equals("loc_type2")){
+ wrapper.eq(entry.getKey(), val);
+ }else {
+ wrapper.like(entry.getKey(), val);
+ }
}
}
}
@@ -188,18 +201,27 @@
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
- locMast.setLocType2(param.getLocType2());
- locMast.setLocType3(param.getLocType3());
+ locMast.setLocType1((short)0);
+ locMast.setLocType2((short)0);
+ locMast.setLocType3((short)0);
locMast.setAppeUser(getUserId());
locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
+ if (r==equipmentRow && b<3){
+ locMast.setChannel(l+(b-2)*param.getEndLev());
+ locMast.setLocType1((short)1);
+ int i = (locMast.getChannel() - 1) / (channelMax / equipmentCount) + 1;
+ locMast.setLocType2((short)i);
+ }
+ if (r==quietRow && b<3){
+ locMast.setLocType1((short)2);
+ }
list.add(locMast);
}
}
}
-// locMastService.delete(new EntityWrapper<>());
+ locMastService.delete(new EntityWrapper<>());
locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
@@ -216,13 +238,15 @@
}
private R updateAll(String param,String locSts){
- List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
+ List<LocMast> locMasts = JSONArray.parseArray(param, LocMast.class);
+ if (Cools.isEmpty(locMasts)){
return R.error();
}
int locType2=99;
- for (LocMast locMast : list){
- if (!locMast.getLocSts().equals(locSts)){
+ for (LocMast locMast : locMasts){
+ if (Cools.isEmpty(locMast.getLocType2()) || locMast.getLocType2() == 0){
+ return R.error("璇烽�夋嫨娴嬭瘯搴撲綅");
+ }else if (!locMast.getLocSts().equals(locSts)){
if (locSts.equals("O")){
return R.error("姝よ澶囦笅鏈夊簱浣嶉潪绌�,搴撲綅鍙凤細"+locMast.getLocNo()+"\t璇锋煡鐪嬪簱浣�");
}else if (locSts.equals("X")){
@@ -239,7 +263,7 @@
}else if (locSts.equals("X")){
locSts="O";
}
- for (LocMast locMast : list){
+ for (LocMast locMast : locMasts){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error("搴撲綅鍙蜂负绌猴細"+locMast);
}
--
Gitblit v1.9.1