From 6acde3b011f5f1b843c6f097baf64fbd9b574b23 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 24 六月 2024 21:38:00 +0800
Subject: [PATCH] 下片任务进片逻辑已完成,待测试优化

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
index 3c7b2d0..89770f5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
@@ -1,33 +1,51 @@
 package com.mes.downglassinfo.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mes.downglassinfo.entity.DownGlassInfo;
 import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
 import com.mes.downglassinfo.service.DownGlassInfoService;
+import com.mes.downworkstation.entity.dto.DownGlassInfoDTO;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service
 public class DownGlassInfoServiceImpl extends ServiceImpl<DownGlassInfoMapper, DownGlassInfo> implements DownGlassInfoService {
 
-    // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
+    /**
+     * 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
+     */
     @Override
     public Integer getMaxSequenceByFlowCardId(String flowCardId) {
-        QueryWrapper<DownGlassInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("flow_card_id", flowCardId);
-        queryWrapper.select("MAX(sequence)"); // 閫夋嫨鏈�澶у簭鍙�
-        DownGlassInfo downGlassInfo = baseMapper.selectOne(queryWrapper);
-        if (downGlassInfo != null) {
-            return downGlassInfo.getSequence(); // 杩斿洖鏈�澶у簭鍙�
-        }
-        return 0; // 濡傛灉娌℃湁鎵惧埌璁板綍锛岃繑鍥�0鎴栬�呭叾浠栭�傚綋鐨勫��
+        LambdaQueryWrapper<DownGlassInfo> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(DownGlassInfo::getFlowCardId, flowCardId)
+                .select(DownGlassInfo::getSequence)
+                .orderByDesc(DownGlassInfo::getSequence)
+                .last("LIMIT 1");
+
+        DownGlassInfo downGlassInfo = baseMapper.selectOne(lambdaQueryWrapper);
+        return downGlassInfo != null ? downGlassInfo.getSequence() : 0;
     }
+
     @Override
     public void insertDownGlassInfo(DownGlassInfo downGlassInfo) {
         baseMapper.insert(downGlassInfo);
     }
 
+    @Override
+    public DownGlassInfoDTO queryDownGlassMaxLayer(String flowCardId) {
+        return baseMapper.queryDownGlassMaxLayer(flowCardId);
+    }
 
+    @Override
+    public Integer queryMaxSequence(String flowCardId, int layer) {
+        return baseMapper.queryMaxSequence(flowCardId, layer);
+    }
 
-
-
+    @Override
+    public List<DownGlassInfoDTO> queryWorkStationNotIn() {
+        return baseMapper.queryWorkStationNotIn();
+    }
 }

--
Gitblit v1.8.0