From 2bf65500161ae37c120d0d9af8f6d8dd7afdec75 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 16 五月 2023 14:53:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index ae31ef8..f096994 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_type2")){
+ 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);
--
Gitblit v1.9.1