#

yxFwq

7 小时以前 7714207440d4774b84b6490406bdebf228c1fee6

#

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -1250,9 +1250,8 @@
                .eq("weight", param.getWeight());
        if (param.getDevNo() == 536){
//            .eq("model", param.getTaskNo())
            wrapper
                    .eq("specs", param.getOrderNo())
                    .orderBy("appe_time", true);
//                    .eq("specs", param.getOrderNo())
            wrapper.orderBy("appe_time", true);
        } else {
            wrapper.orderBy("batch", true);
        }
@@ -1280,8 +1279,8 @@
                    .gt("weight", param.getWeight());
            if (param.getDevNo() == 536){
//                        .eq("model", param.getTaskNo())
//                        .eq("specs", param.getOrderNo())
                locDetlWrapper
                        .eq("specs", param.getOrderNo())
                        .orderBy("appe_time", true)
                        .orderBy("weight", true);
            } else {
@@ -1311,8 +1310,8 @@
                    .lt("weight", param.getWeight());
            if (param.getDevNo() == 536){
//                        .eq("model", param.getTaskNo())
//                        .eq("specs", param.getOrderNo())
                locDetlWrapper
                        .eq("specs", param.getOrderNo())
                        .orderBy("appe_time", true)
                        .orderBy("weight", false);
            } else {

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -1,6 +1,7 @@
package com.zy.asrs.task;

import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
@@ -47,6 +48,9 @@
            for (Order order : orders) {
                ReturnT<String> result = orderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    if (!orderService.updateSettle(order.getId(), 7L, null)) {
                        throw new CoolException("上报失败更新订单状态异常，请联系管理员");
                    }
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                }
            }