From 29f942cefe9d9f4272332eec0276f2c5a60d9d9e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 一月 2025 09:13:42 +0800
Subject: [PATCH] 添加自动下片机打印标签功能
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
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 cfc0df5..c4bd971 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
@@ -141,6 +141,10 @@
BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
}
+ bigStorageCageDetailsList.sort(Comparator
+ .comparing((BigStorageCageDetails detail) -> detail.getBigStorageCageOutTask().getTrainNumber())
+ .thenComparingInt((BigStorageCageDetails detail) -> detail.getBigStorageCageOutTask().getSerialNumber()));
+
return bigStorageCageDetailsList;
}
@@ -200,15 +204,15 @@
BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);
if (temperingGlassInfo != null) {
- if (status == 0) {
+ if (status == 8) {
temperingGlassInfo.setState(Const.GLASS_STATE_DAMAGE);
} else {
temperingGlassInfo.setState(Const.GLASS_STATE_TAKE);
}
- temperingGlassInfoMapper.updateById(temperingGlassInfo);
+ temperingGlassInfoMapper.deleteById(temperingGlassInfo);
}
Damage damage = new Damage();
- if (status == 0) {
+ if (status == 8) {
bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
damage.setType(Const.GLASS_STATE_DAMAGE);
} else {
--
Gitblit v1.8.0