Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java =================================================================== diff -u -r20399 -r22769 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java (.../Container.java) (revision 20399) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java (.../Container.java) (revision 22769) @@ -38,8 +38,8 @@ public static final String CONTAINER_STATUS_PACKING = "装配入筐"; public static final String CONTAINER_STATUS_STERIALED = "已灭菌"; public static final String CONTAINER_PURPOSE_VIRTUAL = "虚拟筐";//功能优化增加篮筐类型的选项 - public static final String CONTAINER_VIRTUAL_MIN = "001";//设定最小的虚拟篮筐编号 - public static final String CONTAINER_VIRTUAL_MAX = "999";//设定最大的虚拟篮筐编号,且与最小的虚拟篮筐编号进行循环 + public static final String CONTAINER_VIRTUAL_MIN = "0001";//设定最小的虚拟篮筐编号 + public static final String CONTAINER_VIRTUAL_MAX = "9999";//设定最大的虚拟篮筐编号,且与最小的虚拟篮筐编号进行循环 public static final String CONTAINER_CURRENT_VIRTUAL_YES = "是";//是否当前使用的最大篮筐:是 public static final String CONTAINER_CURRENT_VIRTUAL_NO = "否";//是否当前使用的最大篮筐:否 Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r22768 -r22769 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 22768) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 22769) @@ -3437,7 +3437,8 @@ } packingContext.setPackingAmountPerVirtualBasket(packingAmountPerVirtualBasket); if(packingAmountPerVirtualBasket > 0){ - int needVirtualBasketAmount = totalCanPackAmount % packingAmountPerVirtualBasket == 0 ? (totalCanPackAmount / packingAmountPerVirtualBasket) : (totalCanPackAmount / packingAmountPerVirtualBasket + 1); + int actualPackAmount = Math.min(currentPackAmount, totalCanPackAmount); + int needVirtualBasketAmount = actualPackAmount % packingAmountPerVirtualBasket == 0 ? (actualPackAmount / packingAmountPerVirtualBasket) : (actualPackAmount / packingAmountPerVirtualBasket + 1); List reviewedBasketList = containerManager.callVirtualContainer(needVirtualBasketAmount,tousseDefinition.getTaskGroup()); packingContext.setReviewedBasketList(reviewedBasketList); }