From 3e0136494253e17019801f0d2c07fc7c65acaeb5 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 22 十一月 2024 14:18:47 +0800
Subject: [PATCH] 预览成功删除线路与除膜状态，更改开始上片逻辑，页面样式更改
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index b11d08b..55ba683 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -51,6 +51,7 @@
.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
.isNull(EdgStorageCageDetails::getSlot)
+ .eq(EdgStorageCage::getEnableState, Const.SLOT_ON)
.last("order by abs(t.slot - " + currentSlot + ") asc limit 2")
);
if (flag && CollectionUtil.isNotEmpty(emptyList)) {
@@ -129,13 +130,13 @@
@Override
public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage) {
EdgStorageCage edgItem = baseMapper.selectById(edgStorageCage.getId());
- if(edgItem!=null){
+ if (edgItem != null) {
edgItem.setEnableState(edgStorageCage.getEnableState());
baseMapper.updateById(edgItem);
- log.info("鍗у缂撳瓨锛氥�愬惎鐢�/绂佺敤銆� 鍙傛暟:{} 缁撴灉:鎴愬姛",edgStorageCage);
+ log.info("鍗у缂撳瓨锛氥�愬惎鐢�/绂佺敤銆� 鍙傛暟:{} 缁撴灉:鎴愬姛", edgStorageCage);
return true;
}
- log.info("鍗у缂撳瓨锛氥�愬惎鐢�/绂佺敤銆� 鍙傛暟:{} 缁撴灉:澶辫触",edgStorageCage);
+ log.info("鍗у缂撳瓨锛氥�愬惎鐢�/绂佺敤銆� 鍙傛暟:{} 缁撴灉:澶辫触", edgStorageCage);
return false;
}
@@ -153,17 +154,20 @@
EdgStorageCageDetails edgDItem = edgStorageCageDetailsMapper.selectById(edgStorageCageDetails.getId());
if (edgItem != null) {
//绉婚櫎 锛堢牬鎹�,鐩墠涓や釜姒傚康娣峰悎鍦ㄤ竴璧�,寤鸿鎷嗗紑锛�
- EdgStorageCageDetails result = edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>()
- .eq(EdgStorageCageDetails::getSlot, edgStorageCageId));
+ EdgStorageCageDetails result = edgStorageCageDetailsMapper.selectOne(
+ new MPJLambdaWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getSlot, edgStorageCageId)
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ );
if (result != null) {
- int state=8;
result.setSlot(0);
- result.setState(state);
- Damage damage =new Damage();
+ result.setState(201);
+ Damage damage = new Damage();
damage.setGlassId(edgStorageCageDetails.getGlassId());
- damage.setLine(1002);
- damage.setWorkingProcedure("鍗у紡鐞嗙墖");
- damage.setStatus(state);
+ damage.setLine(2001);
+ damage.setWorkingProcedure("纾ㄨ竟");
+ damage.setStatus(1);
+ damage.setType(8);
damageService.insertDamage(damage);
edgStorageCageDetailsMapper.updateById(result);
}
@@ -178,5 +182,10 @@
return true;
}
+ @Override
+ public EdgStorageCage getEdgStorageCageBySize(int deviceId, double width, double height, int slot) {
+ return baseMapper.getEdgStorageCageBySize(deviceId, width, height, slot);
+ }
+
}
--
Gitblit v1.8.0