From c28ef8556cd40c671976aadf010fb43d7c39633b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 20 三月 2025 16:16:45 +0800
Subject: [PATCH] 修改大屏样式
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 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 190b25c..6ee1204 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
@@ -90,38 +90,40 @@
RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
.ne(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT).eq(RawGlassStorageDetails::getSlot, task.getStartSlot())
);
- RawGlassStorageDetails targetDetails = rawGlassStorageDetailsService.generateDetails(details, task.getEndSlot());
- int deviceId = details.getDeviceId();
- Integer taskType = task.getTaskType();
- log.info("灏嗚鎯呰〃鐨勭姸鎬佹敼涓哄凡鍑哄簱");
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
- .ne(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
- .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()));
- log.info("浠诲姟鐘舵�佸凡鏇存敼涓猴細宸插畬鎴�");
- this.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
- .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
- .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_SUCCESS));
- switch (taskType) {
- case 1:
- case 3:
- log.info("1銆佸叆搴擄紝3銆佽皟搴︿换鍔°�倇}", taskType);
- if (details.getRemainQuantity() > 0) {
+ if(details!=null){
+ RawGlassStorageDetails targetDetails = rawGlassStorageDetailsService.generateDetails(details, task.getEndSlot());
+ int deviceId = details.getDeviceId();
+ Integer taskType = task.getTaskType();
+ log.info("灏嗚鎯呰〃鐨勭姸鎬佹敼涓哄凡鍑哄簱");
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .ne(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()));
+ log.info("浠诲姟鐘舵�佸凡鏇存敼涓猴細宸插畬鎴�");
+ this.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_SUCCESS));
+ switch (taskType) {
+ case 1:
+ case 3:
+ log.info("1銆佸叆搴擄紝3銆佽皟搴︿换鍔°�倇}", taskType);
+ if (details.getRemainQuantity() > 0) {
+ rawGlassStorageDetailsService.save(targetDetails);
+ }
+ break;
+ case 2:
+ case 4:
+ log.info("2銆佸嚭鐗�,4銆佸叆搴撹姹傘�倇}", taskType);
+ targetDetails = new RawGlassStorageDetails();
+ targetDetails.setSlot(task.getEndSlot());
+ targetDetails.setDeviceId(deviceId);
+ targetDetails.setShelf(task.getStartSlot());
+ targetDetails.setState(Const.RAW_GLASS_STATE_IN);
rawGlassStorageDetailsService.save(targetDetails);
- }
- break;
- case 2:
- case 4:
- log.info("2銆佸嚭鐗�,4銆佸叆搴撹姹傘�倇}", taskType);
- targetDetails = new RawGlassStorageDetails();
- targetDetails.setSlot(task.getEndSlot());
- targetDetails.setDeviceId(deviceId);
- targetDetails.setShelf(task.getStartSlot());
- targetDetails.setState(Const.RAW_GLASS_STATE_IN);
- rawGlassStorageDetailsService.save(targetDetails);
- break;
- default:
- break;
+ break;
+ default:
+ break;
+ }
}
return Boolean.TRUE;
}
--
Gitblit v1.8.0