Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java =================================================================== diff -u -r25307 -r26034 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java (.../HerpPathManagerImpl.java) (revision 25307) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java (.../HerpPathManagerImpl.java) (revision 26034) @@ -148,6 +148,13 @@ failUserecordIdList.add(rs.getString("mainId")); continue; } + //2.如果bar_code对应到器械包实例状态既不是已发货、也不是已签收,提示不能录入使用记录 + if(!tousseInstance.isShipped() && !tousseInstance.isSigned()){ + success = false; + message.append("条码:" + barCode + "的状态为【"+ tousseInstance.getStatus() +"】,不能录入使用记录。"); + failUserecordIdList.add(rs.getString("mainId")); + continue; + } /*if(tousseInstance.getTousseFixedBarcode()){ success = false; message.append("条码:" + barCode + "为固定条码,不能用于使用记录。");