|
@@ -203,13 +203,13 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
|
|
|
|
|
|
|
|
//计量单位
|
|
//计量单位
|
|
|
if(StringUtils.isNotEmpty(chemical.getChemicalUnit())){
|
|
if(StringUtils.isNotEmpty(chemical.getChemicalUnit())){
|
|
|
- if(checkBox) {
|
|
|
|
|
- if (chemical.getChemicalUnit().length() > 8) {
|
|
|
|
|
- chemical.getFailRemark().append("失败:");
|
|
|
|
|
- failChemicalList.add(chemical);
|
|
|
|
|
|
|
+ if (chemical.getChemicalUnit().length() > 8) {
|
|
|
|
|
+ chemical.getFailRemark().append("失败:");
|
|
|
|
|
+ failChemicalList.add(chemical);
|
|
|
|
|
+ if(checkBox) {
|
|
|
|
|
+ chemical.getFailRemark().append("计量单位过长、");
|
|
|
checkBox = false;
|
|
checkBox = false;
|
|
|
}
|
|
}
|
|
|
- chemical.getFailRemark().append("计量单位过长、");
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//获取化学品单位集合
|
|
//获取化学品单位集合
|
|
@@ -224,9 +224,10 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
|
|
|
if(checkBox && !flgunit){
|
|
if(checkBox && !flgunit){
|
|
|
chemical.getFailRemark().append("失败:");
|
|
chemical.getFailRemark().append("失败:");
|
|
|
failChemicalList.add(chemical);
|
|
failChemicalList.add(chemical);
|
|
|
|
|
+ chemical.getFailRemark().append("字典表未配置单位、");
|
|
|
checkBox = false;
|
|
checkBox = false;
|
|
|
}
|
|
}
|
|
|
- chemical.getFailRemark().append("字典表未配置单位、");
|
|
|
|
|
|
|
+
|
|
|
hxpChemical.setChemicalUnit(chemical.getChemicalUnit());
|
|
hxpChemical.setChemicalUnit(chemical.getChemicalUnit());
|
|
|
}else{
|
|
}else{
|
|
|
if(checkBox) {
|
|
if(checkBox) {
|