Merge branch 'devlop' into devlop_whxrwms

skyouc

5 天以前 da0fd7be060ab4a0225c70c6572b2947484a2cb1

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

@@ -70,7 +70,8 @@
    public void InStockToLog() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getType, OrderType.ORDER_IN.type)
                .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_EXCE.val));
                .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_EXCE.val)
                .apply("anfme = qty"));
        if (wkOrders.isEmpty()) {
            return;
        }
@@ -94,8 +95,8 @@
    public void outStockComplete() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
                .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
                .apply("anfme = qty")
                .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)

        );
        if (wkOrders.isEmpty()) {
            return;
@@ -189,6 +190,13 @@
                   throw new CoolException("上报状态修改失败！！");
               }
            }
            try {
                //休眠3秒
                Thread.sleep(3000);
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }

        });
    }

@@ -204,8 +212,8 @@
    @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>()
                .in(WkOrderItem::getOrderId, longSet));