Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r16170 -r16191 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16170) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16191) @@ -1579,6 +1579,10 @@ objectDao.saveOrUpdate(application); for (TousseInstance tousseInstance : tousseInstanceList) { tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED); + //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) + if("false".equalsIgnoreCase(CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"))){ + tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); + } tousseInstance.setLocation(deptCode); tousseInstance.setLocationForDisplay(deptName); tousseInstanceManager.saveOrUpdate(tousseInstance); @@ -1607,6 +1611,11 @@ Map> tousseNameTousseInstances = new HashMap>(); for (TousseInstance tousseInstance : tousseInstances) { tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED); + + //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) + if("false".equalsIgnoreCase(CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"))){ + tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); + } tousseInstance.setLocation(deptCode); tousseInstance.setLocationForDisplay(deptName); tousseInstance.setInvoice_id(invoice.getId());