Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r14169 -r14256
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 14169)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 14256)
@@ -1226,20 +1226,57 @@
 				if (StringUtils.isNotBlank(specification)) {
 					materialDefinition.setSpecification(specification);
 				}
+				materialDefinition.setMaxStorage(maxStorage);
+				materialDefinition.setMinStorage(minStorage);
+				materialDefinition.setType(type);
+				materialDefinition.setUnit(unit);
+				materialDefinition.setCost(cost);
+				materialDefinition.setDepreciation(depreciation);
+				materialDefinition.setIsTraceble(isTraceble);
+				materialDefinition.setIsMonthCheck(needCheck);
+				materialDefinition.setDisinfectionPrice(disinfectorPrice);
+				materialDefinition.setSterilizationPrice(sterilePrice);
+				materialDefinition.setWashClassifyType(washClassifyType);
+				materialDefinition.setNotice(notice);
+			}else {
+				// 更新数据 如果导入项为空，不做数据库里面的值.
+				if( maxStorage != null){
+					materialDefinition.setMaxStorage(maxStorage);
+				}
+				if( minStorage != null){
+					materialDefinition.setMinStorage(minStorage);
+				}
+				if( StringUtils.isNotBlank(type)){
+					materialDefinition.setType(type);
+				}
+				if( StringUtils.isNotBlank(unit)){
+					materialDefinition.setUnit(unit);
+				}
+				if( cost != null){
+					materialDefinition.setCost(cost);
+				}
+				if( depreciation != null){
+					materialDefinition.setDepreciation(depreciation);
+				}
+				if( StringUtils.isNotBlank(isTraceble)){
+					materialDefinition.setIsTraceble(isTraceble);
+				}
+				if( StringUtils.isNotBlank(needCheck)){
+					materialDefinition.setIsMonthCheck(needCheck);
+				}
+				if( disinfectorPrice != null){
+					materialDefinition.setDisinfectionPrice(disinfectorPrice);
+				}
+				if( sterilePrice != null){
+					materialDefinition.setSterilizationPrice(sterilePrice);
+				}
+				if( StringUtils.isNotBlank(washClassifyType)){
+					materialDefinition.setWashClassifyType(washClassifyType);
+				}
+				if( StringUtils.isNotBlank(notice)){
+					materialDefinition.setNotice(notice);
+				}
 			}
-
-			materialDefinition.setMaxStorage(maxStorage);
-			materialDefinition.setMinStorage(minStorage);
-			materialDefinition.setType(type);
-			materialDefinition.setUnit(unit);
-			materialDefinition.setCost(cost);
-			materialDefinition.setDepreciation(depreciation);
-			materialDefinition.setIsTraceble(isTraceble);
-			materialDefinition.setIsMonthCheck(needCheck);
-			materialDefinition.setDisinfectionPrice(disinfectorPrice);
-			materialDefinition.setSterilizationPrice(sterilePrice);
-			materialDefinition.setWashClassifyType(washClassifyType);
-			materialDefinition.setNotice(notice);
 			totalCount = saveOrUpdateAndClearCache(totalCount,
 					materialDefinition);
 			successCount++;
@@ -1920,29 +1957,111 @@
 		rinser.setContact(contact);
 		rinser.setSupplier(supplier);
 	}
