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

zhang

4 天以前 d2398eb18ecfbfc9ecafe597a22b00615e61db46

 src/main/java/com/zy/asrs/utils/MatExcelListener.java

@@ -131,6 +131,7 @@
        if (mat == null) {
            mat = excel;
            mat.setTagId(tagId);
            mat.setLocType(tagId);
            if (!matService.insert(mat)) {
                throw new CoolException("保存商品信息失败，商品编码：" + excel.getMatnr());
            }