From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 62e55f7..710ea2e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -82,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_type1")){
+ wrapper.eq(entry.getKey(), val);
+ }else {
+ wrapper.like(entry.getKey(), val);
+ }
}
}
}
@@ -197,20 +201,20 @@
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){
+ 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){
+ if (r==quietRow && b<3){
locMast.setLocType1((short)2);
}
list.add(locMast);
@@ -234,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")){
@@ -257,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