BJ_FS / urbanops

Commit 826209c12dc932ae55e0c55c2a1a0da1c8c15311

Authored by wangqian
2 parents f2891315 4e0c6402

Merge branch 'dev'

Inline Side-by-side
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
  View file @826209c
... ... @@ -947,12 +947,12 @@ public class CostFeeServiceImpl implements CostFeeService {
947 947 for (int i = 0; i < importList.size() ; i++) {
948 948 int rowNum = i + 1;
949 949 MaterialInventoryOutImport importBean = importList.get(i);
950   - String checkKey = importBean.getMaterialName() + "|" +
951   - importBean.getMaterialTypeName() + "|" +
952   - importBean.getTypeName() + "|" +
953   - importBean.getTypeDetailName() + "|" +
954   - importBean.getSpecifications() + "|" +
955   - importBean.getUnitName();
  950 + String checkKey = importBean.getMaterialName().trim() + "|" +
  951 + importBean.getMaterialTypeName().trim() + "|" +
  952 + importBean.getTypeName().trim() + "|" +
  953 + importBean.getTypeDetailName().trim() + "|" +
  954 + importBean.getSpecifications().trim() + "|" +
  955 + importBean.getUnitName().trim();
956 956  
957 957 if (materialSet.contains(checkKey) == false) {
958 958 throw exception0(BAD_REQUEST.getCode(), String.format(
... ... @@ -1227,6 +1227,6 @@ public class CostFeeServiceImpl implements CostFeeService {
1227 1227 String specifications = materialDO.getSpecifications() == null ? "" : materialDO.getSpecifications();
1228 1228 String unitName = materialDO.getUnitName() == null ? "" : materialDO.getUnitName();
1229 1229  
1230   - return materialName + "|" + materialTypeName + "|" + typeName + "|" + typeDetailName + "|" + specifications + "|" + unitName;
  1230 + return materialName.trim() + "|" + materialTypeName.trim() + "|" + typeName.trim() + "|" + typeDetailName.trim() + "|" + specifications.trim() + "|" + unitName.trim();
1231 1231 }
1232 1232 }
... ...