Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java =================================================================== diff -u -r19585 -r19829 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 19585) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 19829) @@ -186,9 +186,6 @@ */ public List findPackingTaskBySQL(Long tousseDefinitionId,String handlerDepartCode,List> departCodingList); - - public int findPackingTaskCountBySql(String sql); - /** * 设置器械包未补充的材料明细 */ Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r19824 -r19829 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19824) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19829) @@ -6198,14 +6198,6 @@ } return null; } - - @Override - public int findPackingTaskCountBySql(String sql) { - if(StringUtils.isNotBlank(sql)){ - return objectDao.countObjectBySql(PackingTask.class.getSimpleName(), sql); - } - return 0; - } /** * 设置器械包未补充的材料明细 Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r19828 -r19829 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 19828) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 19829) @@ -894,8 +894,8 @@ if (classifyBasket == null) { boolean autoSetIDCardBarcodeForPacking = CssdUtils.getSystemSetConfigByNameBool("autoSetIDCardBarcodeForPacking"); if(autoSetIDCardBarcodeForPacking){ - String sql = String.format("where po.basketBarcode like '%%%s%%' and po.idCardBarcode is not null", container.getBarcode()); - int count = packingManager.findPackingTaskCountBySql(sql); + String sql = String.format("po.basketBarcode like '%%%s%%' and po.idCardBarcode is not null", container.getBarcode()); + int count = packingManager.count(sql); if(count > 0){ throw new RuntimeException(container.getContainerName() + "内还有标识牌未装配完成,请装配完成后再使用!"); }