Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryHelper.java =================================================================== diff -u -r25246 -r26912 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryHelper.java (.../WriteBackInventoryHelper.java) (revision 25246) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryHelper.java (.../WriteBackInventoryHelper.java) (revision 26912) @@ -6,16 +6,25 @@ import org.springframework.beans.factory.annotation.Autowired; +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; import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecord; import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecordWB; import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.tools.hibernate.ObjectDao; public class WriteBackInventoryHelper { + /** + * 日志manager + */ + @Autowired + private LogManager appLogManager; + private static final long writeBackDelay_sec = 10; private volatile static ScheduledExecutorService executorService; @@ -74,30 +83,37 @@ @Override public void run() { try { + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后开始执行回写方法WriteBackInventoryHelper.writeBackForReturnGoods,参数returnGoodsRecordIds=" + returnGoodsRecordIds); for (Long returnGoodsRecordId : returnGoodsRecordIds) { ReturnGoodsRecord returnGoodsRecord = (ReturnGoodsRecord) objectDao.getByProperty( ReturnGoodsRecord.class.getSimpleName(), "id", returnGoodsRecordId); if(returnGoodsRecord == null){ + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后执行回写方法WriteBackInventoryHelper.writeBackForReturnGoods,未找到returnGoodsRecordId为" + returnGoodsRecordId + "的退货记录"); continue; } Long existWriteBackEntryId = returnGoodsRecord .getInventoryWriteBackEntryId(); if(existWriteBackEntryId != null && existWriteBackEntryId.intValue() != -1){ + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后执行回写方法WriteBackInventoryHelper.writeBackForReturnGoods,returnGoodsRecordId为" + returnGoodsRecordId + "的退货记录的inventoryWriteBackEntryId值为" + existWriteBackEntryId + ",不需要回写"); continue; } try { Long writeBackEntryId = writeBackInventoryManager.writeBackForReturnGoods( returnGoodsRecordId, checkTheMonth); returnGoodsRecord.setInventoryWriteBackEntryId(writeBackEntryId); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后回写方法WriteBackInventoryHelper.writeBackForReturnGoods运行成功,参数returnGoodsRecordId=" + returnGoodsRecordId); } catch (Exception ex) { ex.printStackTrace(); returnGoodsRecord.setInventoryWriteBackEntryId(-1L); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后回写方法WriteBackInventoryHelper.writeBackForReturnGoods异常,参数returnGoodsRecordId=" + returnGoodsRecordId + "," + ex); } objectDao.saveOrUpdate(returnGoodsRecord); } + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后回写方法WriteBackInventoryHelper.writeBackForReturnGoods完成,参数returnGoodsRecordIds=" + returnGoodsRecordIds); } catch (Exception e) { e.printStackTrace(); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后回写方法WriteBackInventoryHelper.writeBackForReturnGoods异常,参数returnGoodsRecordIds=" + returnGoodsRecordIds + "," + e); } } }, writeBackDelay_sec, TimeUnit.SECONDS); Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java =================================================================== diff -u -r25866 -r26912 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 25866) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 26912) @@ -871,8 +871,11 @@ } // 回写物资系统 if (writeBackInventoryHelper != null) { + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后开始回写"); writeBackInventoryHelper.writeBackForReturnGoods( Collections.singleton(returnGoodsRecord.getId()), true); + }else{ + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "未配置物资回写bean:writeBackInventoryHelper"); } //省医回写接口调用