From f00e9e5848711cbf735bf8d56be2a93cb7e850bf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 九月 2024 13:45:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 353453e..e5d34d7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -210,13 +210,6 @@
S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 1);
log.info("7銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
- Damage damage=new Damage();
- damage.setGlassId(glassInfo.getGlassId());
- damage.setWorkingProcedure("鍒囧壊");
- damage.setLine(1001);
- damage.setType(1);
- damage.setRemark("杩涘崸寮忕悊鐗�");
- damageService.insertDamage(damage);
}
@@ -665,7 +658,7 @@
damage.setWorkingProcedure("鍒囧壊");
damage.setLine(1001);
damage.setType(1);
- damage.setRemark("杩涘崸寮忕悊鐗�");
+ damage.setRemark("杩囧崸寮忕悊鐗�");
damageService.insertDamage(damage);
return Boolean.TRUE;
}
--
Gitblit v1.8.0