Merge branch 'b_lms' into master_merge
This commit is contained in:
@@ -616,7 +616,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
|
|||||||
|
|
||||||
// 最小木箱数的巷道
|
// 最小木箱数的巷道
|
||||||
List<JSONObject> boxNumList = blockBoxList.stream()
|
List<JSONObject> boxNumList = blockBoxList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("box_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("box_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
return boxNumList.get(0).getString("block_num");
|
return boxNumList.get(0).getString("block_num");
|
||||||
@@ -680,7 +680,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
|
|||||||
|
|
||||||
// 最小木箱数的排
|
// 最小木箱数的排
|
||||||
List<JSONObject> boxNumList = rowkBoxList.stream()
|
List<JSONObject> boxNumList = rowkBoxList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("box_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("box_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
String row_num = "";
|
String row_num = "";
|
||||||
|
|||||||
@@ -482,7 +482,7 @@ public class InBussManageServiceImpl implements InBussManageService {
|
|||||||
|
|
||||||
// 最小木箱数的巷道
|
// 最小木箱数的巷道
|
||||||
List<JSONObject> boxNumList = blockBoxList.stream()
|
List<JSONObject> boxNumList = blockBoxList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("box_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("box_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
return boxNumList.get(0);
|
return boxNumList.get(0);
|
||||||
@@ -585,7 +585,7 @@ public class InBussManageServiceImpl implements InBussManageService {
|
|||||||
|
|
||||||
// 最小木箱数的排
|
// 最小木箱数的排
|
||||||
List<JSONObject> boxNumList = rowkBoxList.stream()
|
List<JSONObject> boxNumList = rowkBoxList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("box_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("box_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
return boxNumList.get(0);
|
return boxNumList.get(0);
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
|
|||||||
|
|
||||||
// 最小托盘数的巷道
|
// 最小托盘数的巷道
|
||||||
List<JSONObject> boxNumList = blockBoxList.stream()
|
List<JSONObject> boxNumList = blockBoxList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("box_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("box_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
return boxNumList.get(0).getString("block_num");
|
return boxNumList.get(0).getString("block_num");
|
||||||
@@ -336,7 +336,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
|
|||||||
|
|
||||||
// 最小木箱数的排
|
// 最小木箱数的排
|
||||||
List<JSONObject> boxNumList = rowkBoxList.stream()
|
List<JSONObject> boxNumList = rowkBoxList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("box_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("box_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
String row_num = "";
|
String row_num = "";
|
||||||
|
|||||||
@@ -345,7 +345,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
|
|||||||
|
|
||||||
// 最大木箱数的巷道
|
// 最大木箱数的巷道
|
||||||
List<JSONObject> boxNumList = blockBoxList.stream()
|
List<JSONObject> boxNumList = blockBoxList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("box_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("box_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
String block_num = "";
|
String block_num = "";
|
||||||
@@ -406,7 +406,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
|
|||||||
|
|
||||||
// 最大木箱数的排
|
// 最大木箱数的排
|
||||||
List<JSONObject> boxNumList = blockBoxList.stream()
|
List<JSONObject> boxNumList = blockBoxList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("box_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("box_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
String row_num = "";
|
String row_num = "";
|
||||||
|
|||||||
@@ -358,7 +358,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
|
|||||||
|
|
||||||
// 最大托盘数的巷道
|
// 最大托盘数的巷道
|
||||||
List<JSONObject> boxNumList = blockVehicleList.stream()
|
List<JSONObject> boxNumList = blockVehicleList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("vehicle_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("vehicle_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
String block_num = "";
|
String block_num = "";
|
||||||
@@ -417,7 +417,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
|
|||||||
|
|
||||||
// 最大托盘数的排
|
// 最大托盘数的排
|
||||||
List<JSONObject> boxNumList = blockVehicleList.stream()
|
List<JSONObject> boxNumList = blockVehicleList.stream()
|
||||||
.sorted(Comparator.comparing(row -> row.getString("vehicle_num")))
|
.sorted(Comparator.comparing(row -> row.getIntValue("vehicle_num")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
String row_num = "";
|
String row_num = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user