From 9ef9076a630ead624c2c24bee28454836eb25b84 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 20 九月 2024 08:24:48 +0800
Subject: [PATCH] 初步改完，接下来进行测试
---
src/main/java/com/zy/asrs/utils/MatCompareUtils.java | 15 ++++++---------
src/main/java/com/zy/common/web/WcsController.java | 4 +---
2 files changed, 7 insertions(+), 12 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..2dd3c86 100644
--- a/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
+++ b/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
@@ -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;
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3245881..babf6f3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -367,9 +367,7 @@
Order order = orderService.selectByNo(waitPakin.getOrderNo());
if (order != null) {
OrderDetl orderDetl = orderDetlService.selectItem(waitPakin);
-// if (orderDetl == null) {
-// orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null,waitPakin.getAnfme());
-// }
+ wrkDetl.setProType(orderDetl.getProType());
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
wrkDetl.setLuHao(orderDetl.getLuHao());
--
Gitblit v1.9.1