rev 日志

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java

@@ -839,6 +839,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
             request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName());
             request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName()));
             request.setMaterial_code(material);
+            request.setQty(String.valueOf(encoder_qty));
             request.setWeight(String.valueOf(weight));
             request.setVehicle_code(String.valueOf(barcode));
             List<ApplyDeviceDto> listDto = new ArrayList<>();

acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java

@@ -161,7 +161,11 @@ public class DeviceOpcSynchronizeAutoRun extends AbstractAutoRunnable {
                     }
 
 //                    boolean allNull = itemStatus.entrySet().stream().map((map) -> {
-//                        return OpcUtl.getValue((Item)map.getKey(), (ItemState)map.getValue());
+//                        try {
+//                            return OpcUtl.getValue((Item)map.getKey(), (ItemState)map.getValue());
+//                        } catch (Exception e) {
+//                            throw new RuntimeException(e);
+//                        }
 //                    }).allMatch(Objects::isNull);
 //                    if (allNull) {
 //                        opcEntity.getItems().clear();

acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java

@@ -92,4 +92,15 @@ public class LuceneLogDto {
                 + remark;
     }
 
+    public LuceneLogDto(final LuceneLogDto dto) {
+        super();
+        this.device_code = device_code;
+        this.method = method;
+
+        this.content = "设备 ["
+                + device_code
+                + "] - "
+                + remark;
+    }
+
 }

acs/nladmin-ui/src/views/acs/instruction/index.vue

@@ -132,7 +132,7 @@
 <!--        <el-table-column prop="next_parent_code" label="父终点点位" min-width="100" show-overflow-tooltip />-->
         <el-table-column prop="start_point_code2" label="起点2" min-width="100" show-overflow-tooltip />
         <el-table-column prop="next_point_code2" label="终点2" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="next_device_code" label="放货位" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="put_device_code" label="放货位" min-width="100" show-overflow-tooltip />
 
         <el-table-column prop="carno" label="车号" />
         <el-table-column prop="compound_inst" label="复合指令">

acs/nladmin-ui/src/views/acs/task/index.vue

@@ -266,7 +266,7 @@
 <!--        <el-table-column prop="next_parent_code" label="父终点点位" min-width="100" show-overflow-tooltip />-->
         <el-table-column prop="start_point_code2" label="起点2" min-width="100" show-overflow-tooltip />
         <el-table-column prop="next_point_code2" label="终点2" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="next_device_code" label="放货位" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="put_device_code" label="放货位" min-width="100" show-overflow-tooltip />
 
         <el-table-column prop="compound_task" label="复合任务">
           <template slot-scope="scope">