From eae0a5030fee45a56e1a10b66cabd5d30647c5e7 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 21 Nov 2017 17:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3ClientService/B3ClientService.csproj | 1 - .../GradeAndWeight/OrderGradeFinishRelate.cs | 25 ---- .../Rpcs/BillRpc/GradeAndWeightRpc.cs | 123 +----------------- .../Bill/GradeAndWeight/GradeAndWeight.cs | 4 - 4 files changed, 7 insertions(+), 146 deletions(-) delete mode 100644 B3ClientService/BO/Bill/GradeAndWeight/OrderGradeFinishRelate.cs diff --git a/B3ClientService/B3ClientService.csproj b/B3ClientService/B3ClientService.csproj index d11f3e7..9d0cf81 100644 --- a/B3ClientService/B3ClientService.csproj +++ b/B3ClientService/B3ClientService.csproj @@ -92,7 +92,6 @@ - diff --git a/B3ClientService/BO/Bill/GradeAndWeight/OrderGradeFinishRelate.cs b/B3ClientService/BO/Bill/GradeAndWeight/OrderGradeFinishRelate.cs deleted file mode 100644 index 996669a..0000000 --- a/B3ClientService/BO/Bill/GradeAndWeight/OrderGradeFinishRelate.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Forks.EnterpriseServices.DomainObjects2; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using TSingSoft.WebPluginFramework; - -namespace BWP.B3ClientService.BO -{ - [BOClass] - [Serializable] - [KeyField("OrderDetail_ID", KeyGenType.assigned)] - [KeyField("Technics", KeyGenType.assigned)] - public class OrderGradeFinishRelate - { - public long OrderDetail_ID { get; set; } - - public short Technics { get; set; } - - public bool Finish { get; set; } - - public int Already { get; set; } - - } -} diff --git a/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs b/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs index 5b1df04..8295229 100644 --- a/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs @@ -26,16 +26,12 @@ namespace BWP.B3ClientService.Rpcs.BillRpc var tech = isTang ? 0 : 1; var main = new JoinAlias(typeof(SecondOrder)); var order = new JoinAlias(typeof(OrderDetail)); - var relate = new JoinAlias(typeof(OrderGradeFinishRelate)); var query = new DQueryDom(main); query.From.AddJoin(JoinType.Left, new DQDmoSource(order), DQCondition.EQ(main, "OrderDetail_ID", order, "ID")); - query.From.AddJoin(JoinType.Left, new DQDmoSource(relate), DQCondition.And(DQCondition.EQ(main, "OrderDetail_ID", relate, "OrderDetail_ID"), DQCondition.EQ(relate, "Technics", tech))); query.Columns.Add(DQSelectColumn.Field("OrderDetail_ID")); query.Columns.Add(DQSelectColumn.Field("Order", order)); query.Columns.Add(DQSelectColumn.Field("PlanNumber", order)); query.Columns.Add(DQSelectColumn.Field("HotFadeNumber")); - query.Columns.Add(DQSelectColumn.Field("Already", relate)); - query.Columns.Add(DQSelectColumn.Field("Finish", relate)); query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("IsOk", true), DQCondition.EQ(order, "DeleteState", false), DQCondition.EQ(order, "Date", date), DQCondition.EQ(order, "IsDrop", false))); var list = new List(); @@ -56,8 +52,6 @@ namespace BWP.B3ClientService.Rpcs.BillRpc continue; entity.OrderDetail_ID = (long)reader[0]; entity.Order = (int)reader[1]; - entity.Already = (int?)reader[4] ?? 0; - entity.Finish = (bool?)reader[5] ?? false; list.Add(entity); } } @@ -66,128 +60,25 @@ namespace BWP.B3ClientService.Rpcs.BillRpc return serializer.Serialize(list); } - static long DeleteDetail(GradeAndWeight_Detail entity) - { - using (var session = Dmo.NewSession()) - { - if (entity.ID > 0) - { - session.Delete(new DmoIdentity(typeof(GradeAndWeight_Detail), entity.ID)); - if (entity.OrderDetail_ID.HasValue) - { - SubAlready(session, entity.OrderDetail_ID.Value, entity.Technics); - } - } - session.Commit(); - return entity.ID; - } - } - - static void SubAlready(IDmoSession session, long orderDetailID, short technics) - { - var entity = GetRelate(orderDetailID, technics); - if (entity != null) - { - entity.Already -= 1; - session.Update(entity); - } - - } - [Rpc] public static long UpdateOrInsertDetailOrDelete(string json) { json = json.ESerializeDateTime(); var entity = serializer.Deserialize(json); - if (entity.IsDeleted) - { - return DeleteDetail(entity); - } - else - { - return UpdateOrInsertDetail(entity); - } - } - - - static long UpdateOrInsertDetail(GradeAndWeight_Detail entity) - { - using (var session = Dmo.NewSession()) - { - if (entity.ID == 0) - { - session.Insert(entity); - if (entity.OrderDetail_ID.HasValue) - AddAlready(session, entity.OrderDetail_ID.Value, entity.Technics); - } - else - { - if (entity.OrderDetail_ID.HasValue) - { - var old = InnerBLUtil.GetDmoPropertyByID(session, typeof(GradeAndWeight_Detail), "Technics", entity.ID); - if (old != entity.Technics) - { - AddAlready(session, entity.OrderDetail_ID.Value, entity.Technics); - SubAlready(session, entity.OrderDetail_ID.Value, old); - } - } - - session.Update(entity); - - } - session.Commit(); - return entity.ID; - } - } - - [Rpc] - public static int SetGradeFinish(long orderDetailID, short technics) - { using (var session = Dmo.NewSession()) { - var entity = GetRelate(orderDetailID, technics); - if (entity == null) - { - entity = new OrderGradeFinishRelate(); - entity.OrderDetail_ID = orderDetailID; - entity.Technics = technics; - entity.Finish = true; - session.Insert(entity); - } + if (entity.IsDeleted) + session.Delete(new DmoIdentity(typeof(GradeAndWeight_Detail), entity.ID)); else { - entity.Finish = true; - session.Update(entity); + if (entity.ID == 0) + session.Insert(entity); + else + session.Update(entity); } session.Commit(); } - - return 1; - } - - static void AddAlready(IDmoSession session, long orderDetailID, short technics) - { - var entity = GetRelate(orderDetailID, technics); - if (entity == null) - { - entity = new OrderGradeFinishRelate(); - entity.OrderDetail_ID = orderDetailID; - entity.Technics = technics; - entity.Already = 1; - session.Insert(entity); - } - else - { - entity.Already += 1; - session.Update(entity); - } - } - - static OrderGradeFinishRelate GetRelate(long orderDetailID, short technics) - { - var query = new DmoQuery(typeof(OrderGradeFinishRelate)); - query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("OrderDetail_ID", orderDetailID), DQCondition.EQ("Technics", technics))); - return query.EExecuteScalar(); + return entity.ID; } [Rpc] diff --git a/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/GradeAndWeight.cs b/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/GradeAndWeight.cs index 9a5f507..b897f44 100644 --- a/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/GradeAndWeight.cs +++ b/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/GradeAndWeight.cs @@ -12,9 +12,5 @@ namespace BWP.B3ClientService.RpcBO public int Order { get; set; } public int Number { get; set; } - - public int Already { get; set; } - - public bool Finish { get; set; } } }