Commit 11ae59fd by 陶然

优化

parent bf3b6825
...@@ -305,26 +305,27 @@ namespace Kivii.Samples ...@@ -305,26 +305,27 @@ namespace Kivii.Samples
{ {
var package = exists.FirstOrDefault(o => o.Kvid == item.PackageKvid); var package = exists.FirstOrDefault(o => o.Kvid == item.PackageKvid);
var currentRoute = item.GetCurrentRoute();//conn.Single<Route>(o => o.SampleKvid == existSample.Kvid && o.NextLocationKvid == Guid.Empty); var currentRoute = item.GetCurrentRoute();//conn.Single<Route>(o => o.SampleKvid == existSample.Kvid && o.NextLocationKvid == Guid.Empty);
if (route == null) route = new Route(); Route newRoute = new Route();
route.SampleRootKvid = item.RootKvid; if (route != null) newRoute.PopulateWith(route);
route.SampleKvid = item.Kvid; newRoute.SampleRootKvid = item.RootKvid;
route.SampleParentKvid = item.ParentKvid; newRoute.SampleKvid = item.Kvid;
route.SampleName = item.Name; newRoute.SampleParentKvid = item.ParentKvid;
route.BizId = item.BizId; newRoute.SampleName = item.Name;
route.BizKvid = item.BizKvid; newRoute.BizId = item.BizId;
route.BizType = item.BizType; newRoute.BizKvid = item.BizKvid;
route.Title = route.Title.IsNullOrEmpty() ? $"出库报废,样品[{item.Name}]已报废" : route.Title; newRoute.BizType = item.BizType;
route.Type = route.Type.IsNullOrEmpty() ? "出库报废" : route.Type; newRoute.Title = newRoute.Title.IsNullOrEmpty() ? $"出库报废,样品[{item.Name}]已报废" : newRoute.Title;
if (package != null) route.Summary = $"原货区:{package.PackageName},箱号:{package.Name}"; newRoute.Type = newRoute.Type.IsNullOrEmpty() ? "出库报废" : newRoute.Type;
route.CurrentLocationKvid = location.Kvid; if (package != null) newRoute.Summary = $"原货区:{package.PackageName},箱号:{package.Name}";
route.CurrentLocationTitle = location.Title; newRoute.CurrentLocationKvid = location.Kvid;
route.OperateTime = route.OperateTime == DateTime.MinValue ? DateTime.Now : route.OperateTime; newRoute.CurrentLocationTitle = location.Title;
if (route.OperatorName.IsNullOrEmpty()) newRoute.OperateTime = newRoute.OperateTime == DateTime.MinValue ? DateTime.Now : newRoute.OperateTime;
if (newRoute.OperatorName.IsNullOrEmpty())
{ {
route.OperatorName = KiviiContext.CurrentMember.FullName; newRoute.OperatorName = KiviiContext.CurrentMember.FullName;
route.OperatorKvid = KiviiContext.CurrentMember.Kvid; newRoute.OperatorKvid = KiviiContext.CurrentMember.Kvid;
} }
conn.Insert(route); conn.Insert(newRoute);
if (currentRoute != null) if (currentRoute != null)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment