Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r20432 -r20449 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 20432) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 20449) @@ -3258,9 +3258,9 @@ if(map.size() <= 1 && sequenceCount <= 1){ return null; }else{ - boolean nameIncludeSplitTotalAmountForSplitForeignTousse = CssdUtils.getSystemSetConfigByNameBool("nameIncludeSplitTotalAmountForSplitForeignTousse"); - int splitForeignTousseNameStyle = CssdUtils.getSystemSetConfigByNameInt("splitForeignTousseNameStyle",0); - int count = i-1; +// boolean nameIncludeSplitTotalAmountForSplitForeignTousse = CssdUtils.getSystemSetConfigByNameBool("nameIncludeSplitTotalAmountForSplitForeignTousse"); +// int splitForeignTousseNameStyle = CssdUtils.getSystemSetConfigByNameInt("splitForeignTousseNameStyle",0); + int count = sequenceCount; List result = new ArrayList(); Set splitIndexs = new HashSet<>(); for (Long classifyBasketId : map.keySet()) { @@ -3270,14 +3270,15 @@ int implantAmount = 0; int splitIndex = packageItem.getSplitIndex(); splitIndexs.add(splitIndex); - String splitName = tousseName + "(部分" + splitIndex + ")"; - if(nameIncludeSplitTotalAmountForSplitForeignTousse){ - splitName = tousseName+"(" + splitIndex + "/" + count + ")"; - }else{ - if(splitForeignTousseNameStyle == 1){ - splitName = tousseName+"(" + count + "-" + splitIndex + ")"; - } - } + String splitName = tousseName +formatSplitTousseNameSuffixByConfig(count,splitIndex); +// String splitName = tousseName + "(部分" + splitIndex + ")"; +// if(nameIncludeSplitTotalAmountForSplitForeignTousse){ +// splitName = tousseName+"(" + splitIndex + "/" + count + ")"; +// }else{ +// if(splitForeignTousseNameStyle == 1){ +// splitName = tousseName+"(" + count + "-" + splitIndex + ")"; +// } +// } packageItem.setTousseName(splitName); for(int j = 0 ; j < materials.size() ; j++){ ForeignTousseSplitMaterialVo item = materials.get(j); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r20425 -r20449 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 20425) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 20449) @@ -791,6 +791,8 @@ if(item.getId() != null){ classifiedItemManager.delete(item); } + //删除对应的篮筐序号 + classifyBasketRecyclingSequenceManager.save(record.getId(), basket.getId(), tousseDefinitionID, null); continue; } item.setAmount(newAmount); @@ -971,7 +973,7 @@ //放入篮筐的物品 List basketItemJson = JSONUtil.fromJson(params.getJSONArray("tousseJson"), RecyclingBasketItemVo.class) ; //过滤掉篮筐内数量为0的 - basketItemJson = basketItemJson.stream().filter(p->p.getAmount() != null && p.getAmount().intValue() != 0).collect(Collectors.toList()); +// basketItemJson = basketItemJson.stream().filter(p->p.getAmount() != null && p.getAmount().intValue() != 0).collect(Collectors.toList()); //未入篮筐删掉的物品 JSONArray deleteTousseItems = params.optJSONArray("delToussItems"); //加急物品 Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r20394 -r20449 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 20394) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 20449) @@ -30,6 +30,7 @@ } tousseArray[i].amount = t_amount + amount; tousseArray[i].tousseAmountForMaterial = t_amountForMaterial + tousseAmountForMaterial; + tousseArray[i].basketSequence = item.basketSequence; sigle = false; } }