From 1845e4a29c1231ebdc2971f99b0c57c6a608a843 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 09 五月 2024 13:20:56 +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 | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 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 2e57f39..a60db72 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,5 +1,6 @@ package com.mes.glassinfo.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.mapper.GlassInfoMapper; @@ -7,9 +8,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** * <p> - * 鏈嶅姟瀹炵幇绫� + * 鏈嶅姟瀹炵幇绫� * </p> * * @author zhoush @@ -27,16 +31,27 @@ @Override public int getGlassInfoCountByFlowCardId(String flowCardId) { - return glassInfoMapper.getGlassInfoCountByFlowCardId(flowCardId); + QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("flow_card_id", flowCardId); + + return baseMapper.selectCount(queryWrapper); } @Override - public void updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId) { - int rowsAffected = glassInfoMapper.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId); - if (rowsAffected > 0) { - System.out.println("鏇存柊鏋跺瓙涓婃祦绋嬪崱 ID 鍜屾暟閲忔垚鍔�"); - } else { - System.out.println("鏇存柊鏋跺瓙涓婃祦绋嬪崱 ID 鍜屾暟閲忓け璐�"); - } + public List<Map<String, Object>> getFlowCardId() { + return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().select("DISTINCT flow_card_id")); } + + + + @Override + public GlassInfo selectGlassId(String id) { + QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("glass_id", id); + + return baseMapper.selectOne(queryWrapper); + } + + + } -- Gitblit v1.8.0