whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改服务状态保存，增加完成时间为空并且备注不为空，不标注完成

Browse Source
optimize
jianghaiqing 1 year ago
parent 0deb10cc34
commit a4d852fb25
1 changed files with 96 additions and 32 deletions
Show Stats Download Patch File Download Diff File

70
Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowManageService.cs
Unescape Escape View File

@ -358,10 +358,20 @@ namespace Myshipping.Application
}; };
if (st.StatusCode.Equals(sku.StatusSKUCode,StringComparison.OrdinalIgnoreCase)) if (st.StatusCode.Equals(sku.StatusSKUCode,StringComparison.OrdinalIgnoreCase))
{
bool currIsYield = true;
//完成时间为空，备注不为空只保存备注信息，不标记完成
if(st.StatusDate.HasValue && !string.IsNullOrWhiteSpace(st.Remark))
{
currIsYield = false;
}
if (currIsYield)
{ {
activitiesRunInfo.IS_YIELD = 1; activitiesRunInfo.IS_YIELD = 1;
if(st.StatusDate.HasValue) if (st.StatusDate.HasValue)
{ {
activitiesRunInfo.ACT_DATE = st.StatusDate.Value; activitiesRunInfo.ACT_DATE = st.StatusDate.Value;
} }
@ -369,6 +379,7 @@ namespace Myshipping.Application
{ {
activitiesRunInfo.ACT_DATE = nowDate; activitiesRunInfo.ACT_DATE = nowDate;
} }
}
activitiesRunInfo.ACT_VAL = st.StatusVal; activitiesRunInfo.ACT_VAL = st.StatusVal;
activitiesRunInfo.ACT_REMARK = st.Remark; activitiesRunInfo.ACT_REMARK = st.Remark;
@ -409,6 +420,16 @@ namespace Myshipping.Application
}; };
if (st.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase)) if (st.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase))
{
bool currIsYield = true;
//完成时间为空，备注不为空只保存备注信息，不标记完成
if (st.StatusDate.HasValue && !string.IsNullOrWhiteSpace(st.Remark))
{
currIsYield = false;
}
if (currIsYield)
{ {
activitiesSubRunInfo.IS_YIELD = 1; activitiesSubRunInfo.IS_YIELD = 1;
@ -420,7 +441,7 @@ namespace Myshipping.Application
{ {
activitiesSubRunInfo.ACT_DATE = nowDate; activitiesSubRunInfo.ACT_DATE = nowDate;
} }
}
activitiesSubRunInfo.ACT_VAL = st.StatusVal; activitiesSubRunInfo.ACT_VAL = st.StatusVal;
activitiesSubRunInfo.ACT_REMARK = st.Remark; activitiesSubRunInfo.ACT_REMARK = st.Remark;
} }
@ -499,6 +520,16 @@ namespace Myshipping.Application
}; };
if (st.StatusCode.Equals(sku.StatusSKUCode, StringComparison.OrdinalIgnoreCase)) if (st.StatusCode.Equals(sku.StatusSKUCode, StringComparison.OrdinalIgnoreCase))
{
bool currIsYield = true;
//完成时间为空，备注不为空只保存备注信息，不标记完成
if (st.StatusDate.HasValue && !string.IsNullOrWhiteSpace(st.Remark))
{
currIsYield = false;
}
if (currIsYield)
{ {
activitiesRunInfo.IS_YIELD = 1; activitiesRunInfo.IS_YIELD = 1;
@ -510,6 +541,7 @@ namespace Myshipping.Application
{ {
activitiesRunInfo.ACT_DATE = nowDate; activitiesRunInfo.ACT_DATE = nowDate;
} }
}
activitiesRunInfo.ACT_VAL = st.StatusVal; activitiesRunInfo.ACT_VAL = st.StatusVal;
activitiesRunInfo.ACT_REMARK = st.Remark; activitiesRunInfo.ACT_REMARK = st.Remark;
@ -550,6 +582,16 @@ namespace Myshipping.Application
}; };
if (st.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase)) if (st.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase))
{
bool currIsYield = true;
//完成时间为空，备注不为空只保存备注信息，不标记完成
if (st.StatusDate.HasValue && !string.IsNullOrWhiteSpace(st.Remark))
{
currIsYield = false;
}
if (currIsYield)
{ {
activitiesSubRunInfo.IS_YIELD = 1; activitiesSubRunInfo.IS_YIELD = 1;
@ -561,6 +603,7 @@ namespace Myshipping.Application
{ {
activitiesSubRunInfo.ACT_DATE = nowDate; activitiesSubRunInfo.ACT_DATE = nowDate;
} }
}
activitiesSubRunInfo.ACT_VAL = st.StatusVal; activitiesSubRunInfo.ACT_VAL = st.StatusVal;
activitiesSubRunInfo.ACT_REMARK = st.Remark; activitiesSubRunInfo.ACT_REMARK = st.Remark;
@ -612,6 +655,16 @@ namespace Myshipping.Application
.First(p=>p.PK_ID == currRunDetail.PK_ID); .First(p=>p.PK_ID == currRunDetail.PK_ID);
if (st.StatusCode.Equals(sku.StatusSKUCode, StringComparison.OrdinalIgnoreCase)) if (st.StatusCode.Equals(sku.StatusSKUCode, StringComparison.OrdinalIgnoreCase))
{
bool currIsYield = true;
//完成时间为空，备注不为空只保存备注信息，不标记完成
if (st.StatusDate.HasValue && !string.IsNullOrWhiteSpace(st.Remark))
{
currIsYield = false;
}
if (currIsYield)
{ {
activitiesRunInfo.IS_YIELD = 1; activitiesRunInfo.IS_YIELD = 1;
@ -623,7 +676,7 @@ namespace Myshipping.Application
{ {
activitiesRunInfo.ACT_DATE = nowDate; activitiesRunInfo.ACT_DATE = nowDate;
} }
}
activitiesRunInfo.ACT_VAL = st.StatusVal; activitiesRunInfo.ACT_VAL = st.StatusVal;
activitiesRunInfo.ACT_REMARK = st.Remark; activitiesRunInfo.ACT_REMARK = st.Remark;
@ -654,6 +707,16 @@ namespace Myshipping.Application
.First(p=> currRunDetailSub.STATUS_SKU_CODE.Equals(sub.StatusSKUCode)); .First(p=> currRunDetailSub.STATUS_SKU_CODE.Equals(sub.StatusSKUCode));
if (st.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase)) if (st.StatusCode.Equals(sub.StatusSKUCode, StringComparison.OrdinalIgnoreCase))
{
bool currIsYield = true;
//完成时间为空，备注不为空只保存备注信息，不标记完成
if (st.StatusDate.HasValue && !string.IsNullOrWhiteSpace(st.Remark))
{
currIsYield = false;
}
if (currIsYield)
{ {
activitiesSubRunInfo.IS_YIELD = 1; activitiesSubRunInfo.IS_YIELD = 1;
@ -665,6 +728,7 @@ namespace Myshipping.Application
{ {
activitiesSubRunInfo.ACT_DATE = nowDate; activitiesSubRunInfo.ACT_DATE = nowDate;
} }
}
activitiesSubRunInfo.ACT_VAL = st.StatusVal; activitiesSubRunInfo.ACT_VAL = st.StatusVal;
activitiesSubRunInfo.ACT_REMARK = st.Remark; activitiesSubRunInfo.ACT_REMARK = st.Remark;

Write Preview
Loading…
Cancel
Save