Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java =================================================================== diff -u -r34968 -r36165 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 34968) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 36165) @@ -13,7 +13,6 @@ import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; -import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataItemOfChangLong; @@ -220,11 +219,6 @@ * @param c */ public JSONObject containerCanRecycle(Container c); - - /** - * 还原清洗记录器械材料等工作量 - */ - public void restoreSevaWash(String startDay, String endDay); /** * 获取待清洗篮筐列表 Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r35472 -r36165 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 35472) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 36165) @@ -89,7 +89,6 @@ import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataItemOfChangLong; @@ -3359,37 +3358,6 @@ return obj; } - @Override - public void restoreSevaWash(String startDay, String endDay){ - String startDaySql = "to_date('" + startDay + " 00:00:00','yyyy-mm-dd HH24:MI:SS')"; - String endDaySql= "to_date('" + endDay + " 00:00:00','yyyy-mm-dd HH24:MI:SS')"; - String sql = "where po.endDate between "+ startDaySql +" and "+ endDaySql; - List wash = objectDao.findBySql(WashAndDisinfectRecord.class.getSimpleName(),sql); - for(WashAndDisinfectRecord ws : wash){ - SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj(); - // 统计清洗工作量 - List classifyBaskets = ws.getClassifyBaskets(); - JSONObject workloadJson = countTotalWorkload(ws.getId(), - classifyBaskets, config.getSecondWashCountWorkload()); - //清洗材料总数量（材料当普通器械处理） - int materialAmount = 0; - if(ws.getWashAndDisinfectMaterials() != null){ - for (WashAndDisinfectRecordMaterial wahsMaterial: ws.getWashAndDisinfectMaterials()) { - materialAmount += wahsMaterial.getAmount(); - } - } - ws.setWashMaterialAmount(workloadJson.optInt("washMaterialAmount") + materialAmount); - ws.setGeneralMaterialAmount(workloadJson.optInt("generalMaterialAmount") + materialAmount); - ws.setOperateMaterialAmount(workloadJson.optInt("operateMaterialAmount")); - ws.setForeignMaterialAmount(workloadJson.optInt("foreignMaterialAmount")); - ws.setDisinfectMaterialAmount(workloadJson.optInt("disinfectMaterialAmount")); - ws.setSecondWashForeignAmount(workloadJson.optInt("secondWashForeignMaterialAmount")); - - saveWashAndDisinfectRecord(ws); - - } - } - public void saveWashAndDisinfectRecord(WashAndDisinfectRecord ws){ objectDao.saveOrUpdate(ws); } Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java =================================================================== diff -u -r34098 -r36165 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java (.../WashAndDisinfectRecordAction.java) (revision 34098) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java (.../WashAndDisinfectRecordAction.java) (revision 36165) @@ -4,7 +4,6 @@ import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.io.PrintWriter; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -29,13 +28,11 @@ import org.apache.struts2.convention.annotation.ParentPackage; import com.forgon.Constants; -import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; 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.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.entity.basedatamanager.cleanmethod.CleanMethod; @@ -45,14 +42,11 @@ import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectPic; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashDisinfectInterruptRecord; -import com.forgon.disinfectsystem.idcarddefinition.service.IDCardDefinitionManager; import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; import com.forgon.exception.CleanMethodNotTheSameException; -import com.forgon.exception.SystemException; import com.forgon.exception.service.ExceptionHandler; -import com.forgon.log.service.LogManager; import com.forgon.tools.ImageUtils; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; @@ -79,37 +73,22 @@ private WashAndDisinfectRecord washAndDisinfectRecord; private WashAndDisinfectRecordManager washAndDisinfectRecordManager; - - private DateQueryAdapter dateQueryAdapter; private BeCleanItemManager beCleanItemManager; private ClassifyBasketManager classifyBasketManager; private MaterialDefinitionManager materialDefinitionManager; - private IDCardDefinitionManager idCardDefinitionManager; - private SupplyRoomConfigManager supplyRoomConfigManager; private ImageFileManager imageFileManager; private BarcodeManager barcodeManager; - private LogManager appLogManager; private ObjectDao objectDao; - private boolean hasWashRecord = false; - - private ClassifiedItemManager classifiedItemManager; private ExceptionHandler exceptionHandler; - public void setIdCardDefinitionManager( - IDCardDefinitionManager idCardDefinitionManager) { - this.idCardDefinitionManager = idCardDefinitionManager; - } - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } public void setBarcodeManager(BarcodeManager barcodeManager) { this.barcodeManager = barcodeManager; @@ -136,10 +115,6 @@ WashAndDisinfectRecordManager washAndDisinfectRecordManager) { this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; } - - public void setClassifiedItemManager(ClassifiedItemManager classifiedItemManager) { - this.classifiedItemManager = classifiedItemManager; - } public void setExceptionHandler(ExceptionHandler exceptionHandler) { this.exceptionHandler = exceptionHandler; @@ -597,31 +572,7 @@ public void setObjectDao(ObjectDao objectDao) { this.objectDao = objectDao; } - - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - /** - * 还原清洗记录器械材料工作量 - */ - public void restoreWashAndDisinfectRecord(){ - String startDay = StrutsParamUtils.getPraramValue("startDay", ""); - String endDay = StrutsParamUtils.getPraramValue("endDay", ""); - washAndDisinfectRecordManager.restoreSevaWash(startDay,endDay); - HttpServletResponse response = StrutsParamUtils.getResponse(); - response.setCharacterEncoding("UTF-8"); - response.setHeader("Content-type", "text/html;charset=UTF-8"); - PrintWriter out; - try { - out = response.getWriter(); - out.print(("")); - out.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - /******************清洗图片操作************************/ /**