From a86418430d5bba912c2b56fc24e5c6232a7a039c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 24 十月 2024 09:30:32 +0800
Subject: [PATCH] 国自agv服务器IP修改
---
src/main/java/com/zy/asrs/utils/MatCompareUtils.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/MatCompareUtils.java b/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
index 5b26158..947f84f 100644
--- a/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
+++ b/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
@@ -15,7 +15,7 @@
private static final Logger log = LoggerFactory.getLogger(MatCompareUtils.class);
- private static final String[] sameFields = {"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType"};
+ private static final String[] sameFields = {"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType","color"};
public static boolean compare(Object object1, Object object2) {
@@ -25,9 +25,8 @@
for (String fieldName : sameFields) {
Object fieldValue1 = getFieldValue(object1, fieldName);
Object fieldValue2 = getFieldValue(object2, fieldName);
- if (isSame(fieldValue1, fieldValue2)) {
- log.info("瀛楁{}淇℃伅涓�鑷达紝{}-{}", fieldName, fieldValue1, fieldValue2);
- }else {
+ if (!isSame(fieldValue1, fieldValue2)) {
+ log.info("瀛楁{}淇℃伅涓嶄竴鑷达紝{}_{}-{}_{}", fieldName, object1.getClass(), fieldValue1, object2.getClass(), fieldValue2);
return false;
}
}
@@ -49,13 +48,11 @@
Field field = null;
try {
field = aClass.getDeclaredField(fieldName);
- } catch (NoSuchFieldException e) {
- return null;
- }
- field.setAccessible(true); // 璁剧疆涓哄彲璁块棶
- try {
+ // 璁剧疆涓哄彲璁块棶
+ field.setAccessible(true);
return field.get(object);
- } catch (IllegalAccessException e) {
+ } catch (NoSuchFieldException | IllegalAccessException e) {
+ log.error("瀛楁{}缂哄け,瀵硅薄{}", fieldName, object);
return null;
}
}
--
Gitblit v1.9.1