From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期四, 18 四月 2024 14:44:11 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java index fcf4605..d064db4 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java @@ -1,9 +1,7 @@ package com.mes.uppattenusage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.mes.downworkstation.entity.DownWorkstation; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.mapper.GlassInfoMapper; import com.mes.glassinfo.service.GlassInfoService; @@ -15,7 +13,7 @@ /** * <p> - * 鏈嶅姟瀹炵幇绫� + * 鏈嶅姟瀹炵幇绫� * </p> * * @author zhoush @@ -38,10 +36,12 @@ return baseMapper.selectCount(queryWrapper); } + @Override public List<Map<String, Object>> getFlowCardId() { return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().select("DISTINCT flowcard_id")); } + @Override public GlassInfo selectGlassId(String id) { QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>(); @@ -49,7 +49,6 @@ return baseMapper.selectOne(queryWrapper); } - // public void updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId) { -- Gitblit v1.8.0