Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r32468 -r32469 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 32468) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 32469) @@ -105,7 +105,7 @@ Query query = objectDao .getHibernateSession() .createQuery( - "update TousseInstance set proxyDisinfection_id = null, reviewBasket_id = null,sterilizationBasket = null, checkStatus = null where proxyDisinfection_id = :pdId"); + "update TousseInstance set proxyDisinfection_id = null, reviewBasket_id = null,sterilizationBasket = null, hasReceived = null where proxyDisinfection_id = :pdId"); query.setParameter("pdId", Long.valueOf(id)); query.executeUpdate(); @@ -131,7 +131,7 @@ public void saveOrUpdate(ProxyDisinfection proxyDisinfection, String[] tousseInstanceIdStrs, JSONArray basketInfos,String loginUserName,String loginUserCode, ListpakingRecordIDList, List receiveToussesIDList) { - if(CollectionUtils.isNotEmpty(pakingRecordIDList) && proxyDisinfection != null && DatabaseUtil.isPoIdValid(proxyDisinfection.getId())){ + if(CollectionUtils.isNotEmpty(pakingRecordIDList) && proxyDisinfection != null && !DatabaseUtil.isPoIdValid(proxyDisinfection.getId())){ proxyDisinfection.setDeliverStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE); proxyDisinfection.setIsConvertPackingRecord(Constants.STR_YES); }