-
 	private TousseDefinition setPersistenceTousseDefinitionPropertyValueWithOtherTousseDefinition(
 			TousseDefinition persistenceTousseDefinition,
-			TousseDefinition tempTousseDefinition) {
-		setTousseDefinitionWithPropertyValue(persistenceTousseDefinition,
-				tempTousseDefinition.getTousseType(),
-				tempTousseDefinition.getTaskGroup(),
-				tempTousseDefinition.getIsCleanedEntirely(),
-				tempTousseDefinition.getPackageType(),
-				tempTousseDefinition.getPackageSize(),
-				tempTousseDefinition.getSpelling(),
-				tempTousseDefinition.getWbCode(),
-				tempTousseDefinition.getPrice(),
-				tempTousseDefinition.getProxyDisinfectionPrice(),
-				tempTousseDefinition.getBorrowPrice(),
-				tempTousseDefinition.getAssetsBelong(),
-				tempTousseDefinition.getSterilingMethod(),
-				tempTousseDefinition.getCleanMethod(),
-				tempTousseDefinition.getIsCustomPacking(),
-				tempTousseDefinition.getExpressRecycling());
-		persistenceTousseDefinition.setIsPrintOrg(tempTousseDefinition.getIsPrintOrg());
-		// persistenceTousseDefinition.setMaterialInstance(tempTousseDefinition
-		// .getMaterialInstance());
+			TousseDefinition ttd) {
+//		setTousseDefinitionWithPropertyValue(persistenceTousseDefinition,
+//				tempTousseDefinition.getTousseType(),
+//				tempTousseDefinition.getTaskGroup(),
+//				tempTousseDefinition.getIsCleanedEntirely(),
+//				tempTousseDefinition.getPackageType(),
+//				tempTousseDefinition.getPackageSize(),
+//				tempTousseDefinition.getSpelling(),
+//				tempTousseDefinition.getWbCode(),
+//				tempTousseDefinition.getPrice(),
+//				tempTousseDefinition.getProxyDisinfectionPrice(),
+//				tempTousseDefinition.getBorrowPrice(),
+//				tempTousseDefinition.getAssetsBelong(),
+//				tempTousseDefinition.getSterilingMethod(),
+//				tempTousseDefinition.getCleanMethod(),
+//				tempTousseDefinition.getIsCustomPacking(),
+//				tempTousseDefinition.getExpressRecycling());
+//		persistenceTousseDefinition.setIsPrintOrg(tempTousseDefinition.getIsPrintOrg());
+		if(StringUtils.isNotBlank(ttd.getTousseType())){
+			persistenceTousseDefinition.setTousseType(ttd.getTousseType());
+		}
+		if(StringUtils.isNotBlank(ttd.getTaskGroup())){
+			persistenceTousseDefinition.setTaskGroup(ttd.getTaskGroup());
+		}
+		if(StringUtils.isNotBlank(ttd.getIsCleanedEntirely())){
+			persistenceTousseDefinition.setIsCleanedEntirely(ttd.getIsCleanedEntirely());
+		}
+		if(StringUtils.isNotBlank(ttd.getPackageType())){
+			persistenceTousseDefinition.setPackageType(ttd.getPackageType());
+		}
+		if(StringUtils.isNotBlank(ttd.getPackageSize())){
+			persistenceTousseDefinition.setPackageSize(ttd.getPackageSize());
+		}
+		if(StringUtils.isNotBlank(ttd.getSpelling())){
+			persistenceTousseDefinition.setSpelling(ttd.getSpelling());
+		}
+		if(StringUtils.isNotBlank(ttd.getWbCode())){
+			persistenceTousseDefinition.setWbCode(ttd.getWbCode());
+		}
+		if(ttd.getPrice() != null){
+			persistenceTousseDefinition.setPrice(ttd.getPrice());
+		}
+		if(ttd.getProxyDisinfectionPrice() != null){
+			persistenceTousseDefinition.setProxyDisinfectionPrice(ttd.getProxyDisinfectionPrice());
+		}
+		if(ttd.getBorrowPrice() != null){
+			persistenceTousseDefinition.setBorrowPrice(ttd.getBorrowPrice());
+		}
+		if(StringUtils.isNotBlank(ttd.getAssetsBelong())){
+			persistenceTousseDefinition.setAssetsBelong(ttd.getAssetsBelong());
+		}
+		if(StringUtils.isNotBlank(ttd.getSterilingMethod())){
+			persistenceTousseDefinition.setSterilingMethod(ttd.getSterilingMethod());
+		}
+		if(StringUtils.isNotBlank(ttd.getCleanMethod())){
+			persistenceTousseDefinition.setCleanMethod(ttd.getCleanMethod());
+		}
+		if(StringUtils.isNotBlank(ttd.getIsCustomPacking())){
+			persistenceTousseDefinition.setIsCustomPacking(ttd.getIsCustomPacking());
+		}
+		if(StringUtils.isNotBlank(ttd.getExpressRecycling())){
+			persistenceTousseDefinition.setExpressRecycling(ttd.getExpressRecycling());
+		}
+		if(StringUtils.isNotBlank(ttd.getIsPrintOrg())){
+			persistenceTousseDefinition.setIsPrintOrg(ttd.getIsPrintOrg());
+		}
+		//
+		if(StringUtils.isNotBlank(ttd.getSupplierName())){
+			persistenceTousseDefinition.setSupplierName(ttd.getSupplierName());
+		}
+		if(StringUtils.isNotBlank(ttd.getExternalCode())){
+			persistenceTousseDefinition.setExternalCode(ttd.getExternalCode());
+		}
+		if(StringUtils.isNotBlank(ttd.getBarcodePaperType())){
+			persistenceTousseDefinition.setBarcodePaperType(ttd.getBarcodePaperType());
+		}
+		if(StringUtils.isNotBlank(ttd.getIsTraceable())){
+			persistenceTousseDefinition.setIsTraceable(ttd.getIsTraceable());
+		}
+		if(StringUtils.isNotBlank(ttd.getHandlerDepartName())){
+			persistenceTousseDefinition.setHandlerDepartName(ttd.getHandlerDepartName());
+		}
+		if(StringUtils.isNotBlank(ttd.getHandlerDepartCode())){
+			persistenceTousseDefinition.setHandlerDepartCode(ttd.getHandlerDepartCode());
+		}
+		if(StringUtils.isNotBlank(ttd.getIsRecycling())){
+			persistenceTousseDefinition.setIsRecycling(ttd.getIsRecycling());
+		}
+		if(StringUtils.isNotBlank(ttd.getWorkLoadStatisticalMethod())){
+			persistenceTousseDefinition.setWorkLoadStatisticalMethod(ttd.getWorkLoadStatisticalMethod());
+		}
+		if(ttd.getTousseAmount() != null){
+			persistenceTousseDefinition.setTousseAmount(ttd.getTousseAmount());
+		}
+		if(StringUtils.isNotBlank(ttd.getIsPacking())){
+			persistenceTousseDefinition.setIsPacking(ttd.getIsPacking());
+		}
+		if(StringUtils.isNotBlank(ttd.getIsPrint())){
+			persistenceTousseDefinition.setIsPrint(ttd.getIsPrint());
+		}
+		if(StringUtils.isNotBlank(ttd.getIsReview())){
+			persistenceTousseDefinition.setIsReview(ttd.getIsReview());
+		}
 		return persistenceTousseDefinition;
 	}