更新

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java

@@ -316,6 +316,12 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
             jo.put("hasGoods", true);
         }
         jo.put("device_name", this.getDevice().getDevice_name());
+        jo.put("temperature", temperature);
+        jo.put("finish", finish);
+        jo.put("countdown_house", countdown_house);
+        jo.put("countdown_min", countdown_min);
+        jo.put("countdown_sec", countdown_sec);
+        jo.put("door", door);
         jo.put("mode", mode);
         jo.put("move", move);
         jo.put("action", action);

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java

@@ -144,16 +144,20 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
             error = this.itemProtocol.getError();
             task = this.itemProtocol.getTask();
             if (mode != last_mode) {
-                requireSucess = false;
+                if( mode == 2){
-                requireApplyLabelingSuccess = false;
+                    requireSucess = false;
-                requireApplyLaStrangulationSuccess =false;
+                    requireApplyLabelingSuccess = false;
-                requireEmptyInSuccess =false;
+                    requireApplyLaStrangulationSuccess =false;
-                requireEmptyOutSuccess =false;
+                    requireEmptyInSuccess =false;
+                    requireEmptyOutSuccess =false;
+                    logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode +"复位请求标记");
+                }
+
                 logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
             if (move != last_move) {
-                if(move == 0 ){
+                if(move == 0 && mode == 2 ){
                     this.clearWrite();
                 }
                 logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
@@ -273,7 +277,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                     break;
                 case 8:
                     //申请AGV任务
-                    if (move == 0 && !requireSucess) {
+                    if (move == 1 && !requireSucess) {
                         applyAgvTask();
                     }
                     break;

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java

@@ -184,6 +184,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
             plcbarcode_length =  this.itemProtocol.getBarCode_length();
 
             if (mode != last_mode) {
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode +"复位请求标记");
                 this.setRequireSucess(false);
             }
             if (move != last_move) {
@@ -235,7 +236,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
                 case 2:
                     //申请任务
                     String newBarcode = null;
-                    if(!StrUtil.equals(plcbarcode,"0")){
+                    if(plcbarcode_length != 0){
                         newBarcode = plcbarcode;
                     } else {
                         if(!StrUtil.isEmpty(barcode())){
@@ -246,10 +247,10 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
                     }
 
                     if (move > 0 && !StrUtil.isEmpty(newBarcode) && !requireSucess) {
-                        instruction_require(newBarcode);
+                        instruction_require(newBarcode.trim());
                     }
                     if (move > 0 && !StrUtil.isEmpty(newBarcode) && !applySucess) {
-                        instruction_apply(newBarcode);
+                        instruction_apply(newBarcode.trim());
                     }
             }
             switch (flag) {
@@ -727,4 +728,5 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
     public void setDeviceStatus(JSONObject data) {
 
     }
+
 }

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

@@ -51,6 +51,7 @@ public class OpcUtl {
             if (!is_success) {
                 // throw new BusinessException(message.toString());
                 System.out.println("下发信号失败："+message.toString());
+                log.info("下发信号失败："+message.toString());
             }
         } catch (JIException arg7) {
             // throw new BusinessException(arg7);

acs/nladmin-system/src/main/resources/log/OpcUtil.xml

@@ -3,10 +3,10 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!-- 按照每天生成日志文件 -->
-    <appender name="FILE11" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="FILE16" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/扫码记录/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/下发KEP信号/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
@@ -27,7 +27,7 @@
       </logger>-->
 
     <!-- 打印sql -->
-    <logger name="org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver" level="info" additivity="false">
+    <logger name="org.nl.acs.opc.OpcUtl" level="info" additivity="false">
-        <appender-ref ref="FILE11"/>
+        <appender-ref ref="FILE16"/>
     </logger>
 </included>

acs/nladmin-system/src/main/resources/logback-spring.xml

@@ -38,6 +38,7 @@ https://juejin.cn/post/6844903775631572999
     <include resource="log/LkToAcs.xml"/>
     <include resource="log/AcsToWms.xml"/>
     <include resource="log/WmsToAcs.xml"/>
+    <include resource="log/OpcUtil.xml"/>
 
 
 

acs/nladmin-ui/src/views/acs/monitor/device/index.vue

@@ -416,26 +416,26 @@ export default {
           } else if (val === 'full_ready_req_agv') {
             const obj = { name: '满箱位就绪，请求AGV', value: data[val] }
             arr.push(obj)
-          } else if (val === 'full_out') {
+          } else if (val === 'temperature') {
-            const obj = { name: '满箱已运出满箱位', value: data[val] }
+            const obj = { name: '当前温度', value: data[val] }
             arr.push(obj)
           } else if (val === 'finish') {
-            const obj = { name: '订单完成', value: data[val] }
+            const obj = { name: '烘箱完成', value: data[val] }
             arr.push(obj)
-          } else if (val === 'order_compel_finish') {
+          } else if (val === 'countdown_house') {
-            const obj = { name: '订单强制完成', value: data[val] }
+            const obj = { name: '恒温倒计时(时)', value: data[val] }
             arr.push(obj)
-          } else if (val === 'now_order_prod_num') {
+          } else if (val === 'countdown_min') {
-            const obj = { name: '当前生产总量', value: data[val] }
+            const obj = { name: '恒温倒计时(分)', value: data[val] }
             arr.push(obj)
-          } else if (val === 'now_one_prod_num') {
+          } else if (val === 'countdown_sec') {
-            const obj = { name: '当前箱生产量', value: data[val] }
+            const obj = { name: '恒温倒计时(秒)', value: data[val] }
             arr.push(obj)
           } else if (val === 'task') {
             const obj = { name: '任务号', value: data[val] }
             arr.push(obj)
-          } else if (val === 'full_number') {
+          } else if (val === 'door') {
-            const obj = { name: '出料口满框数量', value: data[val] }
+            const obj = { name: '门状态', value: data[val] }
             arr.push(obj)
           } else if (val === 'storage_stock_num') {
             const obj = { name: '储料仓库存数量', value: data[val] }

acs/nladmin-ui/src/views/acs/monitor/device/index2.vue

@@ -420,7 +420,19 @@ export default {
             const obj = { name: '满箱已运出满箱位', value: data[val] }
             arr.push(obj)
           } else if (val === 'finish') {
-            const obj = { name: '订单完成', value: data[val] }
+            const obj = { name: '烘箱完成', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'countdown_house') {
+            const obj = { name: '恒温倒计时(时)', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'countdown_min') {
+            const obj = { name: '恒温倒计时(分)', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'countdown_sec') {
+            const obj = { name: '恒温倒计时(秒)', value: data[val] }
+            arr.push(obj)
+          } else if (val === 'door') {
+            const obj = { name: '门状态', value: data[val] }
             arr.push(obj)
           } else if (val === 'order_compel_finish') {
             const obj = { name: '订单强制完成', value: data[val] }