From 899813196f304b8e837f0dcff059b0110c82e110 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 16:07:38 +0800
Subject: [PATCH] Merge branch 'aerjiliya' of http://10.153.19.25:10105/r/YiWuProject into aerjiliya
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index d4820b7..7a99bed 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -37,7 +37,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -55,6 +55,7 @@
DamageService damageService;
@Autowired
RedisUtil redisUtil;
+
@Resource
RawGlassStorageDetailsService rawGlassStorageDetailsService;
@@ -114,7 +115,7 @@
// 鍒涘缓涓�涓� List 鐢ㄤ簬淇濆瓨鏄犲皠鍚庣殑瀹炰綋瀵硅薄
List<UpPattenUsage> resultList = new ArrayList<>();
-// 閬嶅巻鏌ヨ缁撴灉涓殑姣忎釜 Map 瀵硅薄
+ // 閬嶅巻鏌ヨ缁撴灉涓殑姣忎釜 Map 瀵硅薄
if (upPattenUsageList != null) {
for (OptimizeUpPattenUsage map : upPattenUsageList) {
// 鍒涘缓涓�涓柊鐨� OptimizeProject 瀵硅薄
@@ -179,6 +180,7 @@
wrapper.eq("engineering_id", engineerId);
this.remove(wrapper);
}
+
@Override
@@ -283,7 +285,8 @@
Engineering engineering = new Engineering();
engineering.setEngineerId(engineerId);
engineering.setEngineerName(rawGlassStorageDetails.getFilmsId());
- engineering.setState(5);
+ engineering.setState(1);
+ engineering.setStationCell(5);
engineering.setPlanPatternTotal(slot);
engineering.setFilmsId(rawGlassStorageDetails.getFilmsId());
engineeringService.save(engineering);
@@ -318,4 +321,13 @@
// 4. 鎷兼帴宸ョ▼鍙凤紙鍓嶇紑+鏃ユ湡+琛�0鍚庣殑搴忓彿锛�
return PREFIX + dateStr + formattedSequence;
}
+
+ @Override
+ public Boolean deleteUpPattenTask(String id) {
+ //鍒犻櫎涓婄墖椤哄簭琛�
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("id",id);
+ return this.remove(wrapper);
+ }
+
}
--
Gitblit v1.8.0