From c4c837df24c9880c6a3cd68a2f2ee500634e1705 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 九月 2023 09:04:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index de30601..e4f6bc6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1263,6 +1263,17 @@
continue;
}
+ /*
+ * 100銆�200瀛樺湪杩涜涓殑鐩樼偣浠诲姟锛屽垯涓嶆墽琛岀洏鐐逛换鍔�
+ * */
+ if (wrkMast.getIoType().equals(107)){
+ Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo());
+ if (countPan!=0){
+ News.error("MainServiceImpl locToCrnStn 1271琛�"+"鐩樼偣鍑哄簱璺宠繃锛屽瓨鍦ㄨ繘琛屼腑鍙兘鍫靛浠诲姟鏁皗}涓�",countPan);
+ continue;
+ }
+ }
+
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
@@ -1369,11 +1380,11 @@
}else {
waitWrkMast.setIoPri(9999d);
}
- if (wrkMast.getIoPri()>23.0){
- wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
- }else {
- wrkMast.setIoPri(13.0d);
- }
+// if (wrkMast.getIoPri()>23.0){
+// wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
+// }else {
+ wrkMast.setIoPri(15.0d);
+// }
if (wrkMastMapper.updateById(wrkMast)==0){
News.error("璋冩暣浼樺厛绾уけ璐�");
}
@@ -4396,7 +4407,7 @@
}
LocMast loc = null;
- if(shallowLoc.getLocType2()==3){ //浣庨娣风洿鎺ュ嚭搴�
+ if(shallowLoc.getLocType2() == 3){ //浣庨娣风洿鎺ュ嚭搴�
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(0);
Date now = new Date();
@@ -4409,6 +4420,18 @@
wrkMast.setIoPri((double) 9999);
wrkMast.setCrnNo(crn.getId());
wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 婧愬簱浣�
+ if (shallowLoc.getCrnNo()==1){
+ wrkMast.setStaNo(100);
+ wrkMast.setSourceStaNo(108);
+ }else if (shallowLoc.getCrnNo()==2){
+ wrkMast.setStaNo(100);
+ wrkMast.setSourceStaNo(104);
+ }else {
+ wrkMast.setStaNo(200);
+ wrkMast.setSourceStaNo(208);
+ }
+
+
// wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
wrkMast.setFullPlt("Y"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
--
Gitblit v1.9.1