From 0c86561c023aa79914aa1f494b2a91ad5c38b38f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 十一月 2025 08:14:22 +0800
Subject: [PATCH] 1、报工查询添加显示宽，高
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 197 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 146 insertions(+), 51 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 a27568f..ff53524 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,22 +3,28 @@
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;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
+import com.mes.damage.entity.dto.DamageDTO;
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;
import com.mes.work_assignment.entity.WorkAssignment;
import com.mes.work_assignment.mapper.WorkAssignmentMapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -32,6 +38,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -53,33 +60,57 @@
@Resource
WorkAssignmentMapper workAssignmentMapper;
- @Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) {
- return null;
- }
+
+ private final static String ERP_URL = "http://192.168.2.100:8086";
+
/**
* 鏌ヨ鎶ュ伐淇℃伅
*/
- @Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
- LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
- damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
- if (type != 0) {
- damageSelectWrapper.eq(Damage::getType, type);
- }
- if (status != 0) {
- damageSelectWrapper.eq(Damage::getStatus, status);
- }
- if (!"0".equals(workingProcedure)) {
- damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
- }
- List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
- for (Damage damage : damageList) {
- damage.setStatus(2);
+ /**
+ * 鍒嗛〉鏌ヨ鎹熷潖璁板綍
+ *
+ * @param startTime 寮�濮嬫椂闂达紙鏍煎紡锛歽yyy-MM-dd HH:mm:ss锛�
+ * @param endTime 缁撴潫鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
+ * @param type 鎹熷潖绫诲瀷锛�0琛ㄧず鏌ヨ鎵�鏈夌被鍨嬶級
+ * @param status 鐘舵�侊紙0琛ㄧず鏌ヨ鎵�鏈夌姸鎬侊級
+ * @param workingProcedure 宸ュ簭锛�"0"琛ㄧず鏌ヨ鎵�鏈夊伐搴忥級
+ * @param pageNum 椤电爜锛堜粠1寮�濮嬶級
+ * @param pageSize 姣忛〉鏉℃暟
+ * @return 鍒嗛〉鍚庣殑鎹熷潖璁板綍鍒楄〃
+ */
+ @Override
+ public Page<DamageDTO> selectDamage(
+ String startTime,
+ String endTime,
+ int type,
+ int status,
+ String workingProcedure,
+ int pageNum, // 鏂板锛氬姩鎬侀〉鐮�
+ int pageSize // 鏂板锛氬姩鎬佹瘡椤垫潯鏁�
+ ) {
+ if (workingProcedure == null || workingProcedure.trim().isEmpty() || "0".equals(workingProcedure)) {
+ workingProcedure = null;
}
- return baseMapper.selectList(damageSelectWrapper);
+ Page<DamageDTO> page = new Page<>(pageNum, pageSize);
+ List<DamageDTO> damages = this.baseMapper.selectDamageList(
+ startTime,
+ endTime,
+ type,
+ status,
+ workingProcedure
+ );
+ page.setTotal(damages.size());
+ int startIndex = (int) ((pageNum - 1) * pageSize);
+ int endIndex = Math.min((int) (pageNum * pageSize), damages.size());
+ if (startIndex < endIndex) {
+ List<DamageDTO> pageRecords = damages.subList(startIndex, endIndex);
+ page.setRecords(pageRecords);
+ } else {
+ page.setRecords(Collections.emptyList());
+ }
+ return page;
}
/**
@@ -97,7 +128,12 @@
reportingWork.setOrderId(damages.get(0).getProcessId().substring(0, 10));
reportingWork.setProductionId(damages.get(0).getProcessId().substring(0, 11));
reportingWork.setProcessId(damages.get(0).getProcessId() + "/" + damages.get(0).getTechnologyNumber());
- reportingWork.setDeviceName(damages.get(0).getDeviceName());
+// reportingWork.setDeviceName(damages.get(0).getDeviceName());
+ if (StringUtils.isBlank(damages.get(0).getDeviceName())) {
+ reportingWork.setDeviceName("auto");
+ } else {
+ reportingWork.setDeviceName(damages.get(0).getDeviceName());
+ }
reportingWork.setThisProcess(damages.get(0).getWorkingProcedure());
reportingWork.setThisCompletedQuantity(0);
reportingWork.setThisWornQuantity(0);
@@ -134,12 +170,21 @@
damageDetails.setResponsibleEquipment(damagesdetails.get(0).getResponsibleEquipment());
damageDetails.setResponsibleTeam(damagesdetails.get(0).getResponsibleTeam());
damageDetails.setResponsiblePersonnel(null);
+ if (damagesdetails.get(0).getStatus() == 7) {
+ damageDetails.setQualityInspector("auto");
+ damageDetails.setPatchStatus(1);
+ damageDetails.setQualityInsStatus(2);
+ } else {
+ damageDetails.setQualityInspector("");
+ damageDetails.setPatchStatus(0);
+ damageDetails.setQualityInsStatus(0);
+ }
damageDetailses.add(damageDetails);
}
}
reportingWorkDetails.add(reportingWorkDetail);
- reportingWorkDetail.setDamageDetailsList(damageDetailses);
- sendToERP(reportingWork, reportingWorkDetails);
+ reportingWorkDetail.setDamageDetails(damageDetailses);
+ sendToERP(reportingWork, reportingWorkDetails, Boolean.FALSE);
}
}
@@ -149,9 +194,12 @@
reportingWork.setOrderId(damage.getProcessId().substring(0, 10));
reportingWork.setProductionId(damage.getProcessId().substring(0, 11));
reportingWork.setProcessId(damage.getProcessId() + "/" + damage.getTechnologyNumber());
- reportingWork.setDeviceName(damage.getDeviceName());
+ if (StringUtils.isBlank(damage.getDeviceName())) {
+ reportingWork.setDeviceName("auto");
+ } else {
+ reportingWork.setDeviceName(damage.getDeviceName());
+ }
reportingWork.setThisProcess(damage.getWorkingProcedure());
-// reportingWork.setNextProcess("纾ㄨ竟");
reportingWork.setThisCompletedQuantity(1);
reportingWork.setThisWornQuantity(0);
reportingWork.setClasses("鏃╃彮");
@@ -166,7 +214,18 @@
reportingWorkDetail.setCompletedQuantity(1);
reportingWorkDetail.setBreakageQuantity(0);
reportingWorkDetails.add(reportingWorkDetail);
- return sendToERP(reportingWork, reportingWorkDetails);
+ return sendToERP(reportingWork, reportingWorkDetails, Boolean.TRUE);
+ }
+
+ @Override
+ public void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type) {
+ Damage damage = new Damage();
+ damage.setGlassId(glassId);
+ damage.setWorkingProcedure(workingProcedure);
+ damage.setLine(deviceId);
+ damage.setType(type);
+ damage.setRemark(remark);
+ this.insertDamage(damage);
}
/**
@@ -174,14 +233,24 @@
*/
@Override
public void insertDamage(Damage damage) {
- List<Damage> damage1 = baseMapper.selectList(
- new LambdaQueryWrapper<Damage>()
- .ne(Damage::getType, Const.GLASS_STATE_DAMAGE)
- .ne(Damage::getType, Const.GLASS_STATE_TAKE)
- .eq(Damage::getLine, damage.getLine())
- .eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
- .eq(Damage::getGlassId, damage.getGlassId())
- );
+ List<Damage> damage1 = null;
+ if (Const.GLASS_STATE_DAMAGE.equals(damage.getType()) || Const.GLASS_STATE_TAKE.equals(damage.getType())) {
+ damage1 = baseMapper.selectList(
+ new LambdaQueryWrapper<Damage>()
+ .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .notIn(Damage::getStatus, 7, 8)
+ .lt(Damage::getStatus, 7)
+ .eq(Damage::getGlassId, damage.getGlassId())
+ );
+ } else {
+ damage1 = baseMapper.selectList(
+ new LambdaQueryWrapper<Damage>()
+ .notIn(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .eq(Damage::getLine, damage.getLine())
+ .eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
+ .eq(Damage::getGlassId, damage.getGlassId())
+ );
+ }
if (damage1 == null || damage1.size() == 0) {
LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
@@ -204,12 +273,10 @@
if (damage.getType() == null) {
damage.setType(1);
}
- if (damage.getType() == 1) {
- if (submitReport(damage)) {
- damage.setStatus(3);
- } else {
- damage.setStatus(1);
- }
+ if (damage.getType() == 1 && submitReport(damage)) {
+ damage.setStatus(3);
+ } else {
+ damage.setStatus(1);
}
baseMapper.insert(damage);
}
@@ -279,16 +346,26 @@
baseMapper.delete(
new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
- .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
+ .lt(Damage::getStatus, 7)
);
}
@Override
- public Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails) {
+ public Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails, Boolean type) {
log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
try {
// 鐩爣绯荤粺鐨凙PI URL
- String url = "http://192.168.1.199:8086/reportingWork/mesSaveReportingWorkWorn";
+
+
+ String url1 = ERP_URL + "/reportingWork/mesReportingWork";
+ String url2 = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
+ String url;
+ if (type) {
+ url = url1;
+ } else {
+ url = url2;
+ }
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
@@ -304,19 +381,33 @@
ObjectMapper objectMapper = new ObjectMapper();
// 灏� ReportingWork 杞崲涓� JSONObject
+
+ // 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
+
+ if (type) {
+ JSONObject detailsJsonObject = new JSONObject(objectMapper.writeValueAsString(reportingWorkDetails.get(0)));
+ result.put("detail", detailsJsonObject);
+ reportingWork.setProcessId(reportingWork.getProcessId().substring(0, 14));
+ } else {
+ JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails));
+ result.put("detail", detailsJsonArray);
+ }
JSONObject reportingWorkJson = new JSONObject(objectMapper.writeValueAsString(reportingWork));
reportingWorkJson.put("reportingWorkTime", reportingWork.getReportingWorkTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
- // 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
- JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails));
-
// 灏� JSON 瀵硅薄鍜屾暟缁勬坊鍔犲埌缁撴灉瀵硅薄涓�
result.put("title", reportingWorkJson);
- result.put("detail", detailsJsonArray);
+
result.put("type", 0);
+ if (reportingWorkDetails.get(0).getDamageDetails() != null) {
+ if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
+ result.put("isPatch", 1);
+ } else {
+ result.put("isPatch", 0);
+ }
+ }
result.put("userId", "admin");
result.put("userName", "admin");
result.put("qualityInsStatus", 0);
-
// 灏� result 瀵硅薄杞崲涓哄瓧绗︿覆
String jsonInputString = result.toString();
System.out.println("jsonInputString : " + result);
@@ -343,17 +434,21 @@
// 鎻愬彇 code 鍜� message
int code = jsonResponse.getInt("code");
String message = jsonResponse.getStr("data");
- log.info("鎶ュ伐澶辫触锛歿},{}", code, message);
+ log.info("鎶ュ伐鎯呭喌锛歿},{}", code, message);
if (code == 200 && message.equals("true")) {
return true;
} else {
return false;
}
}
-
} catch (Exception e) {
e.printStackTrace();
return false;
}
}
+
+ @Override
+ public List<Damage> queryUnTempByFlowCardId(String flowCardId) {
+ return baseMapper.queryUnTempByFlowCardId(flowCardId);
+ }
}
--
Gitblit v1.8.0