From f066939685f578336884b86bf001bf9fab19d488 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 30 十一月 2022 10:37:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 347c43f..a5aea8f 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -65,14 +65,15 @@
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -95,9 +96,12 @@
return R.error();
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
+ if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ }
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
- if (oldLocMast.getLocType().equals("R") || oldLocMast.getLocType().equals("F")) {
- if (locMast.getLocType().equals("O") || locMast.getLocType().equals("D")) {
+ if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
+ if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
}
}
@@ -176,25 +180,26 @@
break;
}
}
+ Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
- locMast.setLocType("O");
+ locMast.setLocSts("O");
locMast.setRow1(r); // 鎺�
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- if (null != param.getWhsType()) {
- locMast.setWhsType(Long.valueOf(param.getWhsType()));
- }
+ locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
+ locMast.setLocType2(param.getLocType2());
+ locMast.setLocType3(param.getLocType3());
locMast.setAppeUser(getUserId());
- locMast.setAppeTime(new Date());
+ locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
list.add(locMast);
}
}
}
- locMastService.delete(new EntityWrapper<>());
+// locMastService.delete(new EntityWrapper<>());
locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
--
Gitblit v1.9.1