From f8a73ae78727eab0063a26b4c57c3d451f1a0ab5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 四月 2024 14:23:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
index 7e891f6..7578046 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.common.S7object;
import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.mapper.UpWorkstationMapper;
@@ -38,20 +37,20 @@
UpWorkSequence loadid1 = this.baseMapper.selectPriority(1).get(0);
UpWorkSequence loadid2 = this.baseMapper.selectPriority(2).get(0);
//鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
- if(loadid1.getSequence()>loadid2.getSequence()) {
- S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
- }else if(loadid1.getSequence()==loadid2.getSequence()){
- //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
- int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
- int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
- if(glassnum1>glassnum2){
- S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
- }else{
- S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
- }
- }else{
- S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
- }
+// if(loadid1.getSequence()>loadid2.getSequence()) {
+// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
+// }else if(loadid1.getSequence()==loadid2.getSequence()){
+// //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
+// int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+// int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+// if(glassnum1>glassnum2){
+// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
+// }else{
+// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
+// }
+// }else{
+// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
+// }
}
/**
--
Gitblit v1.8.0