From 509742ccad07a353e92f17109de1f83431887414 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 17 二月 2025 15:51:00 +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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 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 0cfcb0c..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,13 +1,15 @@
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.mapper.EngineeringMapper;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
@@ -38,6 +40,8 @@
OptimizeProjectMapper optimizeProjectMapper;
@Autowired
EngineeringService engineeringService;
+ @Autowired
+ DamageService damageService;
@Override
public List<UpPattenUsage> prioritylist() {
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
@@ -51,6 +55,20 @@
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
@@ -100,8 +118,15 @@
@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
@@ -128,6 +153,15 @@
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() {
@@ -157,9 +191,18 @@
}
@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