From 1fa4f12a4b218412efeb9f72d4d3ee9e577351b0 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 04 十一月 2025 08:27:24 +0800
Subject: [PATCH] 修改仓储出库方法，添加i18n可配置文件
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
index 759df14..d08724d 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
@@ -176,8 +176,9 @@
log.info("娌℃湁姝ｅ湪鎵ц鐨勪换鍔�");
return;
}
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getId, one.getId())
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ //鏇存柊浠诲姟鐘舵�佷负鈥滃湪杞︹��
+ one.setState(Const.RAW_GLASS_STATE_CAR);
+ rawGlassStorageDetailsService.updateById(one);
}
@Scheduled(fixedDelay = 1000)
@@ -186,8 +187,6 @@
// S7Data S7DataWL1 = new S7Data();
// S7DataWL1.setReportWord((short) 1);
String value = S7DataWL1.getReportWord().toString();
-// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
-// String value = entity.getValue() + "";
if ("0".equals(value)) {
log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
return;
@@ -225,7 +224,7 @@
log.info("2銆佸嚭鐗�,4銆佸悐瑁呬綅璇锋眰銆倇}", taskType);
targetDetails = new RawGlassStorageDetails();
targetDetails.setSlot(task.getEndSlot());
- targetDetails.setDeviceId(deviceId);
+ targetDetails.setDeviceId(4);
targetDetails.setShelf(task.getStartSlot());
targetDetails.setState(Const.RAW_GLASS_STATE_IN);
rawGlassStorageDetailsService.save(targetDetails);
--
Gitblit v1.8.0