From fd9c9b8833101c1eafa27a63b35679435283a0da Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期日, 21 一月 2024 09:50:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index da56835..ba92e46 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -185,12 +185,12 @@
}
Map<String,Integer> map = new HashMap<>();
- map.put("J-1101",102);map.put("J-1102",101);
- map.put("J-1103",106);map.put("J-1104",105);
- map.put("J-1105",110);map.put("J-1106",109);
- map.put("J-1107",114);map.put("J-1108",113);
- map.put("J-1109",118);map.put("J-1110",117);
- map.put("J-1111",122);map.put("J-1112",121);
+ map.put("J-1102",102);map.put("J-1101",101);
+ map.put("J-1103",105);map.put("J-1104",106);
+ map.put("J-1105",109);map.put("J-1106",110);
+ map.put("J-1107",113);map.put("J-1108",114);
+ map.put("J-1109",117);map.put("J-1110",118);
+ map.put("J-1111",121);map.put("J-1112",122);
map.put("H-1102",300);map.put("H-1101",305);
map.put("G-1102",400);map.put("G-1101",405);
// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
@@ -269,10 +269,21 @@
StaDesc staDesc = new StaDesc();
if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("J")){
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).lt("crn_stn", 200));
+ .eq("crn_no",param.getTaskTunnel())
+ .eq("type_no",2)
+ .lt("stn_no",200));
+ }else if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("H")){
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no",param.getTaskTunnel())
+ .eq("type_no",2)
+ .lt("stn_no",400)
+ .gt("stn_no",200));
}else {
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).ge("crn_stn", 200));
+ .eq("crn_no",param.getTaskTunnel())
+ .eq("type_no",2)
+ .lt("stn_no",500)
+ .ge("stn_no",400));
}
param.setTargetLocationCode(staDesc.getStnNo().toString());
@@ -287,11 +298,11 @@
,r.toString()
,true
);
- return r;
+
}
- return null;
+ return R.ok();
}
//浠诲姟鍙栨秷鎺ュ彛
--
Gitblit v1.9.1