diff --git a/B3ClientService/B3ClientService.csproj b/B3ClientService/B3ClientService.csproj index 24eb6e4..5841870 100644 --- a/B3ClientService/B3ClientService.csproj +++ b/B3ClientService/B3ClientService.csproj @@ -97,6 +97,7 @@ + @@ -116,6 +117,7 @@ + diff --git a/B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs b/B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs index 5b27843..8403733 100644 --- a/B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs +++ b/B3ClientService/BO/Bill/OrderDetail/OrderDetail.cs @@ -35,5 +35,8 @@ namespace BWP.B3ClientService.BO public bool IsHurryButcher { get; set; } public bool SecondarySplit { get; set; } + + [DbColumn(DefaultValue = 0)] + public bool Confirmed { get; set; } } } diff --git a/B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs b/B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs new file mode 100644 index 0000000..2d36dfb --- /dev/null +++ b/B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs @@ -0,0 +1,22 @@ +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 new file mode 100644 index 0000000..dfb5bfe --- /dev/null +++ b/B3ClientService/Rpcs/BillRpc/OrderConfirmRpc.cs @@ -0,0 +1,62 @@ +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 SetOrderConfirmed(long id) + { + var update = new DQUpdateDom(typeof(OrderDetail)); + update.Columns.Add(new DQUpdateColumn("Confirmed", true)); + update.Where.Conditions.Add(DQCondition.EQ("ID", id)); + update.EExecute(); + return 1; + } + } +}