批量入库出库去空格

wangqian
1 parent 70cc7e53
Showing 1 changed file with 7 additions and 7 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.java
@@ -947,12 +947,12 @@ public class CostFeeServiceImpl implements CostFeeService {
         for (int i = 0; i < importList.size() ; i++) {
             int rowNum = i + 1;
             MaterialInventoryOutImport importBean = importList.get(i);
-            String checkKey = importBean.getMaterialName() + "|" +
-                    importBean.getMaterialTypeName() + "|" +
-                    importBean.getTypeName()  + "|" +
-                    importBean.getTypeDetailName()  + "|" +
-                    importBean.getSpecifications()  + "|" +
-                    importBean.getUnitName();
+            String checkKey = importBean.getMaterialName().trim() + "|" +
+                    importBean.getMaterialTypeName().trim() + "|" +
+                    importBean.getTypeName().trim()  + "|" +
+                    importBean.getTypeDetailName().trim()  + "|" +
+                    importBean.getSpecifications().trim()  + "|" +
+                    importBean.getUnitName().trim();
             if (materialSet.contains(checkKey) == false) {
                 throw exception0(BAD_REQUEST.getCode(), String.format(
@@ -1227,6 +1227,6 @@ public class CostFeeServiceImpl implements CostFeeService {
         String specifications = materialDO.getSpecifications() == null ? "" : materialDO.getSpecifications();
         String unitName = materialDO.getUnitName() == null ? "" : materialDO.getUnitName();
-        return materialName + "|" + materialTypeName + "|" + typeName + "|" + typeDetailName + "|" + specifications + "|" + unitName;
+        return materialName.trim() + "|" + materialTypeName.trim() + "|" + typeName.trim() + "|" + typeDetailName.trim() + "|" + specifications.trim() + "|" + unitName.trim();
     }
 }