1.亮灯颜色增加

2.设备互联展示按名称排序

src/main/java/com/neotel/smfcore/core/device/handler/impl/AccShelfHandler.java

@@ -38,7 +38,7 @@ public class AccShelfHandler extends BaseDeviceHandler{
                 ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
                 ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
                 if (color == null) {
                 if (color == null) {
                     if (queueTask.isPutInTask()) {
                     if (queueTask.isPutInTask()) {
-                        color = ORDER_COLOR.DARKGREEN;
+                        color = ORDER_COLOR.FORESTGREEN;
                     } else {
                     } else {
                         if (openZhiYin && ObjectUtil.isNotEmpty(queueTask.getSourceId())) {
                         if (openZhiYin && ObjectUtil.isNotEmpty(queueTask.getSourceId())) {
                             List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());
                             List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java

@@ -95,7 +95,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
                     ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
                     ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
                     if (color == null) {
                     if (color == null) {
                         if (queueTask.isPutInTask()) {
                         if (queueTask.isPutInTask()) {
-                            color = ORDER_COLOR.DARKGREEN;
+                            color = ORDER_COLOR.FORESTGREEN;
                         } else {
                         } else {
                             color = ORDER_COLOR.BLUE;
                             color = ORDER_COLOR.BLUE;
                         }
                         }

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -48,6 +48,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 
 
 
 @Slf4j
 @Slf4j
@@ -106,6 +107,7 @@ public class BoxKanbanController {
                 }
                 }
             }
             }
             if(boxStatusDtos.size()>0){
             if(boxStatusDtos.size()>0){
+                boxStatusDtos = boxStatusDtos.stream().sorted(Comparator.comparing(BoxStatusDto :: getName)).collect(Collectors.toList());
                 GroupStatusDto groupStatusDto = new GroupStatusDto(group.getId(),group.getGroupName(),boxStatusDtos,groupType);
                 GroupStatusDto groupStatusDto = new GroupStatusDto(group.getId(),group.getGroupName(),boxStatusDtos,groupType);
                 groupStatusDtos.add(groupStatusDto);
                 groupStatusDtos.add(groupStatusDto);
             }
             }

src/main/java/com/neotel/smfcore/core/order/enums/ORDER_COLOR.java

@@ -31,12 +31,12 @@ public enum ORDER_COLOR {
 //            'magenta':[17,125,125,0]
 //            'magenta':[17,125,125,0]
     BLUE("0000FF"),
     BLUE("0000FF"),
     //MAGENTA("FF00FF"),
     //MAGENTA("FF00FF"),
-    //CYAN("00FFFF"),
+    CYAN("00FFFF"),
     FIREBRICK("B22222"),
     FIREBRICK("B22222"),
     PURPLE("A020F0"),
     PURPLE("A020F0"),
     //SKYBLUE("6CA6CD"),
     //SKYBLUE("6CA6CD"),
     //PINK("FF1493"),
     //PINK("FF1493"),
-    //FORESTGREEN("228B22"),
+    FORESTGREEN("228B22"),
     //LIGHTBLUE("8470FF"),
     //LIGHTBLUE("8470FF"),
     //INDIANRED("8B3A3A"),
     //INDIANRED("8B3A3A"),
     DARKGREEN("556B2F"),
     DARKGREEN("556B2F"),
@@ -73,7 +73,7 @@ public enum ORDER_COLOR {
 
 
     public static ORDER_COLOR nextColor(Collection<String> excludeColors){
     public static ORDER_COLOR nextColor(Collection<String> excludeColors){
         excludeColors.add(ORDER_COLOR.BLUE.getRgb());//手动出库
         excludeColors.add(ORDER_COLOR.BLUE.getRgb());//手动出库
-        excludeColors.add(ORDER_COLOR.DARKGREEN.getRgb());//入库
+        excludeColors.add(ORDER_COLOR.FORESTGREEN.getRgb());//入库
 
 
         ORDER_COLOR[] allColors = values();
         ORDER_COLOR[] allColors = values();
         if (excludeColors.size() >= allColors.length){
         if (excludeColors.size() >= allColors.length){