diff --git a/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs b/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs index d6044a3..5b331af 100644 --- a/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs @@ -142,7 +142,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc } [Rpc] - public static int UpdateLivestock(long id, long liveStockID, string liveStockName) + public static int UpdateLivestock(long id, long liveStockID, string liveStockName,short techincs,string technicsName) { using (var session = Dmo.NewSession()) { @@ -150,6 +150,8 @@ namespace BWP.B3ClientService.Rpcs.BillRpc update.Where.Conditions.Add(DQCondition.EQ("ID", id)); update.Columns.Add(new DQUpdateColumn("Livestock_ID", liveStockID)); update.Columns.Add(new DQUpdateColumn("Livestock_Name", liveStockName)); + update.Columns.Add(new DQUpdateColumn("Technics", techincs)); + update.Columns.Add(new DQUpdateColumn("Technics_Name", technicsName)); session.ExecuteNonQuery(update); session.Commit(); } diff --git a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs index 6d76117..89e8923 100644 --- a/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/OrderDetailRpc.cs @@ -226,7 +226,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc var query = new DQueryDom(new JoinAlias(typeof(OrderDetail))); query.Columns.Add(DQSelectColumn.Max("Order")); query.Where.Conditions.Add(DQCondition.And(DQCondition.Between("Date", date.Date, date.Date + new TimeSpan(23, 59, 29)), DQCondition.EQ("DeleteState", false))); - return query.EExecuteScalar() ?? 1; + return query.EExecuteScalar() ?? 0; } [Rpc] @@ -235,7 +235,6 @@ namespace BWP.B3ClientService.Rpcs.BillRpc var list = serializer.Deserialize>>(update); insert = insert.ESerializeDateTime(); var entity = serializer.Deserialize(insert); - entity.Date = DateTime.Today; entity.ModifyTime = DateTime.Now; using (var session = Dmo.NewSession()) {