Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r33361 -r33432 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 33361) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 33432) @@ -3804,7 +3804,8 @@ throw new SystemException(String.format("%s %s未生成代理灭菌单,请联系%s(来源科室)!", tousseInstance.getBarcode(),tousseInstance.getTousseName(),tousseInstance.getDepart())); }*/ - }else if(StringUtils.equals(proxyDisinfection.getReceiveStatus(), InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED)){ + }else if(StringUtils.equals(proxyDisinfection.getReceiveStatus(), InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED) + && StringUtils.equals(proxyDisinfection.getIsConvertPackingRecord(), Constants.STR_YES)){ throw new SystemException("单据里的物品已经全部接收,不能再增加物品"); } }