Merge branch 'htasrs0' of https://gitee.com/luxiaotao1123/zy-asrs into htasrs0

luxiaotao1123

2021-06-18 41b22601227fa44de14737309e559e0d3909b5d6

 src/main/java/com/zy/common/service/ErpService.java

@@ -27,7 +27,7 @@

    @Value("${erp.url}")
    private String url;
    

    public static final String UPLOAD_BILL = "cM/basis/uploadBill";

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