diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/PayEdit_Ext.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/PayEdit_Ext.cs index d7a3c8f..d9a000e 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/PayEdit_Ext.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/PayEdit_Ext.cs @@ -139,6 +139,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays { base.AppToUI(); _farmerGrid.DataBind(); + mDFContainer.MakeReadonly("PayTarget"); } } } diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs index 467c918..add43aa 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs @@ -62,6 +62,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays { base.AppToUI(); mDFContainer.MakeReadonly("ShackMoney"); + mDFContainer.MakeReadonly("PayTarget"); _farmerGrid.DataBind(); } } diff --git a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs index 84ae278..0d0a30c 100644 --- a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs +++ b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs @@ -55,10 +55,12 @@ namespace BWP.B3QingDaoWanFu.Tasks query.Columns.Add(DQSelectColumn.Field("BarCode", scan)); query.Columns.Add(DQSelectColumn.Field("Weight", scan)); query.Columns.Add(DQSelectColumn.Field("ProductBatch_ID", scan)); - query.Columns.Add(DQSelectColumn.Field("LoadTime", main)); + query.Columns.Add(DQSelectColumn.Field("CheckTime", main)); query.Columns.Add(DQSelectColumn.Field("Goods_Code", scan)); + query.Columns.Add(DQSelectColumn.Field("Number", scan)); query.Where.Conditions.Add(DQCondition.And(DQCondition.GreaterThanOrEqual("BillState", 单据状态.已审核), DQCondition.IsNull(DQExpression.Field(relate, "SaleOutStore_ID")), DQCondition.IsNotNull(DQExpression.Field(scan, "ID")))); + query.Where.Conditions.Add(DQCondition.And(DQCondition.GreaterThan(scan, "Weight", 0), DQCondition.GreaterThan(scan, "Number", 0))); query.OrderBy.Expressions.Add(DQOrderByExpression.Create(main, "ID")); using (var session = Dmo.NewSession()) { @@ -77,6 +79,7 @@ namespace BWP.B3QingDaoWanFu.Tasks entity.ProductBatch_ID = (long?)reader[3]; entity.Time = (DateTime?)reader[4]; entity.SaleGoods_Code = (string)reader[5]; + entity.Number = (decimal?)reader[6]; list.Add(entity); } } @@ -112,5 +115,6 @@ namespace BWP.B3QingDaoWanFu.Tasks public DateTime? Time { get; set; } public string SaleGoods_Code { get; set; } public long? ProductBatch_ID { get; set; } + public decimal? Number { get; set; } } } diff --git a/B3QingDaoWanFu/TypeIOCs/GoodsBLTypeIOC.cs b/B3QingDaoWanFu/TypeIOCs/GoodsBLTypeIOC.cs index 9a370b8..5fd64a2 100644 --- a/B3QingDaoWanFu/TypeIOCs/GoodsBLTypeIOC.cs +++ b/B3QingDaoWanFu/TypeIOCs/GoodsBLTypeIOC.cs @@ -1,65 +1,65 @@ -using BWP.B3Frameworks; -using BWP.B3ProcurementInterface.Utils; -using BWP.B3QingDaoWanFu.BL; -using BWP.B3UnitedInfos.BL; -using BWP.B3UnitedInfos.BO; -using Forks.EnterpriseServices.BusinessInterfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +//using BWP.B3Frameworks; +//using BWP.B3ProcurementInterface.Utils; +//using BWP.B3QingDaoWanFu.BL; +//using BWP.B3UnitedInfos.BL; +//using BWP.B3UnitedInfos.BO; +//using Forks.EnterpriseServices.BusinessInterfaces; +//using System; +//using System.Collections.Generic; +//using System.Linq; +//using System.Text; -namespace BWP.B3QingDaoWanFu.TypeIOCs -{ - [TypeIOC(typeof(GoodsBL), typeof(GoodsBL.BaseBLIOCs.AfterSave))] - public class GoodsAfterSave : GoodsBL.BaseBLIOCs.AfterSave - { - public void Invoke(IDmoContext context, Goods dmo) - { - if (ClientServerFacedRpcFacadeUtil.InitRpcFacade()) - { - var bl = BIFactory.Create(context); - bl.UpdateOrInsert(dmo); - } - } - } +//namespace BWP.B3QingDaoWanFu.TypeIOCs +//{ +// [TypeIOC(typeof(GoodsBL), typeof(GoodsBL.BaseBLIOCs.AfterSave))] +// public class GoodsAfterSave : GoodsBL.BaseBLIOCs.AfterSave +// { +// public void Invoke(IDmoContext context, Goods dmo) +// { +// if (ClientServerFacedRpcFacadeUtil.InitRpcFacade()) +// { +// var bl = BIFactory.Create(context); +// bl.UpdateOrInsert(dmo); +// } +// } +// } - [TypeIOC(typeof(GoodsBL), typeof(GoodsBL.BaseInfoBLIOCs.AfterStart))] - public class GoodsAfterStart : GoodsBL.BaseInfoBLIOCs.AfterStart - { - public void Invoke(IDmoContext context, Goods dmo) - { - if (ClientServerFacedRpcFacadeUtil.InitRpcFacade()) - { - var bl = BIFactory.Create(context); - bl.Start(dmo.Code); - } - } - } +// [TypeIOC(typeof(GoodsBL), typeof(GoodsBL.BaseInfoBLIOCs.AfterStart))] +// public class GoodsAfterStart : GoodsBL.BaseInfoBLIOCs.AfterStart +// { +// public void Invoke(IDmoContext context, Goods dmo) +// { +// if (ClientServerFacedRpcFacadeUtil.InitRpcFacade()) +// { +// var bl = BIFactory.Create(context); +// bl.Start(dmo.Code); +// } +// } +// } - [TypeIOC(typeof(GoodsBL), typeof(GoodsBL.BaseInfoBLIOCs.AfterStop))] - public class GoodsAfterStop : GoodsBL.BaseInfoBLIOCs.AfterStop - { - public void Invoke(IDmoContext context, Goods dmo) - { - if (ClientServerFacedRpcFacadeUtil.InitRpcFacade()) - { - var bl = BIFactory.Create(context); - bl.Stop(dmo.Code); - } - } - } +// [TypeIOC(typeof(GoodsBL), typeof(GoodsBL.BaseInfoBLIOCs.AfterStop))] +// public class GoodsAfterStop : GoodsBL.BaseInfoBLIOCs.AfterStop +// { +// public void Invoke(IDmoContext context, Goods dmo) +// { +// if (ClientServerFacedRpcFacadeUtil.InitRpcFacade()) +// { +// var bl = BIFactory.Create(context); +// bl.Stop(dmo.Code); +// } +// } +// } - [TypeIOC(typeof(GoodsBL), typeof(GoodsBL.BaseBLIOCs.AfterDelete))] - public class GoodsAfterDelete : GoodsBL.BaseBLIOCs.AfterDelete - { - public void Invoke(IDmoContext context, Goods dmo) - { - if (ClientServerFacedRpcFacadeUtil.InitRpcFacade()) - { - var bl = BIFactory.Create(context); - bl.Delete(dmo.Code); - } - } - } -} +// [TypeIOC(typeof(GoodsBL), typeof(GoodsBL.BaseBLIOCs.AfterDelete))] +// public class GoodsAfterDelete : GoodsBL.BaseBLIOCs.AfterDelete +// { +// public void Invoke(IDmoContext context, Goods dmo) +// { +// if (ClientServerFacedRpcFacadeUtil.InitRpcFacade()) +// { +// var bl = BIFactory.Create(context); +// bl.Delete(dmo.Code); +// } +// } +// } +//} diff --git a/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs index 490363c..2c6a197 100644 --- a/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs +++ b/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs @@ -17,6 +17,8 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs { if (dmo.PayTarget == null) throw new Exception("付款对象不能为空"); + if (dmo.BuyNum != dmo.FarmerDetails.Sum(x => x.Number ?? 0)) + throw new Exception("收购头数与养殖户明细头数不相等"); } }