From 17bbc3cce5bb84c29c59a83c2f3d337be82476e2 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Wed, 18 Oct 2017 21:11:29 +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 | 2 -
.../OrderDetail/ConfirmOrder.cs | 22 -------
.../Rpcs/BillRpc/OrderConfirmRpc.cs | 64 -------------------
.../Rpcs/BillRpc/OrderDetailRpc.cs | 16 +++++
4 files changed, 16 insertions(+), 88 deletions(-)
delete mode 100644 B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs
delete mode 100644 B3ClientService/Rpcs/BillRpc/OrderConfirmRpc.cs
diff --git a/B3ClientService/B3ClientService.csproj b/B3ClientService/B3ClientService.csproj
index 9855860..ad119e9 100644
--- a/B3ClientService/B3ClientService.csproj
+++ b/B3ClientService/B3ClientService.csproj
@@ -99,7 +99,6 @@
-
@@ -121,7 +120,6 @@
-
diff --git a/B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs b/B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs
deleted file mode 100644
index 2d36dfb..0000000
--- a/B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace BWP.B3ClientService
-{
- public class ConfirmOrder
- {
- public long ID { get; set; }
-
- public int Order { get; set; }
-
- public long? B3WeighBill_ID { get; set; }
-
- public string LiveColonyHouse_Name { get; set; }
-
- public int Number { get; set; }
-
- public bool Confirmed { get; set; }
- }
-}
diff --git a/B3ClientService/Rpcs/BillRpc/OrderConfirmRpc.cs b/B3ClientService/Rpcs/BillRpc/OrderConfirmRpc.cs
deleted file mode 100644
index 0e35644..0000000
--- a/B3ClientService/Rpcs/BillRpc/OrderConfirmRpc.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using BWP.B3ClientService.BO;
-using Forks.EnterpriseServices.DomainObjects2;
-using Forks.EnterpriseServices.DomainObjects2.DQuery;
-using Forks.EnterpriseServices.JsonRpc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.Script.Serialization;
-using TSingSoft.WebPluginFramework;
-
-namespace BWP.B3ClientService.Rpcs.BillRpc
-{
- [Rpc]
- public static class OrderConfirmRpc
- {
- static JavaScriptSerializer serializer = new JavaScriptSerializer();
-
- [Rpc]
- public static string GetConfirmOrder(DateTime date)
- {
- var query = new DQueryDom(new JoinAlias(typeof(OrderDetail)));
- query.Columns.Add(DQSelectColumn.Field("ID"));
- query.Columns.Add(DQSelectColumn.Field("Order"));
- query.Columns.Add(DQSelectColumn.Field("B3WeighBill_ID"));
- query.Columns.Add(DQSelectColumn.Field("LiveColonyHouse_Name"));
- query.Columns.Add(DQSelectColumn.Field("PlanNumber"));
- query.Columns.Add(DQSelectColumn.Field("Confirmed"));
- query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("Date", date), DQCondition.EQ("DeleteState", false)));
- var list = new List();
- using (var session = Dmo.NewSession())
- {
- using (var reader = session.ExecuteReader(query))
- {
- while (reader.Read())
- {
- var entity = new ConfirmOrder();
- entity.ID = (long)reader[0];
- entity.Order = (int)reader[1];
- entity.B3WeighBill_ID = (long?)reader[2];
- entity.LiveColonyHouse_Name = (string)reader[3];
- entity.Number = (int)reader[4];
- entity.Confirmed = (bool)reader[5];
- list.Add(entity);
- }
- }
- }
-
- return serializer.Serialize(list);
- }
-
- [Rpc]
- public static int SetOrderState(long id,int state)
- {
- if (!(state == 0 || state == 10 || state == 20))
- throw new Exception(string.Format("错误的状态输入 {0}", state));
- var update = new DQUpdateDom(typeof(OrderDetail));
- update.Columns.Add(new DQUpdateColumn("OrderState", state));
- update.Where.Conditions.Add(DQCondition.EQ("ID", id));
- update.EExecute();
- return 1;
- }
- }
-}
diff --git a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
index c320c22..9afca32 100644
--- a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
+++ b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs
@@ -169,6 +169,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
query.Columns.Add(DQSelectColumn.Field("B3WeighBill_ID"));
query.Columns.Add(DQSelectColumn.Field("SecondarySplit"));
query.Columns.Add(DQSelectColumn.Field("Supplier_Name"));
+ query.Columns.Add(DQSelectColumn.Field("OrderState"));
query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("Date", date), DQCondition.EQ("DeleteState", false)));
var list = new List();
@@ -188,6 +189,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
entity.B3WeighBill_ID = (long?)reader[6];
entity.SecondarySplit = (bool)reader[7];
entity.Supplier_Name = (string)reader[8];
+ entity.OrderState = (int)reader[9];
list.Add(entity);
}
}
@@ -452,5 +454,19 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
}
}
#endregion
+
+ #region orderConfirm
+ [Rpc]
+ public static int SetOrderState(long id, int state)
+ {
+ if (!(state == 0 || state == 10 || state == 20))
+ throw new Exception(string.Format("错误的状态输入 {0}", state));
+ var update = new DQUpdateDom(typeof(OrderDetail));
+ update.Columns.Add(new DQUpdateColumn("OrderState", state));
+ update.Where.Conditions.Add(DQCondition.EQ("ID", id));
+ update.EExecute();
+ return 1;
+ }
+ #endregion
}
}