Browse Source

修改。

master
yibo 8 years ago
parent
commit
17bbc3cce5
4 changed files with 16 additions and 88 deletions
  1. +0
    -2
      B3ClientService/B3ClientService.csproj
  2. +0
    -22
      B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs
  3. +0
    -64
      B3ClientService/Rpcs/BillRpc/OrderConfirmRpc.cs
  4. +16
    -0
      B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs

+ 0
- 2
B3ClientService/B3ClientService.csproj View File

@ -99,7 +99,6 @@
<Compile Include="BO\SyncBO\MinEmployee.cs" /> <Compile Include="BO\SyncBO\MinEmployee.cs" />
<Compile Include="BO\SyncBO\MinWPF_User.cs" /> <Compile Include="BO\SyncBO\MinWPF_User.cs" />
<Compile Include="BO\ServerHost.cs" /> <Compile Include="BO\ServerHost.cs" />
<Compile Include="ClientSerializerBo\OrderDetail\ConfirmOrder.cs" />
<Compile Include="ClientSerializerBo\OrderDetail\SelectHurryList.cs" /> <Compile Include="ClientSerializerBo\OrderDetail\SelectHurryList.cs" />
<Compile Include="ClientSerializerBo\WeightBill\HouseAndSanctionEdit.cs" /> <Compile Include="ClientSerializerBo\WeightBill\HouseAndSanctionEdit.cs" />
<Compile Include="ClientSerializerBo\WeightBill\HouseAndSanctionList.cs" /> <Compile Include="ClientSerializerBo\WeightBill\HouseAndSanctionList.cs" />
@ -121,7 +120,6 @@
<Compile Include="Rpcs\BackRpcObj.cs" /> <Compile Include="Rpcs\BackRpcObj.cs" />
<Compile Include="Rpcs\BaseInfoRpc.cs" /> <Compile Include="Rpcs\BaseInfoRpc.cs" />
<Compile Include="Rpcs\BillRpc\HouseAndSanctionRpc.cs" /> <Compile Include="Rpcs\BillRpc\HouseAndSanctionRpc.cs" />
<Compile Include="Rpcs\BillRpc\OrderConfirmRpc.cs" />
<Compile Include="Rpcs\BillRpc\OrderDetailRpc.cs" /> <Compile Include="Rpcs\BillRpc\OrderDetailRpc.cs" />
<Compile Include="Rpcs\BillRpc\SecondOrderRpc.cs" /> <Compile Include="Rpcs\BillRpc\SecondOrderRpc.cs" />
<Compile Include="Rpcs\BillRpc\GradeAndWeightRpc.cs" /> <Compile Include="Rpcs\BillRpc\GradeAndWeightRpc.cs" />


+ 0
- 22
B3ClientService/ClientSerializerBo/OrderDetail/ConfirmOrder.cs View File

@ -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; }
}
}

+ 0
- 64
B3ClientService/Rpcs/BillRpc/OrderConfirmRpc.cs View File

@ -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<ConfirmOrder>();
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;
}
}
}

+ 16
- 0
B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs View File

@ -169,6 +169,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
query.Columns.Add(DQSelectColumn.Field("B3WeighBill_ID")); query.Columns.Add(DQSelectColumn.Field("B3WeighBill_ID"));
query.Columns.Add(DQSelectColumn.Field("SecondarySplit")); query.Columns.Add(DQSelectColumn.Field("SecondarySplit"));
query.Columns.Add(DQSelectColumn.Field("Supplier_Name")); 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))); query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("Date", date), DQCondition.EQ("DeleteState", false)));
var list = new List<OrderDetail>(); var list = new List<OrderDetail>();
@ -188,6 +189,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
entity.B3WeighBill_ID = (long?)reader[6]; entity.B3WeighBill_ID = (long?)reader[6];
entity.SecondarySplit = (bool)reader[7]; entity.SecondarySplit = (bool)reader[7];
entity.Supplier_Name = (string)reader[8]; entity.Supplier_Name = (string)reader[8];
entity.OrderState = (int)reader[9];
list.Add(entity); list.Add(entity);
} }
} }
@ -452,5 +454,19 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
} }
} }
#endregion #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
} }
} }

Loading…
Cancel
Save