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

王佳豪

2021-06-01 391ea14026d1fe6417d4ce88ebedc6654b6519ad

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

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

@@ -570,8 +570,7 @@
                        list.add(detl0);
                    }

                    System.out.println(JSON.toJSONString(getOrderResult0));

                    log.warn(JSON.toJSONString(getOrderResult0));

                    String response = new HttpHandler.Builder()
                            .setUri(URI)

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

@@ -70,7 +70,7 @@
                detl.setUnit(mat==null?"暂无":mat.getUnit());
                detail.add(detl);
            }
            System.out.println(JSON.toJSONString(uploadBill));
            log.warn(JSON.toJSONString(uploadBill));
            String response = new HttpHandler.Builder()
                    .setUri(ErpScheduler.URI)
                    .setPath(ErpScheduler.UPLOAD_BILL)