From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 2b910c0..8a73f9e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -210,10 +210,10 @@
baseMapper.updateById(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
damage.setGlassId(bigStorageCageDetails.getGlassId());
- damage.setWorkingProcedure("鍐峰姞宸�");
- damage.setLine(3001);
- damage.setRemark("澶х悊鐗囩鐮存崯");
- damage.setStatus(2);
+ damage.setWorkingProcedure("閽㈠寲");
+ damage.setLine(4001);
+ damage.setRemark("澶х悊鐗囩");
+ damage.setStatus(1);
damageService.insertDamage(damage);
}
@@ -390,14 +390,8 @@
@Override
public List<Map<String, Object>> selectTemperingGlass() {
- QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
- wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
- .in("state", Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL)
- .groupBy("engineer_id,tempering_layout_id")
- .orderByAsc("engineer_id")
- .orderByAsc("tempering_layout_id");
- List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
- return TemperingGlass;
+ List<Map<String, Object>> temperingGlass = baseMapper.selectTemperingGlassCount();
+ return temperingGlass;
}
@Override
@@ -410,4 +404,9 @@
redisUtil.setCacheObject("temperingSwitch", flag);
return "success";
}
+
+ @Override
+ public void appointEngineerId(String engineerId){
+ redisUtil.setCacheObject("temperingengineerId", engineerId);
+ }
}
--
Gitblit v1.8.0