From e208aa1ef8e861dba168e8d83ab3066fc9f1e02d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 16 四月 2024 13:30:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
index 2a28e51..95514e3 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
@@ -1,31 +1,27 @@
package com.mes.service;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mes.entity.device.PLCAutoMes;
import com.mes.common.PlcTools.S7control;
import com.mes.entity.device.PlcParameterObject;
-import com.google.common.primitives.Bytes;
-import com.mes.entity.GlassInfo;
+
import com.mes.entity.UpWorkstation;
import com.mes.mapper.LoadGlassMapper;
@Service
public class LoadGlassService {
- @Autowired
- private com.mes.common.PlcTools.S7control s7control;
+
+ private S7control s7control;
private LoadGlassMapper LoadGlassMapper;
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
public List<UpWorkstation> selectAll() {
- List<UpWorkstation> glassInfo= LoadGlassMapper.SelectALL();
+ List<UpWorkstation> glassInfo= LoadGlassMapper.selectALL();
return glassInfo;
}
//澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
public void insertGlass(UpWorkstation upwork) {
- LoadGlassMapper.insertGlass(upwork.getPatternwidth(),upwork.getPatternheigth(),upwork.getPatternthickness(),1);
+ LoadGlassMapper.insertGlass(upwork);
}
//鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
public void deleteGlass(int id) {
@@ -41,14 +37,24 @@
}
}
- //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆
- public int selectPriority() {
- int loadid1=LoadGlassMapper.SelectPriority(1);
- int loadid2=LoadGlassMapper.SelectPriority(2);
+ //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
+ public void selectPriority() {
+ int loadid1=LoadGlassMapper.selectPriority(1);
+ int loadid2=LoadGlassMapper.selectPriority(2);
+ //鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
if(loadid1>loadid2) {
- return 1;
+ s7control.WriteWord("DB100.10", (short)2);
+ }else if(loadid1==loadid2){
+ //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
+ int glassnum1=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+ int glassnum2=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+ if(glassnum1>glassnum2){
+ s7control.WriteWord("DB100.10", (short)2);
+ }else{
+ s7control.WriteWord("DB100.10", (short)1);
+ }
}else{
- return 2;
+ s7control.WriteWord("DB100.10", (short)1);
}
}
--
Gitblit v1.8.0