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

skyouc

21 小时以前 3f2b778ab3fbee3d851ed7033451cc008366ab4b

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

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java

@@ -78,7 +78,7 @@
                if (result.getCode() == 200) {
                    return result;
                } else {
                    throw new CoolException("任务下发失败！！");
                    return result;
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());

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

@@ -70,8 +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)
                .apply("anfme = qty"));
                .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val)
                );
        if (wkOrders.isEmpty()) {
            return;
        }
@@ -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>()