Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

skyouc

5 天以前 3f2b778ab3fbee3d851ed7033451cc008366ab4b

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

@@ -212,7 +212,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void moveOrderToLog(List<WkOrder> wkOrders, String type) {
        //上报已完成订单至ERP、MES等三方系统
//        reportOrders(wkOrders);
        reportOrders(wkOrders);
        //
        Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()