Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

7 天以前 7cf2e143941e1548cc468992ada42106a27805a1

 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());
            }