From fa095d4c1a440cf28a9ac82aaf9fe26984010670 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 九月 2025 08:48:44 +0800
Subject: [PATCH] 丝印页面修改，通讯加null验证
---
UI-Project/src/views/SilkScreen/SilkScreen.vue | 25 ++++--------
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/common/S7objectMachine.java | 30 ++++++++-------
JiuMuMesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java | 44 ++++++++++++---------
3 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
index f3a78f2..2738ac4 100644
--- a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
+++ b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
@@ -155,26 +155,32 @@
* @param plcValueArray PLC璇诲彇鍥炴潵鐨刡yte绫诲瀷鏁版嵁闆嗗悎
*/
public void setPlcParameterList(byte[] plcValueArray) {
- if (plcParameterMap != null) {
- Collection<PlcParameterInfo> values= plcParameterMap.values();
- for (PlcParameterInfo plcParameterInfo :values) {
- byte[] valueList = new byte[plcParameterInfo.getAddressLength()];
+ if (plcValueArray==null||!(plcValueArray.length>0)){
+ log.info("plcValueArray is null or empty");
+ return ;
+ }
+ if (plcParameterMap==null){
+ log.info("plcParameterMap is null or empty");
+ return ;
+ }
+ Collection<PlcParameterInfo> values= plcParameterMap.values();
+ for (PlcParameterInfo plcParameterInfo :values) {
+ byte[] valueList = new byte[plcParameterInfo.getAddressLength()];
// System.out.println(plcParameterInfo.getAddressLength());
- for (int i = 0; i < plcParameterInfo.getAddressLength(); i++) {
- Array.setByte(valueList, i, plcValueArray[plcParameterInfo.getAddressIndex() + i]);
- }
- if (plcParameterInfo.getAddressLength() == 2) {
- plcParameterInfo.setValue(String.valueOf(ShortUtil.toUInt16(valueList)));
- } else if (plcParameterInfo.getAddressLength() == 4) {
- plcParameterInfo.setValue(String.valueOf(IntegerUtil.toUInt32(valueList)));
- }else if(plcParameterInfo.getAddressLength()==256){
- StringConverter converter = new StringConverter();
- String s="";
- String extract1 = converter.extract(s.getClass(),valueList, 0, 0);
- plcParameterInfo.setValue(extract1);
- }else {
- plcParameterInfo.setValue((byteToHexString(valueList)));
- }
+ for (int i = 0; i < plcParameterInfo.getAddressLength(); i++) {
+ Array.setByte(valueList, i, plcValueArray[plcParameterInfo.getAddressIndex() + i]);
+ }
+ if (plcParameterInfo.getAddressLength() == 2) {
+ plcParameterInfo.setValue(String.valueOf(ShortUtil.toUInt16(valueList)));
+ } else if (plcParameterInfo.getAddressLength() == 4) {
+ plcParameterInfo.setValue(String.valueOf(IntegerUtil.toUInt32(valueList)));
+ }else if(plcParameterInfo.getAddressLength()==256){
+ StringConverter converter = new StringConverter();
+ String s="";
+ String extract1 = converter.extract(s.getClass(),valueList, 0, 0);
+ plcParameterInfo.setValue(extract1);
+ }else {
+ plcParameterInfo.setValue((byteToHexString(valueList)));
}
}
}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/common/S7objectMachine.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/common/S7objectMachine.java
index fea75a5..525d9e9 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/common/S7objectMachine.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/common/S7objectMachine.java
@@ -53,24 +53,26 @@
}
public void readData() {
try {
- byte[] resultValues=new byte[PlcMesObject.getPlcAddressLength()];
- int maxRead=1092;
- int size=PlcMesObject.getPlcAddressLength()%maxRead==0?
- (PlcMesObject.getPlcAddressLength()/maxRead):
- (PlcMesObject.getPlcAddressLength()/maxRead+1);
- for (int i = 0; i <size ; i++) {
- int begin=i*maxRead;
- int length=(i==size-1?PlcMesObject.getPlcAddressLength()-begin:maxRead);
- String beginAddress=PlcMesObject.getPlcAddressBegin().substring(0, PlcMesObject.getPlcAddressBegin().indexOf("."))+"."+begin;
- byte[] getplcvlues = plccontrol.readByte(beginAddress, length);
- System.arraycopy(getplcvlues,0,resultValues,begin,length);
- }
- if (resultValues != null) {
+ byte[] resultValues=plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
+
+// byte[] resultValues=new byte[PlcMesObject.getPlcAddressLength()];
+// int maxRead=1092;
+// int size=PlcMesObject.getPlcAddressLength()%maxRead==0?
+// (PlcMesObject.getPlcAddressLength()/maxRead):
+// (PlcMesObject.getPlcAddressLength()/maxRead+1);
+// for (int i = 0; i <size ; i++) {
+// int begin=i*maxRead;
+// int length=(i==size-1?PlcMesObject.getPlcAddressLength()-begin:maxRead);
+// String beginAddress=PlcMesObject.getPlcAddressBegin().substring(0, PlcMesObject.getPlcAddressBegin().indexOf("."))+"."+begin;
+// byte[] getplcvlues = plccontrol.readByte(beginAddress, length);
+// System.arraycopy(getplcvlues,0,resultValues,begin,length);
+// }
+ if (resultValues.length>0) {
PlcMesObject.setPlcParameterList(resultValues);
}
} catch (Exception e) {
PlcMesObject=null;
- log.info("寮傚父:ip:{},port:{},閿欒{}",this.ip,this.port,e.getMessage());
+ log.info("寮傚父:ip:{},port:{},閿欒{},{}",this.ip,this.port,e.getMessage(),e.toString());
}
}
}
diff --git a/UI-Project/src/views/SilkScreen/SilkScreen.vue b/UI-Project/src/views/SilkScreen/SilkScreen.vue
index 807c85c..6a5bc8d 100644
--- a/UI-Project/src/views/SilkScreen/SilkScreen.vue
+++ b/UI-Project/src/views/SilkScreen/SilkScreen.vue
@@ -51,24 +51,17 @@
// 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
const responseData = res.data || {};
findMachine.value =responseData;
- if (Object.keys(findMachine.value).length === 0){
- if(findMachine.value.remark.toString()!=errorScanId&&findMachine.value.remark.toString()!=""&&findMachine.value.remark.toString()!=undefined){
- //鏈夋暟鎹氨寮圭獥
- if(errorOpen){
- ElMessageBox.close();
- }
- errorScanId=findMachine.value.remark.toString();
- errorInfoFuntion(findMachine.value.remark.toString());
- errorOpen=true;
- }else if(findMachine.value.remark.toString()==""&&errorOpen){
- ElMessageBox.close();
- errorOpen=false;
- }
- }
}
});
- // 绾夸笅鏁版嵁
+ // // 绾夸笅鏁版嵁
+ // request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ // if (res.code === 200) {
+ // // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ // const responseData = res.data || {};
+ // downLineTask.value =responseData;
+ // }
+ // });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
@@ -265,7 +258,7 @@
<el-button :type="(findMachine['state']=='鏆傚仠'?'danger':'success')" id="ButtonMachineStatus"
@click="machineStatus((findMachine['state']=='鏆傚仠'?'寮�宸�':'鏆傚仠'))">
{{findMachine['state']=='寮�宸�'?$t('functionState.start'):$t('functionState.stop')}}</el-button>
- <el-button type="primary" id="ButtonTopLine" @click="topLine">{{$t('functionState.topLine')}}</el-button>
+<!-- <el-button type="primary" id="ButtonTopLine" @click="topLine">{{$t('functionState.topLine')}}</el-button>-->
</div>
<div id="main-body" style=" min-height:240px;">
<!-- 琛ㄦ牸鍐呭 -->
--
Gitblit v1.8.0