#

luxiaotao1123

2021-05-13 e891927c45650ee475613ed5bd370f6957bb88a6

 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java

@@ -34,7 +34,7 @@
@RestController
public class ErpScheduler {

    public static final String URI = "http://8.133.182.21:8080/api";
    public static final String URI = "http://8.133.182.21:6220/api";
    public static final String GET_ORDERS = "cM/basis/getOrders";
    public static final String GET_BASIS = "cM/basis/getBasis";
    public static final String UPLOAD_BILL = "cM/basis/uploadBill";
@@ -424,7 +424,7 @@
    public void getOrdersExecute(){
        try {
            Map<String, Object> json = new HashMap<>();
            json.put("vchType", 151);
            json.put("vchType", 11);
            String response = new HttpHandler.Builder()
                    .setUri(URI)
                    .setPath(GET_ORDERS)
@@ -549,7 +549,7 @@


                    // 头
                    getOrderResult0.setNumber(order.getUuid());
                    getOrderResult0.setNumber(order.getOrderNo());
                    getOrderResult0.setVchType(11); // todo:luxiaotao
                    getOrderResult0.setBillDate(order.getOrderTime());
                    getOrderResult0.setBTypeID(order.getTel());
@@ -585,7 +585,7 @@
                        if (result.getCode() != 1) {
                            continue;
                        }
                        if (!orderService.updateSettle(getOrderResult0.getNumber(), 6L)) {
                        if (!orderService.updateSettle(order.getOrderNo(), 6L)) {
                            throw new CoolException("修改订单状态失败");
                        }
//                        // 转历史档
@@ -747,7 +747,7 @@
    public void getCancelOrdersExecute(){
        try {
            Map<String, Object> json = new HashMap<>();
            json.put("vchType", 151);
            json.put("vchType", 11);
            json.put("flag", 2);
            String response = new HttpHandler.Builder()
                    .setUri(URI)
@@ -769,8 +769,13 @@
                        existNumbers.add(result0.getNumber());
                    }
                    for (String number : existNumbers) {
                        if (!orderService.updateSettle(number, 5L)) {
                        Order order = orderService.selectByOrderNo(number);
                        if (order != null) {
                            if (order.getSettle() != 3L && order.getSettle() != 5L) {
                                if (!orderService.updateSettle(number, 5L)) {
//                            throw new CoolException("修改订单状态失败");
                                }
                            }
                        }
                    }