Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

昨天 53526a6c99085577969aec2cdd0a13fe35394e0b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java

@@ -138,7 +138,7 @@
                        .setItemCode(orderItem.getMatnrCode())
                        .setEditUser(nickName)
                        .setEditDate(order.getUpdateTime())
                        .setGoodsNO(fields.get("crushNo"))
//                        .setGoodsNO(fields.get("crushNo"))
                        .setMemoDtl(order.getMemo());

                if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {