Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms

luxiaotao1123

2021-04-26 e3bb506579f395c5dbca3d9f0e1e10a18170240f

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

@@ -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)
@@ -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("修改订单状态失败");
                                }
                            }
                        }
                    }