Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java =================================================================== diff -u -r15213 -r15397 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java (.../TousseTransitionRecordManagerImpl.java) (revision 15213) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java (.../TousseTransitionRecordManagerImpl.java) (revision 15397) @@ -68,6 +68,10 @@ public void save(InvoicePlan plan, JSONArray tousseBarcodes, String comfirmor, String comfirmorCode, String operator, String operatorCode) { + if(CollectionUtils.isEmpty(tousseBarcodes)){ + //没有条码,不保存交接记录 + return; + } if(plan == null || !(plan instanceof RecyclingApplication)){ throw new RuntimeException("申请单不能为空"); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java =================================================================== diff -u -r15173 -r15397 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java (.../TousseTransitionItemManagerImpl.java) (revision 15173) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java (.../TousseTransitionItemManagerImpl.java) (revision 15397) @@ -56,7 +56,7 @@ @Override public void save(TousseTransitionRecord record, JSONArray tousseBarcodes,Map map) { - if(tousseBarcodes == null || tousseBarcodes.isEmpty()){ + if(CollectionUtils.isEmpty(tousseBarcodes)){ throw new RuntimeException("器械包条码不能为空"); } if(record == null){