From 30fd531c95ece1c0e7306cad138307dedd459d9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 二月 2025 08:49:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index e7bdf13..f1beb4e 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -1,11 +1,14 @@
package com.mes.uppattenusage.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.damage.entity.request.DamageRequest;
+import com.mes.damage.service.DamageService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
@@ -37,6 +40,8 @@
OptimizeProjectMapper optimizeProjectMapper;
@Autowired
EngineeringService engineeringService;
+ @Autowired
+ DamageService damageService;
@Override
public List<UpPattenUsage> prioritylist() {
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
@@ -44,18 +49,35 @@
//log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
if(engineering!=null){
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
+ wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
return this.list(wrapper);
- }else {
- return null;
+ } else {
+ return null;
}
}
@Override
+ public List<UpPattenUsage> selectLoadTask(Integer cell) {
+ //鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
+ Engineering engineering= engineeringService.selectInitiates(1,cell);
+ //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
public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId());
+ wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId());
+// .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
+// .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
+
return this.list(wrapper);
}
@@ -66,7 +88,7 @@
List<OptimizeUpPattenUsage> upPattenUsageList = null;
if (engineeringId != null) {
upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
- .select("t.project_no,t.glass_type,b.o_width as width,b.o_height as height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.stock_id")
+ .select("t.project_no,t.glass_type,b.realwidth as width,b.realheight as 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));
}
@@ -96,25 +118,50 @@
@Override
public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
- this.saveBatch(upPattenUsage);
- //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+ if (CollectionUtil.isEmpty(upPattenUsage)){
+ return;
+ }
+ String engineerId = upPattenUsage.get(0).getEngineeringId();
+ int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
+ if (count <=0){
+ //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+ this.saveBatch(upPattenUsage);
+ }
}
@Override
public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
upPattenUsage.setState(state);
- boolean updateSuccess=this.updateById(upPattenUsage);
- log.info("鏇存柊鐘舵�亄}",updateSuccess);
+ boolean updateSuccess = this.updateById(upPattenUsage);
+ log.info("鏇存柊鐘舵�亄}", updateSuccess);
//鏇存柊鐘舵��
}
@Override
- public UpPattenUsage selectedEngineering(String engineeringId) {
- QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
- wrapper.eq("engineering_id",engineeringId)
+ public UpPattenUsage selectedTaskEngineering(String engineeringId) {
+ return null;
+ }
+
+ @Override
+ public UpPattenUsage selectedEngineering(String engineerId) {
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id", engineerId)
+// .eq("station_cell", stationCell)
+// .eq("film_remove", filmRemove)
.last("limit 1");
+ log.info("鏌ヨ棰勮鍙傛暟");
+ log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
return this.getOne(wrapper);
}
+
+ @Override
+ public void deleteTask(String engineerId) {
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id",engineerId);
+ this.remove(wrapper);
+ }
+
+
@Override
public UpPattenUsage selectOverTask() {
@@ -138,10 +185,24 @@
@Override
public Boolean updateGlassState(UpPattenUsage upPattenUsage) {
UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("id",upPattenUsage.getId())
- .set("state",upPattenUsage.getState());
+ updateWrapper.eq("id", upPattenUsage.getId())
+ .set("state", upPattenUsage.getState());
return this.update(updateWrapper);
}
+ @Override
+ public List<Engineering> setRawGlassTaskRequest(Engineering request) {
+ return null;
+ }
+ public Object Engineering(Engineering request) {
+ return null;
+ }
+
+ @Override
+ public String identControls(DamageRequest request) {
+ //灏嗚瘑鍒牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "涓婄墖鏈�", request.getState());
+ return "success";
+ }
}
--
Gitblit v1.8.0