From 0aacd330fca570ab3350aef5bda901f23aee23b3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
index 746269b..d370c64 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -57,17 +57,19 @@
@Override
public String warehousingRequest(int leftingStation) {
RawGlassStorageDetails storageDetails = getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL));
+ .in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL)
+ .eq(RawGlassStorageDetails::getSlot, leftingStation));
if (null != storageDetails) {
log.info("褰撳墠鍚婅浣嶆湁鏋跺瓙锛岀粨鏉熸湰鍦板叆搴撹姹�");
return "fail";
}
- List<Integer> shelfList = listBySlotState(Const.RAW_GLASS_DEVICE, Const.RAW_GLASS_STATE_IN_ALL);
+ List<RawGlassStorageDetails> shelfList = listBySlotState(Const.RAW_GLASS_DEVICE, Const.RAW_GLASS_STATE_IN_ALL);
if (CollectionUtils.isEmpty(shelfList)) {
log.info("褰撳墠宸ヤ綅涓嶅瓨鍦ㄥ彲鐢ㄧ殑绌烘灦瀛�");
return "fail";
}
- Integer shelf = shelfList.get(0);
+ Integer shelf = shelfList.get(0).getSlot();
+ Integer deviceId = shelfList.get(0).getDeviceId();
log.info("鐢熸垚浠诲姟");
try {
generateTask(shelf, leftingStation, shelf, 0, Const.RAW_GLASS_TASK_TYPE_IN_REQUEST);
@@ -78,6 +80,7 @@
RawGlassStorageDetails details = new RawGlassStorageDetails();
details.setSlot(shelf);
details.setShelf(shelf);
+ details.setDeviceId(deviceId);
details.setState(Const.RAW_GLASS_STATE_RUNNING);
save(details);
return "success";
@@ -126,7 +129,7 @@
}
@Override
- public List<Integer> listBySlotState(List<Integer> liftingStation, List<Integer> state) {
+ public List<RawGlassStorageDetails> listBySlotState(List<Integer> liftingStation, List<Integer> state) {
return baseMapper.listBySlotState(liftingStation, state);
}
@@ -173,13 +176,10 @@
.shelf(shelf)
.createTime(new Date()).build();
rawGlassStorageTaskService.save(task);
-
-
List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
- list.add(generateReadWriteEntity("A01-CC.dev.startSlot", startSlot));
- list.add(generateReadWriteEntity("A01-CC.dev.endSlot", endSlot));
+ list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
+ list.add(generateReadWriteEntity("PLC.CC.startSlot", startSlot));
+ list.add(generateReadWriteEntity("PLC.CC.endSlot", endSlot));
miloService.writeToOpcWord(list);
return Boolean.TRUE;
}
--
Gitblit v1.8.0