自动化立体仓库 - WMS系统
ZY
2024-09-20 9ef9076a630ead624c2c24bee28454836eb25b84
初步改完,接下来进行测试
2个文件已修改
19 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/utils/MatCompareUtils.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/web/WcsController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
        }
    }
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());