|
|
|
@ -741,32 +741,35 @@ namespace Myshipping.Application
|
|
|
|
|
var st = info.Main.StatusList.FirstOrDefault(c =>
|
|
|
|
|
c.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase));
|
|
|
|
|
|
|
|
|
|
if (st.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
if (st != null)
|
|
|
|
|
{
|
|
|
|
|
bool currIsYield = true;
|
|
|
|
|
|
|
|
|
|
//完成时间为空,备注不为空只保存备注信息,不标记完成
|
|
|
|
|
if (!st.StatusDate.HasValue && !string.IsNullOrWhiteSpace(st.Remark))
|
|
|
|
|
if (st.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
currIsYield = false;
|
|
|
|
|
}
|
|
|
|
|
bool currIsYield = true;
|
|
|
|
|
|
|
|
|
|
if (currIsYield)
|
|
|
|
|
{
|
|
|
|
|
activitiesSubRunInfo.IS_YIELD = 1;
|
|
|
|
|
|
|
|
|
|
if (st.StatusDate.HasValue)
|
|
|
|
|
//完成时间为空,备注不为空只保存备注信息,不标记完成
|
|
|
|
|
if (!st.StatusDate.HasValue && !string.IsNullOrWhiteSpace(st.Remark))
|
|
|
|
|
{
|
|
|
|
|
activitiesSubRunInfo.ACT_DATE = st.StatusDate.Value;
|
|
|
|
|
currIsYield = false;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
if (currIsYield)
|
|
|
|
|
{
|
|
|
|
|
activitiesSubRunInfo.ACT_DATE = nowDate;
|
|
|
|
|
activitiesSubRunInfo.IS_YIELD = 1;
|
|
|
|
|
|
|
|
|
|
if (st.StatusDate.HasValue)
|
|
|
|
|
{
|
|
|
|
|
activitiesSubRunInfo.ACT_DATE = st.StatusDate.Value;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
activitiesSubRunInfo.ACT_DATE = nowDate;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
activitiesSubRunInfo.ACT_VAL = st.StatusVal;
|
|
|
|
|
activitiesSubRunInfo.ACT_REMARK = st.Remark;
|
|
|
|
|
activitiesSubRunInfo.ACT_VAL = st.StatusVal;
|
|
|
|
|
activitiesSubRunInfo.ACT_REMARK = st.Remark;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(lastSubActId))
|
|
|
|
|