Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManager.java =================================================================== diff -u -r19693 -r20078 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManager.java (.../ClassifiedItemManager.java) (revision 19693) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManager.java (.../ClassifiedItemManager.java) (revision 20078) @@ -17,6 +17,11 @@ * @return */ public Integer getClassifyBasketItemCountByBarcode(String basketBarcode); - - + /** + * 对应标识牌条码是否已经回收。如果标识牌在对应回收记录中有入篮筐,则说明已经回收 + * @param recyclingRecordId 回收记录id + * @param idCardBarcode 标识牌条码 + * @return + */ + public boolean isIDCardRecycled(String recyclingRecordId,String idCardBarcode); } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r20070 -r20078 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20070) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20078) @@ -46,7 +46,7 @@ import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; -import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager; +import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifiedItemManager; import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifyBasketManager; import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.departmentgroup.service.DepartmentGroupManager; @@ -156,9 +156,9 @@ private SupplyRoomConfigManager supplyRoomConfigManager; private BarcodeManager barcodeManager; - - private BeCleanItemManager beCleanItemManager; + private ClassifiedItemManager classifiedItemManager; + private ClassifyBasketManager classifyBasketManager; private InvoicePlanManager invoicePlanManager; @@ -284,8 +284,8 @@ this.barcodeManager = barcodeManager; } - public void setBeCleanItemManager(BeCleanItemManager beCleanItemManager) { - this.beCleanItemManager = beCleanItemManager; + public void setClassifiedItemManager(ClassifiedItemManager classifiedItemManager) { + this.classifiedItemManager = classifiedItemManager; } public void setClassifyBasketManager(ClassifyBasketManager classifyBasketManager) { @@ -1048,7 +1048,7 @@ String status = tousseInstance.getStatus(); boolean isVerificationTousseStatus = true; if (StringUtils.isNotBlank(recyclingRecordId)) { - boolean isRecycled = beCleanItemManager.isIDCardRecycled(recyclingRecordId, barcode); + boolean isRecycled = classifiedItemManager.isIDCardRecycled(recyclingRecordId, barcode); if(isRecycled){ isVerificationTousseStatus = false; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java =================================================================== diff -u -r20063 -r20078 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 20063) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 20078) @@ -789,21 +789,6 @@ } return frequency; } - - @Override - public boolean isIDCardRecycled(String recyclingRecordId,String idCardBarcode) { - if(StringUtils.isNotBlank(recyclingRecordId) && StringUtils.isNotBlank(idCardBarcode)){ - String sql = String.format("where po.recyclingRecordId = %s and po.idCardBarcode = '%s'", recyclingRecordId,idCardBarcode); - @SuppressWarnings("unchecked") - List items = objectDao.findBySql(ClassifiedItem.class.getSimpleName(), sql); - if(items != null && items.size() > 0){ - return true; - }else{ - return false; - } - } - return false; - } @Override public void addMaterialToWashBasket(ClassifyBasket classifyBasket, Long materialDefinitionId, String name, int amount) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManagerImpl.java =================================================================== diff -u -r19693 -r20078 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManagerImpl.java (.../ClassifiedItemManagerImpl.java) (revision 19693) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManagerImpl.java (.../ClassifiedItemManagerImpl.java) (revision 20078) @@ -3,6 +3,8 @@ import java.sql.ResultSet; import java.sql.SQLException; +import org.apache.commons.lang.StringUtils; + import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; @@ -38,5 +40,13 @@ } return rowCount; } + @Override + public boolean isIDCardRecycled(String recyclingRecordId,String idCardBarcode) { + if(StringUtils.isNotBlank(recyclingRecordId) && StringUtils.isNotBlank(idCardBarcode)){ + String sql = String.format("po.recyclingRecordId = %s and po.idCardBarcode = '%s'", recyclingRecordId,idCardBarcode); + return count(sql) > 0; + } + return false; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java =================================================================== diff -u -r19828 -r20078 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java (.../BeCleanItemManager.java) (revision 19828) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java (.../BeCleanItemManager.java) (revision 20078) @@ -66,8 +66,6 @@ public ClassifiedItem getClassifiedItem(String basketId, String recyclingRecordId, String name); - public boolean isIDCardRecycled(String recyclingRecordId,String idCardBarcode); - public JSONArray getJsonArrayRemovedUnderScoreStringInName(Set items,boolean isLoadDefaultCleanMethod); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManagerImpl.java =================================================================== diff -u -r20064 -r20078 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManagerImpl.java (.../TousseGroupManagerImpl.java) (revision 20064) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManagerImpl.java (.../TousseGroupManagerImpl.java) (revision 20078) @@ -12,10 +12,6 @@ public class TousseGroupManagerImpl extends BasePoManagerImpl implements TousseGroupManager { - public TousseGroupManagerImpl() { - super(TousseGroup.class); - } - @Override public boolean update(TousseGroup tousseGroup) { tousseGroup.validateAssociatedInfoForUpdate();