陆运列表状态处理

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -286,7 +286,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 
 					// 已派
-					Map<String, Long> dispatchCtnMap = itemList.stream().filter(item -> item.getStatus() == 1).collect(Collectors.groupingBy(OrderItem::getCtnType, Collectors.counting()));
+					Map<String, Long> dispatchCtnMap = itemList.stream().filter(item -> item.getStatus() > 1).collect(Collectors.groupingBy(OrderItem::getCtnType, Collectors.counting()));
 					StringBuilder dispatchCtnDetail = new StringBuilder();
 					for (Map.Entry<String, Long> entry : dispatchCtnMap.entrySet()) {
 						dispatchCtnDetail.append(entry.getKey()).append("×").append(entry.getValue()).append(",");
@@ -296,7 +296,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 
 					// 受理
-					Map<String, Long> sendCtnMap = itemList.stream().filter(item -> item.getStatus() == 2).collect(Collectors.groupingBy(OrderItem::getCtnType, Collectors.counting()));
+					Map<String, Long> sendCtnMap = itemList.stream().filter(item -> item.getStatus() > 2).collect(Collectors.groupingBy(OrderItem::getCtnType, Collectors.counting()));
 					StringBuilder sendCtnDetail = new StringBuilder();
 					for (Map.Entry<String, Long> entry : sendCtnMap.entrySet()) {
 						sendCtnDetail.append(entry.getKey()).append("×").append(entry.getValue()).append(",");
@@ -311,6 +311,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					long two = itemList.stream().filter(item -> item.getStatus() == 2).count();
 					long three = itemList.stream().filter(item -> item.getStatus() == 3).count();
 					long four = itemList.stream().filter(item -> item.getStatus() == 4).count();
+					long five = itemList.stream().filter(item -> item.getStatus() == 5).count();
+					long six = itemList.stream().filter(item -> item.getStatus() == 6).count();
 					String statusDetail = "";
 					if (zero > 0) {
 						statusDetail += "未调度(" + zero + ");";
@@ -327,6 +329,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (four > 0) {
 						statusDetail += "工单关闭(" + four + ");";
 					}
+					if (five > 0) {
+						statusDetail += "未到场(" + five + ");";
+					}
+					if (six > 0) {
+						statusDetail += "未提箱(" + six + ");";
+					}
 
 					if (StringUtil.isNotBlank(statusDetail)) {
 						record.setItemStatusDetail(statusDetail.substring(0, statusDetail.lastIndexOf(";")));