From 09381335e11d32e01c8067b71d897c7064ec279d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 20 五月 2024 14:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 15 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index cf60362..132a0e5 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -2,8 +2,11 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
@@ -14,9 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -32,27 +33,87 @@
@Autowired
OptimizeProjectMapper optimizeProjectMapper;
+ @Autowired
+ EngineeringService engineeringService;
@Override
- public List<UpPattenUsage> prioritylist(int state) {
- log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
- LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getState,state);
- log.info("杩斿洖宸ョ▼淇℃伅");
- return this.list(wrapper);
+ public List<UpPattenUsage> prioritylist() {
+ //鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
+ Engineering engineering= engineeringService.selectInitiate(1);
+ log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
+ if(engineering!=null){
+ LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
+ return this.list(wrapper);
+ }else {
+ return null;
+ }
+
}
@Override
@DS("pp")
- public List<Map> saveUpPattenUsage(String engineeringId) {
+ public List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId) {
+ List<OptimizeUpPattenUsage> upPattenUsageList = null;
if (engineeringId != null) {
-
- List<Map> upPattenUsageList=optimizeProjectMapper.selectJoinList(Map.class,new MPJQueryWrapper<OptimizeProject>()
- .select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.heat_layout_sort")
+ upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
+ .select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.stock_id")
.leftJoin("optimize_layout b on t.project_no=b.project_no")
- .eq("b.project_no",engineeringId));
+ .eq("b.project_no", engineeringId));
}
- return Collections.emptyList();
+ // 鍒涘缓涓�涓� List 鐢ㄤ簬淇濆瓨鏄犲皠鍚庣殑瀹炰綋瀵硅薄
+ List<UpPattenUsage> resultList = new ArrayList<>();
+
+// 閬嶅巻鏌ヨ缁撴灉涓殑姣忎釜 Map 瀵硅薄
+ if (upPattenUsageList != null) {
+ for (OptimizeUpPattenUsage map : upPattenUsageList) {
+ // 鍒涘缓涓�涓柊鐨� OptimizeProject 瀵硅薄
+ UpPattenUsage optimizeProject = new UpPattenUsage();
+ // 灏� Map 涓殑姣忎釜閿�煎鏄犲皠鍒� OptimizeProject 瀵硅薄鐨勭浉搴斿瓧娈典笂
+ optimizeProject.setEngineeringId(map.getProjectNo());
+ optimizeProject.setFilmsId( map.getGlassType());
+ optimizeProject.setWidth(map.getWidth());
+ optimizeProject.setHeight( map.getHeight());
+ optimizeProject.setThickness(map.getGlassThickness());
+ optimizeProject.setLayoutSequence( map.getStockId());
+ optimizeProject.setState(0);
+ // 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
+ resultList.add(optimizeProject);
+ }
+ }
+ log.info("鏌ヨ鍑轰笂鐗囬『搴忛泦鍚堜繚瀛樺埌瀹炰綋绫粄}",resultList);
+ return resultList;
+ }
+
+ @Override
+ public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
+ this.saveBatch(upPattenUsage);
+ //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+ }
+
+ @Override
+ public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
+ upPattenUsage.setState(state);
+ boolean updateSuccess=this.updateById(upPattenUsage);
+ log.info("鏇存柊鐘舵�亄}",updateSuccess);
+ //鏇存柊鐘舵��
+ }
+
+ @Override
+ public UpPattenUsage selectedEngineering(String engineeringId) {
+ QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id",engineeringId)
+ .last("limit 1");
+ return this.getOne(wrapper);
+ }
+
+ @Override
+ public UpPattenUsage selectOverTask() {
+ QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
+ wrapper.gt("state",0)
+ .lt("state",99)
+ .last("limit 1");
+ return this.getOne(wrapper);
}
--
Gitblit v1.8.0