From 18f6e14f2cb0e19fc8726e9821bc4db172a04d17 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 24 四月 2024 16:32:54 +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 | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 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 9e67249..18d8b4b 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
@@ -33,29 +33,14 @@
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public void selectPriority() {
- //todo:鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
-// String loadstart="鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
-// if (!"1".equals(loadstart)) {
-// return;
-// }
- 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);
-// }
+ public UpWorkSequence selectPriority() {
+ UpWorkSequence upwork= this.baseMapper.selectPriority(1);
+ String start = "鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
+ if(upwork!=null&&start.equals("1")){
+ //鍙戦�佸嚭鐗囦换鍔�
+ //plcmes.getPlcParameter("鍑虹墖淇″彿").setValue("1");
+ }
+ return upwork;
}
/**
@@ -69,4 +54,5 @@
int update = this.baseMapper.update(upwork, updateWrapper);
}
+
}
--
Gitblit v1.8.0