From b804d88d626d1df675a3278c859b37758c55432b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 13:42:06 +0800
Subject: [PATCH] 1、增加流程卡进度查询，可根据工程号，流程卡号，玻璃id查看进度情况 2、钢化界面增加颜色对应注释，版图增加落架顺序 3、两个大理片界面笼子上色块显示修改为根据玻璃宽度显示 4、中空大理片右侧缺片情况显示优化 5、是否除膜从领取工程取消，在中空领取任务时选择除膜膜系（不除膜时不选择膜系），当配方中是需要除膜时并且选择的膜系与小片膜系一样时发送除膜信息 6、中空领取任务界面流程卡数量不等于已配对数量时高亮显示 7、磨边队列当后面玻璃磨边完成扫码但前面玻璃还未扫到码时高亮显示
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index ff53524..9d8d087 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -3,8 +3,6 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -13,11 +11,13 @@
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.entity.dto.DamageDTO;
+import com.mes.damage.entity.request.DamageRequest;
+import com.mes.damage.entity.vo.FlowCardDamageVO;
+import com.mes.damage.entity.vo.GlassDamageVO;
import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
-import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.pp.entity.DamageDetails;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.ReportingWorkDetail;
@@ -233,6 +233,27 @@
*/
@Override
public void insertDamage(Damage damage) {
+ LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
+ glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
+ GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoSelectWrapper);
+ BeanUtils.copyProperties(glassInfo, damage);
+
+ LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper = new LambdaQueryWrapper<>();
+ workAssignmentSelectWrapper
+ .eq(WorkAssignment::getLine, damage.getLine())
+ .eq(WorkAssignment::getWorkProcesses, damage.getWorkingProcedure());
+ WorkAssignment workAssignment = workAssignmentMapper.selectOne(workAssignmentSelectWrapper);
+ if (workAssignment != null) {
+ damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName());
+ damage.setDeviceName(workAssignment.getDeviceName());
+ }
+ damage.setProcessId(glassInfo.getFlowCardId());
+ damage.setOrderNumber(glassInfo.getGlassType());
+ damage.setTechnologyNumber(glassInfo.getLayer());
+ damage.setDamageTime(Timestamp.valueOf(LocalDateTime.now()));
+ if (damage.getType() == null) {
+ damage.setType(1);
+ }
List<Damage> damage1 = null;
if (Const.GLASS_STATE_DAMAGE.equals(damage.getType()) || Const.GLASS_STATE_TAKE.equals(damage.getType())) {
damage1 = baseMapper.selectList(
@@ -252,33 +273,18 @@
);
}
if (damage1 == null || damage1.size() == 0) {
- LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
- glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
- GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoSelectWrapper);
- BeanUtils.copyProperties(glassInfo, damage);
-
- LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper = new LambdaQueryWrapper<>();
- workAssignmentSelectWrapper
- .eq(WorkAssignment::getLine, damage.getLine())
- .eq(WorkAssignment::getWorkProcesses, damage.getWorkingProcedure());
- WorkAssignment workAssignment = workAssignmentMapper.selectOne(workAssignmentSelectWrapper);
- if (workAssignment != null) {
- damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName());
- damage.setDeviceName(workAssignment.getDeviceName());
- }
- damage.setProcessId(glassInfo.getFlowCardId());
- damage.setOrderNumber(glassInfo.getGlassType());
- damage.setTechnologyNumber(glassInfo.getLayer());
- damage.setDamageTime(Timestamp.valueOf(LocalDateTime.now()));
- if (damage.getType() == null) {
- damage.setType(1);
- }
if (damage.getType() == 1 && submitReport(damage)) {
damage.setStatus(3);
} else {
damage.setStatus(1);
}
baseMapper.insert(damage);
+ } else {
+ if (damage.getType() == 1) {
+ //閲嶅杩涘叆
+ damage.setStatus(9);
+ baseMapper.insert(damage);
+ }
}
}
@@ -358,7 +364,7 @@
// 鐩爣绯荤粺鐨凙PI URL
- String url1 = ERP_URL + "/reportingWork/mesReportingWork";
+ String url1 = ERP_URL + "/reportingWork/mesReportingWorkRedis";
String url2 = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
String url;
if (type) {
@@ -393,7 +399,8 @@
result.put("detail", detailsJsonArray);
}
JSONObject reportingWorkJson = new JSONObject(objectMapper.writeValueAsString(reportingWork));
- reportingWorkJson.put("reportingWorkTime", reportingWork.getReportingWorkTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ reportingWorkJson.put("reportingWorkTime", reportingWork.getReportingWorkTime().format(formatter));
// 灏� JSON 瀵硅薄鍜屾暟缁勬坊鍔犲埌缁撴灉瀵硅薄涓�
result.put("title", reportingWorkJson);
@@ -435,7 +442,7 @@
int code = jsonResponse.getInt("code");
String message = jsonResponse.getStr("data");
log.info("鎶ュ伐鎯呭喌锛歿},{}", code, message);
- if (code == 200 && message.equals("true")) {
+ if (code == 200) {
return true;
} else {
return false;
@@ -451,4 +458,14 @@
public List<Damage> queryUnTempByFlowCardId(String flowCardId) {
return baseMapper.queryUnTempByFlowCardId(flowCardId);
}
+
+ @Override
+ public List<GlassDamageVO> queryProgress(DamageRequest damageRequest) {
+ return baseMapper.queryProgress(damageRequest);
+ }
+
+ @Override
+ public List<FlowCardDamageVO> queryFlowCardIdProgress(DamageRequest damageRequest) {
+ return baseMapper.queryFlowCardIdProgress(damageRequest);
+ }
}
--
Gitblit v1.8.0