Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r20477 -r20483 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 20477) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 20483) @@ -3263,7 +3263,10 @@ }else{ // boolean nameIncludeSplitTotalAmountForSplitForeignTousse = CssdUtils.getSystemSetConfigByNameBool("nameIncludeSplitTotalAmountForSplitForeignTousse"); // int splitForeignTousseNameStyle = CssdUtils.getSystemSetConfigByNameInt("splitForeignTousseNameStyle",0); - int count = sequenceCount; + int count = i-1; + if(allowForeignToussePartiallyPacking){ + count = sequenceCount; + } List result = new ArrayList(); Set splitIndexs = new HashSet<>(); for (Long classifyBasketId : map.keySet()) { @@ -3978,9 +3981,9 @@ // 将用户打包时常用的字段记录到session中 updatePackingConfigSession(session, inspector, inspectorCode, operator, operatorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode,wrapper, wrapperCode, packageType, sterilingType, sterilizerName, sterileFrequency); -// if(true){ -// throw new RuntimeException("装配速度测试 "); -// } + if(true){ + throw new RuntimeException("装配速度测试 "); + } return json.toString(); }