From 00bbe3cdbb88edc0126064b3366a4191cf56222c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 26 九月 2024 15:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 1 +
UI-Project/src/views/Caching/cachingun.vue | 2 +-
UI-Project/src/views/Slicecage/slicecage.vue | 4 ++--
UI-Project/src/views/StockBasicData/stockBasicData.vue | 4 ++--
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 15 +++++++++++----
UI-Project/src/views/Identify/identify.vue | 4 ++--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 6 +++---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 1 -
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java | 13 ++++++++++---
9 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 8e0a488..6926803 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -102,7 +102,7 @@
glassId: row.glass_id,
state: 9,
line: 1001,
- workingProcedure: '纾ㄨ竟鍓嶇悊鐗囩',
+ workingProcedure: '纾ㄨ竟',
})
if (response.code === 200) {
ElMessage.success(response.message);
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 68220a4..e785987 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -97,7 +97,7 @@
glassId: currentGlassId.value,
state: 8,
line: 1001,
- workingProcedure: '璇嗗埆',
+ workingProcedure: '鍒囧壊',
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -125,7 +125,7 @@
glassId: currentGlassId.value,
state: 9,
line: 1001,
- workingProcedure: '璇嗗埆',
+ workingProcedure: '鍒囧壊',
})
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index c741d63..6e802dc 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -642,8 +642,8 @@
const fetchFlowCardId = async () => {
try {
const response = await request.post('/cacheVerticalGlass/work_assignment/selectWorkAssignment',{
- line: 2001,
- workingProcedure : '鍐峰姞宸�'
+ line: 4001,
+ workingProcedure : '閽㈠寲'
})
if (response.code == 200) {
ElMessage.success(response.message);
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 3c0ee64..a0d3c9e 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -84,7 +84,7 @@
glassId: row.glassId,
state: 8,
line: row.line,
- workingProcedure: '鍐峰姞宸�',
+ workingProcedure: '纾ㄨ竟',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -117,7 +117,7 @@
glassId: row.glassId,
state: 9,
line: row.line,
- workingProcedure: '鍐峰姞宸�',
+ workingProcedure: '纾ㄨ竟',
})
if (response.code === 200) {
ElMessage.success(response.message);
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index 5fce20d..0bd7fff 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -44,6 +44,7 @@
@PostMapping("/submitDamage")
public Result submitDamage(@RequestBody List<Damage> damageList) {
damageService.submitDamage(damageList);
+ damageList.forEach(damage -> damage.setStatus(2));
damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
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..82f96cd 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 {
@@ -86,7 +88,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 +111,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 +125,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 +137,7 @@
damageDetailses.add(damageDetails);
}
}
+ reportingWorkDetails.add(reportingWorkDetail);
reportingWorkDetail.setDamageDetailsList(damageDetailses);
sendToERP(reportingWork, reportingWorkDetails);
}
@@ -176,6 +180,7 @@
.ne(Damage::getType, 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<>();
@@ -202,6 +207,8 @@
if (damage.getType() == 1) {
if (submitReport(damage)) {
damage.setStatus(2);
+ } else {
+ damage.setStatus(1);
}
}
baseMapper.insert(damage);
@@ -278,6 +285,7 @@
@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 +343,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;
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 976125e..67232f0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -237,7 +237,6 @@
List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
.selectAll(Engineering.class)
.eq(Engineering::getEngineerId,current)
- .gt(Engineering::getState,0)
);
if(engineering.size()==0){
log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}",current);
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 47b23c2..8a73f9e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -211,9 +211,9 @@
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
damage.setGlassId(bigStorageCageDetails.getGlassId());
damage.setWorkingProcedure("閽㈠寲");
- damage.setLine(3001);
- damage.setRemark("澶х悊鐗囩鐮存崯");
- damage.setStatus(2);
+ damage.setLine(4001);
+ damage.setRemark("澶х悊鐗囩");
+ damage.setStatus(1);
damageService.insertDamage(damage);
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
index 2ff37a9..089ecd4 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
@@ -70,15 +70,22 @@
//灏嗙‘璁ゅ瓧缃负0
plcControl.writeWord(plcParameterObject.getPlcParameter("confirmationWord").getAddress(), 0);
//鍙兘鏈夊嚑鐐夌幓鐠冨悓鏃跺湪閽紝闇�瑕佽幏鍙栭挗鍖栧皬鐗囪〃涓殑鏁版嵁淇℃伅鐘舵�佷负2锛堟棆杞彴鐜荤拑宸查�佸嚭鏈挗鍖栵紝姝ｅ湪閽㈠寲锛�
- List<TemperingGlassInfo> temperingGlassInfoList = temporaryGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
- .eq(TemperingGlassInfo::getState, Const.TEMPERING_START));
+ List<TemperingGlassInfo> temperingGlassInfoList = temporaryGlassInfoService.list(
+ new LambdaQueryWrapper<TemperingGlassInfo>()
+ .inSql(TemperingGlassInfo::getTemperingLayoutId, "select distinct tempering_layout_id from tempering_glass_info where state=1")
+ .lt(TemperingGlassInfo::getState, Const.TEMPERING_START)
+ );
if (CollectionUtils.isEmpty(temperingGlassInfoList)) {
log.info("褰撳墠绯荤粺娌℃湁闇�瑕侀挗鍖栫殑鐜荤拑淇℃伅");
return;
}
+ TemperingGlassInfo minGlassInfo = temperingGlassInfoList.stream().min(Comparator.comparingLong(TemperingGlassInfo::getState)).get();
+ if (minGlassInfo.getState() < Const.TEMPERING_DROP) {
+ log.info("褰撳墠鐐夌幓鐠冩湭鍒伴綈锛岀◢鍚庡湪鎵ц");
+ return;
+ }
//鎷垮埌宸ョ▼id鍙婄倝鍙�
TemperingGlassInfo maxGlassInfo = temperingGlassInfoList.stream().max(Comparator.comparingLong(TemperingGlassInfo::getId)).get();
-
//灏嗘鍦ㄩ挗鍖栫殑鐐夊彿杩囨护鎺夛紝浠呰幏鍙栧緟閽㈠寲鐨勭幓鐠�:鍒ゆ柇寰呴挗鐨勭幓鐠冩槸鍚﹀凡鍙戦�佸鎺ユ暟鎹�
List<TemperingRecord> temperingRecordList = temperingRecordService.list(new LambdaQueryWrapper<TemperingRecord>().eq(TemperingRecord::getEngineerId, maxGlassInfo.getEngineerId())
.eq(TemperingRecord::getTemperingLayoutId, maxGlassInfo.getTemperingLayoutId()));
--
Gitblit v1.8.0