From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 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 06f0801..ac51c77 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
@@ -18,6 +18,7 @@
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.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -43,6 +44,7 @@
* @author wu
* @since 2024-06-13
*/
+@Slf4j
@Service
public class DamageServiceImpl extends MPJBaseServiceImpl<DamageMapper, Damage> implements DamageService {
@@ -51,10 +53,6 @@
@Resource
WorkAssignmentMapper workAssignmentMapper;
- @Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) {
- return null;
- }
/**
* 鏌ヨ鎶ュ伐淇℃伅
@@ -86,7 +84,7 @@
@Override
public void submitDamage(List<Damage> damageList) {
Map<String, List<Damage>> firstMap = damageList.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
- + e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));
+ + e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName() + ":" + e.getOrderNumber() + ":" + e.getTechnologyNumber()));
for (Map.Entry<String, List<Damage>> entry : firstMap.entrySet()) {
ReportingWork reportingWork = new ReportingWork();
List<ReportingWorkDetail> reportingWorkDetails = new ArrayList<>();
@@ -109,7 +107,7 @@
reportingWorkDetail.setOrderNumber(damages.get(0).getOrderNumber());
reportingWorkDetail.setCompletedQuantity(0);
reportingWorkDetail.setBreakageQuantity(0);
- reportingWorkDetails.add(reportingWorkDetail);
+
Map<String, List<Damage>> secondMap = damages.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
+ e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));
@@ -123,6 +121,7 @@
reportingWork.setThisCompletedQuantity(damagesdetails.size() + reportingWork.getThisCompletedQuantity());
} else {
reportingWork.setThisWornQuantity(damagesdetails.size() + reportingWork.getThisWornQuantity());
+ reportingWorkDetail.setBreakageQuantity(damagesdetails.size());
DamageDetails damageDetails = new DamageDetails();
damageDetails.setBreakageQuantity(damagesdetails.size());
damageDetails.setBreakageType(damagesdetails.get(0).getBreakageType());
@@ -134,6 +133,7 @@
damageDetailses.add(damageDetails);
}
}
+ reportingWorkDetails.add(reportingWorkDetail);
reportingWorkDetail.setDamageDetailsList(damageDetailses);
sendToERP(reportingWork, reportingWorkDetails);
}
@@ -170,13 +170,22 @@
*/
@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())
- );
+ 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)
+ .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());
@@ -201,7 +210,9 @@
}
if (damage.getType() == 1) {
if (submitReport(damage)) {
- damage.setStatus(2);
+ damage.setStatus(3);
+ } else {
+ damage.setStatus(1);
}
}
baseMapper.insert(damage);
@@ -272,12 +283,13 @@
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)
);
}
@Override
public Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails) {
+ log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
try {
// 鐩爣绯荤粺鐨凙PI URL
String url = "http://192.168.1.199:8086/reportingWork/mesSaveReportingWorkWorn";
@@ -335,11 +347,10 @@
// 鎻愬彇 code 鍜� message
int code = jsonResponse.getInt("code");
String message = jsonResponse.getStr("data");
-
+ log.info("鎶ュ伐澶辫触锛歿},{}", code, message);
if (code == 200 && message.equals("true")) {
return true;
} else {
-
return false;
}
}
--
Gitblit v1.8.0