Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r13963 -r14077 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13963) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14077) @@ -516,6 +516,13 @@ ClassifyBasket basket = null; if (StringUtils.isNotBlank(basketId) && !"0".equals(basketId)) { basket = beCleanItemManager.getClassifyBasketById(basketId); + //修改回收记录时已清洗的篮筐不能再追加物品 + if(basket != null){ + List washRecord = basket.getWashAndDisinfectRecords(); + if(washRecord != null && washRecord.size() > 0){ + throw new RuntimeException("条码为 "+basketBarcode+"的篮筐已关联清洗记录,不能保存!"); + } + } }else{ basket = beCleanItemManager.getUnWashedBasketByBarcode(basketBarcode); } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java =================================================================== diff -u -r13857 -r14077 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java (.../RecyclingRecordManager.java) (revision 13857) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java (.../RecyclingRecordManager.java) (revision 14077) @@ -5,10 +5,8 @@ import net.sf.json.JSONObject; -import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationItemVO; -import com.forgon.disinfectsystem.recyclingapplication.vo.GridDataVo; /** * @author wangyi 2012-3-26 下午13:59:34 Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r14011 -r14077 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 14011) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 14077) @@ -65,7 +65,6 @@ import com.forgon.disinfectsystem.idcardinstance.util.IDCardInstanceUtils; import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager; import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationManager; -import com.forgon.disinfectsystem.recyclingapplication.vo.GridDataVo; import com.forgon.disinfectsystem.recyclingerror.vo.RecyclingErrorVo; import com.forgon.disinfectsystem.recyclingrecord.service.RecyclingRecordManager; import com.forgon.disinfectsystem.recyclingrecord.vo.DisinfectionDetailVo;