Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r35711 -r35715
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35711)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35715)
@@ -10032,7 +10032,7 @@
}
comboTousse.put("currrentTaskAmount", totalAmount);
comboTousse.put("unWashAmount", unWashAmount);
- return totalAmount+unWashAmount;
+ return totalAmount+unWashAmount;
}
/**
@@ -10188,6 +10188,7 @@
JSONArray arr = new JSONArray();
try {
rs = objectDao.executeSql(stringBuffer.toString());
+ stringBuffer.setLength(0);
while(rs.next()){
String comTousseName = rs.getString("comTousseName");
String tdName = rs.getString("tdName");
@@ -10200,18 +10201,19 @@
infos.put("tdId", tdId);
}
String msg = infos.optString("msg", "");
- if("".equals(msg)){
- msg = tdName + "属于如下的聚合包,确定要装配此包吗?
" + comTousseName;
+ stringBuffer.append(msg);
+ if(stringBuffer.length() == 0){
+ stringBuffer.append(tdName + "属于如下的聚合包,确定要装配此包吗?
" + comTousseName);
}else{
- msg += "、" + comTousseName;
+ stringBuffer.append("、").append(comTousseName);
}
int count = infos.optInt("count");
if(count >= 5){//最多验证属于5个聚合包
- msg += "、......";
- infos.put("msg", msg);
+ stringBuffer.append("、......");
+ infos.put("msg", stringBuffer.toString());
break;
}
- infos.put("msg", msg);
+ infos.put("msg", stringBuffer.toString());
infos.put("count", count + 1);
infoMap.put(tdId, infos);
}