Merge branch 'devlop' into devlop_whxrwms

skyouc

6 天以前 da0fd7be060ab4a0225c70c6572b2947484a2cb1

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java

@@ -70,7 +70,7 @@
                BeanUtils.copyProperties(itemLog, item);
                item.setId(itemLog.getAsnItemId())
                        .setOrderId(order.getId())
                        .setMatnrId(Long.parseLong(itemLog.getMatnrId()))
                        .setMatnrId(itemLog.getMatnrId())
                        .setDeleted(0);
                orderItems.add(item);
            }