Index: forgon-core/src/main/java/com/forgon/log/model/Log.java =================================================================== diff -u -r23978 -r24746 --- forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 23978) +++ forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 24746) @@ -68,6 +68,7 @@ public static final String MODEL_WORKFLOW = "流程定义"; public static final String MODEL_USER = "用户定义"; public static final String MODEL_GoodsBinding = "物品绑定"; + public static final String MODEL_TIMERTASK = "定时任务"; public static final String TYPE_ADD = "A";//添加 public static final String TYPE_UPDATE = "U";//修改 Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/inventory/service/WriteBackInventoryMaintainManagerImpl.java =================================================================== diff -u -r20513 -r24746 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/inventory/service/WriteBackInventoryMaintainManagerImpl.java (.../WriteBackInventoryMaintainManagerImpl.java) (revision 20513) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/inventory/service/WriteBackInventoryMaintainManagerImpl.java (.../WriteBackInventoryMaintainManagerImpl.java) (revision 24746) @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.forgon.databaseadapter.service.DateQueryAdapter; +import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryWB; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; @@ -24,6 +25,8 @@ import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord; import com.forgon.disinfectsystem.inventorymanagement.service.WriteBackInventoryHelper; import com.forgon.disinfectsystem.inventorymanagement.service.WriteBackInventoryManager; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.tools.hibernate.ObjectDao; public class WriteBackInventoryMaintainManagerImpl implements @@ -37,6 +40,8 @@ private WriteBackInventoryHelper writeBackInventoryHelper; @Autowired private WriteBackInventoryManager writeBackInventoryManager; + @Autowired + private LogManager appLogManager; public void setWriteBackInventoryManager( WriteBackInventoryManager writeBackInventoryManager) { @@ -46,12 +51,19 @@ // 重新回写本月及上月回写失败的记录 @Override public void reWriteFailedEntry(){ - Date now = new Date(); - Date thisMonth = DateUtils.truncate(now, Calendar.MONTH); - Date startDate = DateUtils.addMonths(thisMonth, -1); - Date endDate = now; - - reWriteEntry(startDate, endDate, true); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_TIMERTASK, "回写", "调用定时重新回写本月及上月回写失败的记录reWriteFailedEntry start..."); + try{ + Date now = new Date(); + Date thisMonth = DateUtils.truncate(now, Calendar.MONTH); + Date startDate = DateUtils.addMonths(thisMonth, -1); + Date endDate = now; + + reWriteEntry(startDate, endDate, true); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_TIMERTASK, "回写", "调用定时重新回写本月及上月回写失败的记录reWriteFailedEntry success finish..."); + }catch (Exception e) { + e.printStackTrace(); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_TIMERTASK, "回写", "调用定时重新回写本月及上月回写失败的记录reWriteFailedEntry exception failure..."); + } } @Override @@ -143,11 +155,18 @@ @Override public void writeBackTousseStatistics() throws SQLException{ - // 把上月的各科室器械包发货情况回写到物资系统 - Date endDate = DateUtils.truncate(new Date(), Calendar.MONTH); - Date startDate = DateUtils.addMonths(endDate, -1); - - writeBackInventoryManager.writeBackTousseStatistics(startDate, endDate); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_TIMERTASK, "回写", "调用定时回写器械材料与器械包统计方法writeBackTousseStatistics start..."); + try{ + // 把上月的各科室器械包发货情况回写到物资系统 + Date endDate = DateUtils.truncate(new Date(), Calendar.MONTH); + Date startDate = DateUtils.addMonths(endDate, -1); + + //writeBackInventoryManager.writeBackTousseStatistics(startDate, endDate); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_TIMERTASK, "回写", "调用定时回写器械材料与器械包统计方法writeBackTousseStatistics success finish..."); + }catch (Exception e) { + e.printStackTrace(); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_TIMERTASK, "回写", "调用定时回写器械材料与器械包统计方法writeBackTousseStatistics exception failure..."); + } } @Override public void reWriteFailedEntryforSznsrmyy(){