Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java =================================================================== diff -u -r26793 -r26795 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 26793) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 26795) @@ -2410,7 +2410,7 @@ //废弃未扫描到的科室库存里的器械包信息 updateTousseOfUnscanned(idSubScanIds, userFullName, nowDateStr); //修改扫描到且未在库存数量里的器械包信息 - updateTousseInfoOfNotInInventoryNum(scanIdSubIds, userFullName, nowDateStr, wareHouseId); + updateTousseInfoOfNotInInventoryNum(scanIdSubIds, userFullName, nowDateStr, wareHouseId, wareHouseName); } /** * InventoryItemOfBaseNum设置TousseInstances @@ -2434,13 +2434,13 @@ * 修改扫描到且未在库存数量里的器械包信息 * @param scanIdSubId */ - private void updateTousseInfoOfNotInInventoryNum(Collection scanIdSubId, String userFullName, String nowDateStr, Long wareHouseId){ + private void updateTousseInfoOfNotInInventoryNum(Collection scanIdSubId, String userFullName, String nowDateStr, Long wareHouseId, String wareHouseName){ if(scanIdSubId == null || scanIdSubId.size() < 1){ return; } - objectDao.executeUpdate(String.format("update %s set status='%s',invoiceSender='%s',invoiceSendTime='%s',signedUser='%s',signedDate='%s',wareHouseId=%s where %s", + objectDao.executeUpdate(String.format("update %s set status='%s',invoiceSender='%s',invoiceSendTime='%s',signedUser='%s',signedDate='%s',wareHouseId=%s,wareHouseName='%s' where %s", TousseInstance.class.getSimpleName(),TousseInstance.STATUS_SIGNED,userFullName,nowDateStr, - userFullName,nowDateStr, wareHouseId,SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", scanIdSubId))); + userFullName,nowDateStr, wareHouseId, wareHouseName, SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", scanIdSubId))); } /** * 废弃未扫描到的科室库存里的器械包信息