|
|
|
@ -1627,63 +1627,66 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
_logger.LogInformation("批次={no} 取消状态前记录 出问题的地方 info={info} msg={msg}", batchNo,JSON.Serialize(info), JSON.Serialize(activitiesRunInfo));
|
|
|
|
|
|
|
|
|
|
var beforeObj = new
|
|
|
|
|
if(activitiesRunInfo != null)
|
|
|
|
|
{
|
|
|
|
|
ACT_VAL = activitiesRunInfo.ACT_VAL,
|
|
|
|
|
ACT_REMARK = activitiesRunInfo.ACT_REMARK,
|
|
|
|
|
ACT_DATE = activitiesRunInfo.ACT_DATE,
|
|
|
|
|
IS_YIELD = activitiesRunInfo.IS_YIELD
|
|
|
|
|
};
|
|
|
|
|
var beforeObj = new
|
|
|
|
|
{
|
|
|
|
|
ACT_VAL = activitiesRunInfo.ACT_VAL,
|
|
|
|
|
ACT_REMARK = activitiesRunInfo.ACT_REMARK,
|
|
|
|
|
ACT_DATE = activitiesRunInfo.ACT_DATE,
|
|
|
|
|
IS_YIELD = activitiesRunInfo.IS_YIELD
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
_logger.LogInformation("批次={no} 取消状态前记录 msg={msg}", batchNo,JSON.Serialize(beforeObj));
|
|
|
|
|
_logger.LogInformation("批次={no} 取消状态前记录 msg={msg}", batchNo, JSON.Serialize(beforeObj));
|
|
|
|
|
|
|
|
|
|
activitiesRunInfo.ACT_VAL = null;
|
|
|
|
|
activitiesRunInfo.ACT_REMARK = null;
|
|
|
|
|
activitiesRunInfo.ACT_DATE = null;
|
|
|
|
|
activitiesRunInfo.IS_YIELD = 0;
|
|
|
|
|
activitiesRunInfo.ACT_VAL = null;
|
|
|
|
|
activitiesRunInfo.ACT_REMARK = null;
|
|
|
|
|
activitiesRunInfo.ACT_DATE = null;
|
|
|
|
|
activitiesRunInfo.IS_YIELD = 0;
|
|
|
|
|
|
|
|
|
|
activitiesRunInfo.UpdatedTime = nowDate;
|
|
|
|
|
activitiesRunInfo.UpdatedUserId = long.Parse(info.Main.OperUserId);
|
|
|
|
|
activitiesRunInfo.UpdatedUserName = info.Main.OperUserName;
|
|
|
|
|
activitiesRunInfo.UpdatedTime = nowDate;
|
|
|
|
|
activitiesRunInfo.UpdatedUserId = long.Parse(info.Main.OperUserId);
|
|
|
|
|
activitiesRunInfo.UpdatedUserName = info.Main.OperUserName;
|
|
|
|
|
|
|
|
|
|
await _serviceWorkFlowRunActivitiesInfoRepository.AsUpdateable(activitiesRunInfo)
|
|
|
|
|
.UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.ACT_DATE,
|
|
|
|
|
it.IS_YIELD,
|
|
|
|
|
it.ACT_REMARK,
|
|
|
|
|
it.ACT_VAL,
|
|
|
|
|
it.UpdatedTime,
|
|
|
|
|
it.UpdatedUserId,
|
|
|
|
|
it.UpdatedUserName
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
await _serviceWorkFlowRunActivitiesInfoRepository.AsUpdateable(activitiesRunInfo)
|
|
|
|
|
.UpdateColumns(it => new
|
|
|
|
|
{
|
|
|
|
|
it.ACT_DATE,
|
|
|
|
|
it.IS_YIELD,
|
|
|
|
|
it.ACT_REMARK,
|
|
|
|
|
it.ACT_VAL,
|
|
|
|
|
it.UpdatedTime,
|
|
|
|
|
it.UpdatedUserId,
|
|
|
|
|
it.UpdatedUserName
|
|
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
|
|
|
|
|
#region 写入运行日志
|
|
|
|
|
var runLog = activitiesRunInfo.Adapt<ServiceWorkFlowRunLogInfo>();
|
|
|
|
|
runLog.PK_ID = IDGen.NextID().ToString();
|
|
|
|
|
runLog.RUN_ID = activitiesRunInfo.RUN_ID;
|
|
|
|
|
runLog.RUN_DETAIL_ID = activitiesRunInfo.PK_ID;
|
|
|
|
|
runLog.BATCH_NO = batchNo;
|
|
|
|
|
runLog.OPER_TYPE = TrackingRunOperTypeEnum.CANCEL_STATUS.ToString();
|
|
|
|
|
runLog.EXEC_RESULT = "SUCC";
|
|
|
|
|
runLog.EXEC_NOTE = "Update";
|
|
|
|
|
runLog.MBL_NO = info.Main?.MBlNo.ToUpper();
|
|
|
|
|
runLog.VESSEL_VOYNO = info.Main?.VesselVoyno.ToUpper();
|
|
|
|
|
runLog.ORDER_NO = info.Main?.OrderNo;
|
|
|
|
|
runLog.RELEASE_VERSION = detail.Main.RELEASE_VERSION;
|
|
|
|
|
runLog.BUSI_SYSTEM_CODE = info.Main.BusiSystemCode.ToUpper();
|
|
|
|
|
runLog.BUSI_ID = info.Main.BusiId.ToUpper();
|
|
|
|
|
runLog.SERVICE_WF_ID = detail.Main.SERVICE_WF_ID.ToUpper();
|
|
|
|
|
runLog.SERVICE_PROJECT_CODE = detail.Main.SERVICE_PROJECT_CODE.ToUpper();
|
|
|
|
|
runLog.SERVICE_PROJECT_NAME = detail.Main.SERVICE_PROJECT_NAME.ToUpper();
|
|
|
|
|
runLog.ACT_VAL = beforeObj.ACT_VAL;
|
|
|
|
|
runLog.ACT_DATE = beforeObj.ACT_DATE;
|
|
|
|
|
runLog.ACT_REMARK = beforeObj.ACT_REMARK;
|
|
|
|
|
runLog.IS_YIELD = beforeObj.IS_YIELD;
|
|
|
|
|
runLog.SOURCE_TYPE = info.Main.SourceType.ToString();
|
|
|
|
|
#region 写入运行日志
|
|
|
|
|
var runLog = activitiesRunInfo.Adapt<ServiceWorkFlowRunLogInfo>();
|
|
|
|
|
runLog.PK_ID = IDGen.NextID().ToString();
|
|
|
|
|
runLog.RUN_ID = activitiesRunInfo.RUN_ID;
|
|
|
|
|
runLog.RUN_DETAIL_ID = activitiesRunInfo.PK_ID;
|
|
|
|
|
runLog.BATCH_NO = batchNo;
|
|
|
|
|
runLog.OPER_TYPE = TrackingRunOperTypeEnum.CANCEL_STATUS.ToString();
|
|
|
|
|
runLog.EXEC_RESULT = "SUCC";
|
|
|
|
|
runLog.EXEC_NOTE = "Update";
|
|
|
|
|
runLog.MBL_NO = info.Main?.MBlNo.ToUpper();
|
|
|
|
|
runLog.VESSEL_VOYNO = info.Main?.VesselVoyno.ToUpper();
|
|
|
|
|
runLog.ORDER_NO = info.Main?.OrderNo;
|
|
|
|
|
runLog.RELEASE_VERSION = detail.Main.RELEASE_VERSION;
|
|
|
|
|
runLog.BUSI_SYSTEM_CODE = info.Main.BusiSystemCode.ToUpper();
|
|
|
|
|
runLog.BUSI_ID = info.Main.BusiId.ToUpper();
|
|
|
|
|
runLog.SERVICE_WF_ID = detail.Main.SERVICE_WF_ID.ToUpper();
|
|
|
|
|
runLog.SERVICE_PROJECT_CODE = detail.Main.SERVICE_PROJECT_CODE.ToUpper();
|
|
|
|
|
runLog.SERVICE_PROJECT_NAME = detail.Main.SERVICE_PROJECT_NAME.ToUpper();
|
|
|
|
|
runLog.ACT_VAL = beforeObj.ACT_VAL;
|
|
|
|
|
runLog.ACT_DATE = beforeObj.ACT_DATE;
|
|
|
|
|
runLog.ACT_REMARK = beforeObj.ACT_REMARK;
|
|
|
|
|
runLog.IS_YIELD = beforeObj.IS_YIELD;
|
|
|
|
|
runLog.SOURCE_TYPE = info.Main.SourceType.ToString();
|
|
|
|
|
|
|
|
|
|
await _serviceWorkFlowRunLogInfoRepository.InsertAsync(runLog);
|
|
|
|
|
#endregion
|
|
|
|
|
await _serviceWorkFlowRunLogInfoRepository.InsertAsync(runLog);
|
|
|
|
|
#endregion
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|