From dbc89d843a849218576f867e93f06fb8dd8a51df Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 13 九月 2024 16:54:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 78 ++++++++++----------------------------
1 files changed, 21 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index d2d4f7d..2d82d5e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -68,15 +68,24 @@
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ boolean sign = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
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 {
+ } else if (entry.getKey().equals("loc_no")){
wrapper.like(entry.getKey(), val);
+ } else {
+ if (entry.getKey().equals("loc_type1")){
+ sign=true;
+ }
+ wrapper.eq(entry.getKey(), val);
}
+ }
+ if (sign){
+ wrapper.and().ne("loc_sts","Y");
}
}
@@ -175,10 +184,16 @@
String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
// 鑾峰彇鍫嗗灈鏈哄彿
int crnNo = 0;
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
for (List<Integer> node : shelves.nodes){
+
if (node.contains(r)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+
break;
}
}
@@ -201,61 +216,10 @@
}
}
}
- locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
+ if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
+ locMastService.delete(new EntityWrapper<>());
+ }
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
- }
-
- @RequestMapping(value = "/locMast/convert/size/auth")
- @ManagerAuth(memo = "澶у皬搴撲綅杞崲")
- @Transactional
- public R convertSize(@RequestParam String param) {
- List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (LocMast entity : list){
- if (!entity.getCrnNo().equals(1) && !entity.getCrnNo().equals(4)){
- return R.error("璇烽�夋嫨1鍙枫��4鍙峰爢鍨涙満鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細"+entity.getLocNo());
- }
- if (!entity.getLocSts().equals("O") && !entity.getLocSts().equals("Y")){
- return R.error("璇烽�夋嫨绌洪棽銆佽鍚堝苟鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細"+entity.getLocNo());
- }
- }
- List<String> innermostSideLoc = Utils.getInnermostSideLoc(list);
- StringBuilder msg=new StringBuilder();
- for (String locNo : innermostSideLoc){
- String innermostSideLocLBR = Utils.getInnermostSideLocLBR(locNo);
- LocMast locMast1 = locMastService.selectById(innermostSideLocLBR);//娴�
- if (Cools.isEmpty(locMast1)){
- msg.append("璇烽�夋嫨娴呭簱浣嶅瓨鍦ㄧ殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(innermostSideLocLBR).append("/n");
- continue;
- }
- if (!locMast1.getLocSts().equals("O")){
- msg.append("璇烽�夋嫨娴呭簱浣嶇┖闂茬殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(locMast1.getLocNo()).append("/n");
- continue;
- }
- LocMast locMast = locMastService.selectById(locNo);//娣�
- if (Cools.isEmpty(locMast)){
- msg.append("璇烽�夋嫨娣卞簱浣嶅瓨鍦ㄧ殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(locNo).append("/n");
- continue;
- }
- if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("O")){
- locMast1.setLocType1((short)2);
- locMast.setLocType1((short)2);
- locMast.setLocSts("Y");
- }else if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("Y")){
- locMast1.setLocType1((short)1);
- locMast.setLocType1((short)1);
- locMast.setLocSts("O");
- }else {
- msg.append("璇烽�夋嫨娣卞簱浣嶅簱浣嶇┖闂层�佽鍚堝苟鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細").append(locMast.getLocNo()).append("/n");
- continue;
- }
- locMastService.updateById(locMast1);
- locMastService.updateById(locMast);
- }
- return R.ok(msg);
}
}
--
Gitblit v1.9.1