From e0fa0221d82f3b800cf7a6389f8cd592e0582212 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:29:42 +0800
Subject: [PATCH] 增加order模块，更改小片表需求数据,删除无用模块
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index f93019e..5dd8f54 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -1,20 +1,24 @@
package com.mes.glassinfo.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.toolkit.JoinWrappers;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.entity.OptimizeGlassinfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
+import com.mes.uppattenusage.entity.UpPattenUsage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -35,12 +39,13 @@
List<OptimizeGlassinfo> optimizeGlassinfos=null;
if (engineeringId != null) {
optimizeGlassinfos = optimizeProjectMapper.selectJoinList(OptimizeGlassinfo.class, new MPJQueryWrapper<OptimizeProject>()
- .select("b.process_id,t.type,b.width,b.height,t.glass_thickness,t.glass_type,b.p_width,b.p_height,b.layer, b.total_layer, b.stock_id,b.heat_layout_id,b.heat_layout_sort,b.x_axis,b.y_axis,b.project_no,b.glass_id")
+ .select("b.process_id,t.glass_type,b.o_width,b.o_height,t.glass_thickness,b.order_sort,b.p_width,b.p_height,b.layer, b.total_layer, b.stock_id,b.heat_layout_id,b.heat_layout_sort,c.x_axis,c.y_axis,b.project_no,b.glass_id,c.rotate_angle")
.leftJoin("optimize_detail b on t.project_no=b.project_no")
- .eq("t.state",100)
+ .leftJoin("optimize_heat_detail c on c.project_no=t.project_no and b.heat_layout_id=c.layout_id and b.heat_layout_sort=c.sort")
+ //.eq("t.state",100)
.eq("t.project_no", engineeringId));
}
-
+ //order_sort,o_width,o_height
// 鍒涘缓涓�涓� List 鐢ㄤ簬淇濆瓨鏄犲皠鍚庣殑瀹炰綋瀵硅薄
List<GlassInfo> resultList = new ArrayList<>();
@@ -52,9 +57,9 @@
glassInfo.setEngineerId(map.getProjectNo());
glassInfo.setFlowCardId(map.getProcessId());
glassInfo.setFilmsid(map.getGlassType());
- glassInfo.setGlassType(map.getType());
- glassInfo.setWidth(map.getWidth());
- glassInfo.setHeight(map.getHeight());
+ glassInfo.setGlassType(map.getOrderSort());//璁㈠崟搴忓彿
+ glassInfo.setWidth(map.getOWidth());//璁㈠崟瀹�
+ glassInfo.setHeight(map.getOHeight());//璁㈠崟楂�
glassInfo.setEdgWidth(map.getPWidth());
glassInfo.setLayer(map.getLayer());
glassInfo.setTotalLayer(map.getTotalLayer());
@@ -65,7 +70,7 @@
glassInfo.setTemperingFeedSequence(map.getHeatLayoutSort());//閽㈠寲鐗堝浘椤哄簭
glassInfo.setXCoordinate(map.getXAxis());
glassInfo.setYCoordinate(map.getYAxis());
-
+ glassInfo.setAngle(map.getRotateAngle());
glassInfo.setGlassId(map.getGlassId());
// 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
resultList.add(glassInfo);
@@ -80,4 +85,37 @@
public void saveGlassInfo(List<GlassInfo> glassinfo) {
this.saveBatch(glassinfo);
}
+
+
+
+
+
+
+ @Override
+ public int getGlassInfoCountByFlowCardId(String flowCardId) {
+ return baseMapper.selectCount(new QueryWrapper<GlassInfo>().lambda()
+ .eq(GlassInfo::getFlowCardId, flowCardId));
+ }
+
+
+
+ @Override
+ public List<Map<String, Object>> getFlowCardId() {
+ return baseMapper.selectJoinMaps(JoinWrappers.lambda(GlassInfo.class)
+ .select(GlassInfo::getFlowCardId)
+ .leftJoin(UpPattenUsage.class, on -> on
+ .eq(OptimizeProject::getProjectNo, GlassInfo::getEngineerId)
+ .ne(OptimizeProject::getState, 300)
+ )
+ .groupBy(GlassInfo::getFlowCardId)
+ );
+ }
+
+
+
+
+
+
+
+
}
--
Gitblit v1.8.0