From 761721ec915a6b5d6bfaf0e7c033dbd38260c61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 6 Jun 2020 00:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/service/material/MaterialService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java
index 70489d4d..a5e4a472 100644
--- a/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -387,7 +387,6 @@ public class MaterialService {
                 Long categoryId = materialCategoryService.getCategoryIdByName(categoryName);
                 m.setCategoryid(categoryId);
                 m.setSafetystock(parseBigDecimalEx(safetyStock));
-                m.setUnit(unit);
                 String manyUnit = ExcelUtils.getContent(src, i, 7); //副单位
                 String barCode = ExcelUtils.getContent(src, i, 8); //基础条码
                 String manyBarCode = ExcelUtils.getContent(src, i, 9); //副条码
@@ -417,6 +416,8 @@ public class MaterialService {
                     otherObj.put("wholesaleDecimal", parsePrice(wholesaleDecimal,ratio));
                     otherObj.put("lowDecimal", parsePrice(lowDecimal,ratio));
                     materialExObj.put("other", otherObj);
+                } else {
+                    m.setUnit(unit);
                 }
                 m.setMaterialExObj(materialExObj);
                 String enabled = ExcelUtils.getContent(src, i, 15); //状态