From 9b3de8fe94cd3b6355b8154026c93d1e7dac4dd2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 05 七月 2024 14:59:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
index da50b29..88effb1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
@@ -102,12 +102,12 @@
// return;
// }
// log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
-// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 0);
+// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, 0);
// return;
// }
// if (!"0".equals(confirmationWrodValue)) {
// log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓嶄负0锛屽皢纭瀛楁敼涓�0");
-// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 0);
+// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, 0);
// return;
// }
@@ -158,7 +158,7 @@
log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庢祦绋嬪崱涓殑鐗囧簭鐨勯『搴忓垯鐩撮�氾紝鎵ц涓嬬墖浠诲姟");
DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId()));
int WorkstationId = downWorkstation.getWorkstationId();
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, 0, WorkstationId, "3");
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, 0, WorkstationId, 3);
downGlassTaskService.insertCacheTask(downGlassTask);
} else {
@@ -183,7 +183,7 @@
downStorageCageDetailsService.save(details);
log.info("7銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, 0, item.getSlot(), "1");
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, 0, item.getSlot(), 1);
//娣诲姞杩涚墖浠诲姟
log.info("8銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃{}", downGlassTask);
downGlassTaskService.insertCacheTask(downGlassTask);
@@ -192,7 +192,7 @@
}
log.info("9銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
- //S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 1);
+ //S7object.getinstance().plccontrol.WriteWord(MESSendingWord, 1);
}
/**
@@ -247,7 +247,7 @@
if (endCell == null) {
endCell = 7;
}
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(selectedItem, 9, endCell, "2");
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(selectedItem, 9, endCell, 2);
downGlassTaskService.insertCacheTask(downGlassTask);
LambdaQueryWrapper<DownStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DownStorageCageDetails::getGlassId, selectedItem.getGlassId());
@@ -255,7 +255,7 @@
updateDetail.setState(Const.GLASS_STATE_OUT);
downStorageCageDetailsService.update(updateDetail, wrapper);
log.info("鏇存柊鍑虹墖鐜荤拑鐨勭姸鎬佷负{}", Const.GLASS_STATE_OUT);
- // S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 2);
+ // S7object.getinstance().plccontrol.WriteWord(MESSendingWord, 2);
return true;
}
--
Gitblit v1.8.0