Commit 6ec237e5 by 陶然

优化

parent 8be634d0
......@@ -193,6 +193,7 @@ namespace Kivii.Samples
}
var existSample = conn.SingleById<Sample>(sample.Kvid);
existSample.ThrowIfNull("未找到此样品信息!");
(existSample.Type != SampleType.Master && existSample.Type != SampleType.Node).ThrowIfTrue("不支持拆分的样品类型");
//先获取当前的最后一个路由地址
var currentRoute = existSample.GetCurrentRoute();
......@@ -283,7 +284,10 @@ namespace Kivii.Samples
//var local = conn.Single<Location>(o => o.InternalCode == location.InternalCode);
//(local == null).ThrowIfTrue($"未找到{location.InternalCode}目的地点配置信息!");
var existPackage = conn.SingleById<Sample>(package.Kvid);
if (existPackage != null) package = existPackage;
if (existPackage != null)
{
if (existPackage.Type == SampleType.Package) package = existPackage;
}
//var currentRoutes = conn.Select<Route>(o => Sql.In(o.SampleKvid, exists.ConvertAll(p => p.Kvid)) && o.NextLocationKvid == Guid.Empty);
var trans = conn.OpenTransaction();
......
......@@ -39,6 +39,12 @@ namespace Kivii.Samples.Transforms
[RequiresAnyRole(SystemRoles.Everyone)]
public class SampleCreate : RestfulCreate<Sample>
{
public override bool OnPreRestfulCreate(IRequest req, IResponse res, IDbConnection dbConnection, IRestfulCreateResponse<Sample> rtns)
{
if (Item.Type != SampleType.Package) throw new Exception("只能新建包裹类型样品!");
Item.Category = SampleType.Package.ToString();
return base.OnPreRestfulCreate(req, res, dbConnection, rtns);
}
}
[RequiresAnyRole(SystemRoles.Everyone)]
public class SampleUpdate : RestfulUpdate<Sample>
......@@ -190,4 +196,5 @@ namespace Kivii.Samples.Transforms
return base.OnRestfulQueryResponse(req, res, dbConnection, rtns);
}
}
}
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