From 8891898a6ae6229ede66c8005f2912c75ddc6d90 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 05 三月 2025 22:32:26 +0800
Subject: [PATCH] 1、fixbug:中空任务领取部分对数玻璃后继续领任务，任务显示异常bug解决 2、大理片笼/中空理片笼显示异常bug:进片任务计算目标格子后，预先将笼子插入一条记录，界面相同判断时显示存在歧义，修改数据返回逻辑：在没有目标格子前提下，如果笼内存在玻璃显示相同，有目标格子后笼内有数据不显示 3、中空理片笼进片任务优化：中空可能存在脏数据，原因人为操作或订单多补片造成中空关系订单数量与实际数据不匹配，实际数量大于订单数量，系统会重新生成一份关系造成关系进笼玻璃数据顺序存在重复而无法进笼。
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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 47ff42e..4410f73 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
@@ -7,6 +7,8 @@
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;
@@ -15,6 +17,7 @@
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import com.mes.uppattenusage.service.UpPattenUsageService;
+import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +41,10 @@
OptimizeProjectMapper optimizeProjectMapper;
@Autowired
EngineeringService engineeringService;
+ @Autowired
+ DamageService damageService;
+ @Autowired
+ RedisUtil redisUtil;
@Override
public List<UpPattenUsage> prioritylist() {
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
@@ -54,13 +61,16 @@
}
@Override
- public List<UpPattenUsage> selectLoadTask(Integer cell) {
+ public List<UpPattenUsage> selectLoadTask(Engineering cell) {
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
- Engineering engineering= engineeringService.selectInitiates(1,cell);
+ Engineering engineering = engineeringService.selectInitiates(1, cell.getStationCell());
//log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
if(engineering!=null){
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
+ if (cell.getState() != null) {
+ wrapper.eq(UpPattenUsage::getState, cell.getState());
+ }
return this.list(wrapper);
} else {
return null;
@@ -187,13 +197,36 @@
}
@Override
- public List<Engineering> setRawGlassTaskRequest(Engineering request) {
- return null;
+ public String setRawGlassTaskRequest(Engineering request) {
+ // 璋冪敤 RedisUtil 淇濆瓨 loadGlass
+ if (request == null) {
+ redisUtil.deleteObject("loadGlassRequest");
+ } else {
+ redisUtil.setCacheObject("loadGlassRequest", request);
+ }
+ return "success";
}
+
+ @Override
+ public String setRawGlassTaskRequest2(Engineering request) {
+ // 璋冪敤 RedisUtil 淇濆瓨 loadGlass
+ if (request == null) {
+ redisUtil.deleteObject("loadGlassRequest2");
+ } else {
+ redisUtil.setCacheObject("loadGlassRequest2", request);
+ }
+ return "success";
+ }
+
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