From 78d73df2f8e0c6855d65eb1f2c6df08e0f99bab1 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 22 十月 2025 12:45:05 +0800
Subject: [PATCH] 仓储后端接口返回信息国际化处理
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
index 6ee1204..ca03f36 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
@@ -88,7 +88,8 @@
RawGlassStorageTask task = this.getById(taskId);
//鍘昏鎯呰〃鑾峰彇姝ｅ湪鎵ц鐨勫師鐗囪鎯呬俊鎭�
RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .ne(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT).eq(RawGlassStorageDetails::getSlot, task.getStartSlot())
+ .ne(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot())
);
if(details!=null){
RawGlassStorageDetails targetDetails = rawGlassStorageDetailsService.generateDetails(details, task.getEndSlot());
@@ -101,7 +102,7 @@
.eq(RawGlassStorageDetails::getSlot, task.getStartSlot()));
log.info("浠诲姟鐘舵�佸凡鏇存敼涓猴細宸插畬鎴�");
this.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
- .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW, Const.RAW_GLASS_TASK_RUNNING)
.set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_SUCCESS));
switch (taskType) {
case 1:
@@ -116,7 +117,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);
@@ -146,7 +147,7 @@
.in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING, Const.RAW_GLASS_STATE_CAR));
}
this.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
- .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW, Const.RAW_GLASS_TASK_RUNNING)
.set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_FAILURE));
return Boolean.TRUE;
}
--
Gitblit v1.8.0