admin
2024-09-18 2d564a5921cec98b2c7e6065cc8f066abd614b76
打印功能修改,进站校验sn
已修改2个文件
8 ■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/kb/stationTerminal/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -127,6 +127,10 @@
                        }
                    }else {//自动工位
                        Object snCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                        if (ObjectUtil.isNull(snCodeObject)){
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                        }else{
                        //所有进站将进站时间写给PLC
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        String currentDate = dateFormat.format(new Date());
@@ -136,6 +140,8 @@
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(recordDataDone).build());
                    }
                    }
                } else if(Constants.TWO.equals(valueString)){//出站
                        if(Constants.OP040_OP160.contains(device)){//人工工位
                            if(Constants.OP165.equals(device)){
jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -134,7 +134,7 @@
                     <span>绝缘等级:</span><span>H</span><br>
                   </div>
                   <div style="margin-top: 4px">
                     <span>出厂编号:</span><span>2407190000002</span><br>
                     <span>出厂编号:</span><span>{{headContent.sfcCode}}</span><br>
                   </div>
                 </div>
               </div>