From 9d7ba1ea420aac472b3b41abe811a9169f4db331 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Fri, 18 May 2018 17:10:06 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=20=E4=BB=98=E6=AC=BE=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E4=B8=8D=E5=85=81=E8=AE=B8=E7=BC=96=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/PayEdit_Ext.cs | 1 + .../Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs | 1 + 2 files changed, 2 insertions(+) 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(); } } From 3a955e87882e08edcaf775dc05d4f213ddcc3007 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Mon, 21 May 2018 17:06:51 +0800 Subject: [PATCH 2/9] . --- B3QingDaoWanFu/TypeIOCs/GoodsBLTypeIOC.cs | 122 +++++++++++----------- 1 file changed, 61 insertions(+), 61 deletions(-) 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); +// } +// } +// } +//} From 3eae2a3e667772b969d302dc614f7bb96b960467 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 22 May 2018 11:42:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=EF=BC=8C=E4=B8=8A=E4=BC=A0MES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs index 84ae278..082d06a 100644 --- a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs +++ b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs @@ -57,6 +57,7 @@ namespace BWP.B3QingDaoWanFu.Tasks query.Columns.Add(DQSelectColumn.Field("ProductBatch_ID", scan)); query.Columns.Add(DQSelectColumn.Field("LoadTime", 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.OrderBy.Expressions.Add(DQOrderByExpression.Create(main, "ID")); @@ -77,6 +78,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 +114,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; } } } From fb0b71104b9ab43fae7732a06a8436404ed26ac7 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Fri, 25 May 2018 14:09:14 +0800 Subject: [PATCH 4/9] bug --- B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs index 082d06a..932ac41 100644 --- a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs +++ b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs @@ -55,8 +55,8 @@ 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("Goods_Code", scan)); + query.Columns.Add(DQSelectColumn.Field("CheckTime", main)); + query.Columns.Add(DQSelectColumn.Field("Goods_Code", detail)); 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")))); From 7a57ebe5c284284474624d97d534da1485294830 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Fri, 25 May 2018 16:22:53 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=B8=8D=E7=94=A8=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs index 932ac41..996ee65 100644 --- a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs +++ b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs @@ -56,7 +56,7 @@ namespace BWP.B3QingDaoWanFu.Tasks query.Columns.Add(DQSelectColumn.Field("Weight", scan)); query.Columns.Add(DQSelectColumn.Field("ProductBatch_ID", scan)); query.Columns.Add(DQSelectColumn.Field("CheckTime", main)); - query.Columns.Add(DQSelectColumn.Field("Goods_Code", detail)); + 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")))); From 944d339cc7e693e1cfb5ff6aadf02185873aaea8 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Fri, 25 May 2018 17:17:40 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B2=A1=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=89=88=E6=9C=AC=E5=88=B05.22=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs index 996ee65..082d06a 100644 --- a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs +++ b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs @@ -55,7 +55,7 @@ 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("CheckTime", main)); + query.Columns.Add(DQSelectColumn.Field("LoadTime", main)); query.Columns.Add(DQSelectColumn.Field("Goods_Code", scan)); query.Columns.Add(DQSelectColumn.Field("Number", scan)); From 18cb50969f7b0171407dafbc144764286c8ab8c9 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Sat, 26 May 2018 11:17:15 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E9=87=8D=E9=87=8F=E9=83=BD=E5=A4=A7=E4=BA=8E0?= =?UTF-8?q?=E7=9A=84=E6=89=8D=E6=98=AF=E6=9C=89=E6=95=88=E7=9A=84=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E8=AE=B0=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs index 082d06a..d8995e6 100644 --- a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs +++ b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs @@ -60,6 +60,7 @@ namespace BWP.B3QingDaoWanFu.Tasks 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()) { From 54a88feaeadf36b549b1bf7c406ee274c81ddaf4 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Sat, 26 May 2018 12:06:42 +0800 Subject: [PATCH 8/9] . --- B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs index d8995e6..0d0a30c 100644 --- a/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs +++ b/B3QingDaoWanFu/Tasks/SyncSaleOutStoreInfoToMES.cs @@ -55,7 +55,7 @@ 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)); From b8777038ad0f698da5428916859c241c19d082c3 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Sat, 26 May 2018 15:29:00 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs | 2 ++ 1 file changed, 2 insertions(+) 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("收购头数与养殖户明细头数不相等"); } }