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

luxiaotao1123

2021-04-09 3c2720bc6434acc91f2b085e41083bec374e5a85

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

@@ -503,6 +503,12 @@
                    boolean complete = true;
                    Set<String> existNumbers = new HashSet<>();

                    String cancelNumber = "";
                    if (!custOrderService.updateStatus(cancelNumber, 5)) {
                        throw new CoolException("修改订单状态失败");
                    }


                }
            }
        } catch (IOException e) {