Browse Source

修改了。

master
yibo 8 years ago
parent
commit
8a3b0834d1
2 changed files with 18 additions and 4 deletions
  1. +1
    -1
      B3ClientService/BO/SyncBill.cs
  2. +17
    -3
      B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs

+ 1
- 1
B3ClientService/BO/SyncBill.cs View File

@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace BWP.B3ClientService.BO namespace BWP.B3ClientService.BO
{ {
[Serializable] [Serializable]
public class SyncBill : SyncBase
public abstract class SyncBill : SyncBase
{ {
/// <summary> /// <summary>
/// 单据创建人用户名 /// 单据创建人用户名


+ 17
- 3
B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs View File

@ -1,4 +1,5 @@
using BWP.B3ClientService.BO; using BWP.B3ClientService.BO;
using BWP.B3Frameworks.Utils;
using Forks.EnterpriseServices.DomainObjects2; using Forks.EnterpriseServices.DomainObjects2;
using Forks.EnterpriseServices.DomainObjects2.DQuery; using Forks.EnterpriseServices.DomainObjects2.DQuery;
using Forks.EnterpriseServices.JsonRpc; using Forks.EnterpriseServices.JsonRpc;
@ -42,8 +43,9 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
} }
dmo.FarmerDetails = new WeightBill_FarmerDetailCollection(); dmo.FarmerDetails = new WeightBill_FarmerDetailCollection();
dmo.Details = new WeightBill_DetailCollection(); dmo.Details = new WeightBill_DetailCollection();
FillServerUpdateFields(session, dmo);
session.Update(dmo); session.Update(dmo);
} }
session.Commit(); session.Commit();
} }
@ -60,6 +62,18 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
return result; return result;
} }
static void FillServerUpdateFields(IDmoSession session, WeightBill dmo)
{
var min = InnerBLUtil.GetSingleDmo<WeightBill>(session, "ID", dmo.ID, "B3ID", "DeleteState", "AlreadyHouse", "Inspector_ID", "Inspector_Name");
dmo.B3ID = min.B3ID;
dmo.DeleteState = min.DeleteState;
dmo.AlreadyHouse = min.AlreadyHouse;
dmo.Inspector_ID = min.Inspector_ID;
dmo.Inspector_Name = min.Inspector_Name;
dmo.Sync = false;
dmo.ModifyTime = DateTime.Now;
}
[Rpc] [Rpc]
public static bool DeleteBill(long id) public static bool DeleteBill(long id)
{ {
@ -131,7 +145,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
entity.Supplier_Name = item.Item3; entity.Supplier_Name = item.Item3;
entity.AlreadyHouse = item.Item4; entity.AlreadyHouse = item.Item4;
} }
var details = GetWeillHouseDetail(list.Select(x =>x.Bill.ID));
var details = GetWeightHouseDetail(list.Select(x => x.Bill.ID));
foreach (var item in list) foreach (var item in list)
{ {
var tags = details.Where(x => x.WeightBill_ID == item.Bill.ID); var tags = details.Where(x => x.WeightBill_ID == item.Bill.ID);
@ -141,7 +155,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc
return list; return list;
} }
static IEnumerable<WeightBill_HouseDetail> GetWeillHouseDetail(IEnumerable<long> billIDs)
static IEnumerable<WeightBill_HouseDetail> GetWeightHouseDetail(IEnumerable<long> billIDs)
{ {
var query = new DmoQuery(typeof(WeightBill_HouseDetail)); var query = new DmoQuery(typeof(WeightBill_HouseDetail));
query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("DeleteState", false), DQCondition.InList(DQExpression.Field("WeightBill_ID"), billIDs.Select(x => DQExpression.Value(x)).ToArray()))); query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("DeleteState", false), DQCondition.InList(DQExpression.Field("WeightBill_ID"), billIDs.Select(x => DQExpression.Value(x)).ToArray())));


Loading…
Cancel
Save