手动下发颜色下拉问题

大屏agv编号排序问题
堆垛机编号排序问题
紧急出库点位问题

shkj-wms/src/main/java/com/shkj/wms/constants/ParameterConstants.java

@@ -75,9 +75,12 @@ public final class ParameterConstants {
         //人工下挂点
         public final static String Manual_drop_point= "Manual_drop_point";
 
-        //紧急出库接驳点点位
+        //紧急出库接驳点点位 分组
         public final static String urgency_out_point="urgency_out_point";
 
+        //紧急出库接驳点点位
+        public final static String urgent_out_point="urgent_out_point";
+
         //平库入库接驳口
         public final static String P_in01="KW18";
         //平库出库接驳口

shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java

@@ -167,7 +167,7 @@ public class PlcEventTask {
                     plcInit.connect(conn.getPlcIp());
                 }
                 plcTask(plcOperate_60, conn, conn.getPointTables());
-                doDevStatus(plcOperate_60,"1#");
+                doDevStatus(plcOperate_60,"1");
             }
 
             if(conn.getPlcIp().contains(".70")){
@@ -176,7 +176,7 @@ public class PlcEventTask {
                     plcInit.connect(conn.getPlcIp());
                 }
                 plcTask(plcOperate_70, conn, conn.getPointTables());
-                doDevStatus(plcOperate_70,"2#");
+                doDevStatus(plcOperate_70,"2");
             }
 
             if(conn.getPlcIp().contains(".80")){
@@ -185,7 +185,7 @@ public class PlcEventTask {
                     plcInit.connect(conn.getPlcIp());
                 }
                 plcTask(plcOperate_80, conn, conn.getPointTables());
-                doDevStatus(plcOperate_80,"3#");
+                doDevStatus(plcOperate_80,"3");
             }
 
             if(conn.getPlcIp().contains(".90")){
@@ -194,7 +194,7 @@ public class PlcEventTask {
                     plcInit.connect(conn.getPlcIp());
                 }
                 plcTask(plcOperate_90, conn, conn.getPointTables());
-                doDevStatus(plcOperate_90,"4#");
+                doDevStatus(plcOperate_90,"4");
             }
 
             if(conn.getPlcIp().contains(".100")){
@@ -203,7 +203,7 @@ public class PlcEventTask {
                     plcInit.connect(conn.getPlcIp());
                 }
                 plcTask(plcOperate_100, conn, conn.getPointTables());
-                doDevStatus(plcOperate_100,"5#");
+                doDevStatus(plcOperate_100,"5");
             }
 
             if(conn.getPlcIp().contains(".110")){
@@ -212,7 +212,7 @@ public class PlcEventTask {
                     plcInit.connect(conn.getPlcIp());
                 }
                 plcTask(plcOperate_110, conn, conn.getPointTables());
-                doDevStatus(plcOperate_110,"6#");
+                doDevStatus(plcOperate_110,"6");
             }
         }
     }

shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinDataTaskServiceImpl.java

@@ -428,13 +428,11 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
         List<BusinDataTask> taskList = new ArrayList<>();
         List<BusinDataTaskGoods> taskGoodsList = new ArrayList<>();
         //获取出库组装接驳点位
-        String pointout = sysParameterService.selectConfigByKey(ParameterConstants.ParameterSystem.urgency_out_point);
-        BasePointDeviceQueryBo pointQueryBo = new BasePointDeviceQueryBo();
-
-        pointQueryBo.setGroupNo(pointout);
-        BasePointDeviceVo pointDeviceout = basePointDeviceMapper.selectBasePointByGroupno(pointQueryBo);
-        String urgency=pointDeviceout.getPointNo();
+        String urgency= sysParameterService.selectConfigByKey(ParameterConstants.ParameterSystem.urgent_out_point);
 
+        if (StringUtils.isEmpty(urgency)){
+            return Result.err().msg("未设定紧急出库接驳点");
+        }
 
         //一套保险杠
         if (isSuite){

shkj-wms/src/main/java/com/shkj/wms/service/impl/WcsDeviceServiceImpl.java

@@ -18,8 +18,10 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Stream;
 
 /**
  * 设备管理Service业务层处理
@@ -131,12 +133,14 @@ public class WcsDeviceServiceImpl extends ServiceImpl<WcsDeviceMapper, WcsDevice
             BusinPlcStatus businStkStatus =(BusinPlcStatus)redisTemplate.opsForValue().get(redisStkKey);
             businPlcStatuses.add(businStkStatus);
         }
+        businPlcStatuses.stream().sorted(Comparator.comparing(BusinPlcStatus::getTunnel));
         return businPlcStatuses;
     }
 
     @Override
     public List<BusinAgvRealRedisInfo> getAGVRealStatesInfo() {
         List<BusinAgvRealRedisInfo> list =(List<BusinAgvRealRedisInfo>)redisTemplate.opsForValue().get(RedisConstant.redisAgvRealInfo );
+        list.stream().sorted(Comparator.comparing(BusinAgvRealRedisInfo::getId));
         return list;
     }
 

shkj-wms/src/main/resources/mapper/wms/BaseDeriveMapper.xml

@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND derive.derive =#{derive}
         </if>
         <if test="vehicheModel !=null and vehicheModel !=''">
-            AND derive.vehiche_code =#{vehicheModel}
+            AND derive.vehiche_model =#{vehicheModel}
         </if>
     </select>