Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r35726 -r35727
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35726)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35727)
@@ -10189,21 +10189,24 @@
infos.put("tdId", tdId);
}
String msg = infos.optString("msg", "");
+ int count = infos.optInt("count");
+ count++;
stringBuffer.setLength(0);
stringBuffer.append(msg);
- if(stringBuffer.length() == 0){
- stringBuffer.append(tdName + "属于如下的聚合包,确定要装配此包吗?
" + comTousseName);
- }else{
- stringBuffer.append("、").append(comTousseName);
- }
- int count = infos.optInt("count");
- if(count > 5){//最多验证属于5个聚合包
+ if(count <= 5){
+ if(stringBuffer.length() == 0){
+ stringBuffer.append(tdName + "属于如下的聚合包,确定要装配此包吗?
" + comTousseName);
+ }else{
+ stringBuffer.append("、").append(comTousseName);
+ }
+ }else{
stringBuffer.append("、......");
- infos.put("msg", stringBuffer.toString());
- break;
- }
+ infos.put("msg", stringBuffer.toString());
+ infoMap.put(tdId, infos);
+ break;
+ }
infos.put("msg", stringBuffer.toString());
- infos.put("count", count + 1);
+ infos.put("count", count);
infoMap.put(tdId, infos);
}
}catch (Exception e) {