fix

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java

@@ -196,7 +196,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                         Object his = accessor_value.getValue(itemId);
                         if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD) && his != null) {
                             log.warn("opc 值不健康 item: {}, 状态: {}", itemId, itemState.getQuality());
-                            valueAllNotNull = true;
+                            valueAllNotNull = false;
                         }
 
                         if (!UnifiedDataAppService.isEquals(value, his)) {

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java

@@ -171,7 +171,10 @@ public class MJXLTask extends AbstractTask {
         SchBasePoint schBasePoint=null;
         int qty=0;
         for (Map.Entry<SchBasePoint, Integer> next : pointMap.entrySet()) {
-            if (next.getValue() >= qty) {
+            if (next.getValue() >= qty && schBasePoint==null) {
+                qty = next.getValue();
+                schBasePoint = next.getKey();
+            }else if (next.getValue() >= qty && next.getKey().getPoint_code().compareTo(schBasePoint.getPoint_code()) < 0){
                 qty = next.getValue();
                 schBasePoint = next.getKey();
             }