Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java =================================================================== diff -u -r28972 -r29528 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java (.../WaitPackingTaskItemVo.java) (revision 28972) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java (.../WaitPackingTaskItemVo.java) (revision 29528) @@ -32,7 +32,10 @@ private String washTime; private Integer amount; - + /** + * 可修改至的最大值,最大值等于amount,用于装配页面修改amount不超过原始值做对比使用 + */ + private Integer maxAmount; private String tousseType; private String packageType; @@ -511,5 +514,13 @@ public void setErrorDamageRemarkId(Long errorDamageRemarkId) { this.errorDamageRemarkId = errorDamageRemarkId; } + + public Integer getMaxAmount() { + return maxAmount; + } + + public void setMaxAmount(Integer maxAmount) { + this.maxAmount = maxAmount; + } } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r29526 -r29528 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 29526) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 29528) @@ -1692,6 +1692,7 @@ vo.setCustomSplitBasketAmount(vo.getCustomSplitBasketAmount()+customSplitBasketAmount); itemVo.setAmount(task.getUnPackAmount()); + itemVo.setMaxAmount(task.getUnPackAmount()); itemVo.setSupplierName(td.getSupplierName()); itemVo.setTaskType(task.getTaskType()); itemVo.setAllowModifyPackageType(td.getAllowModifyPackageType()); @@ -1712,13 +1713,15 @@ if(unPackingAmount > 0 && unPackingAmount < itemVo.getAmount()){ Integer canPackingAmount = itemVo.getAmount() - unPackingAmount; itemVo.setAmount(unPackingAmount); + itemVo.setMaxAmount(unPackingAmount); WaitPackingTaskItemVo newItemVo = new WaitPackingTaskItemVo(); List listProNotToCopy = new ArrayList(); listProNotToCopy.add("errors"); listProNotToCopy.add("damages"); listProNotToCopy.add("replenishMaterils"); ReflectUtil.copyProperties(itemVo, newItemVo, true, listProNotToCopy); newItemVo.setAmount(canPackingAmount); + newItemVo.setMaxAmount(canPackingAmount); childrens.add(newItemVo); } }