From bf7cd21c45f262a96669c5cbf30b50e72a21b339 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Mon, 17 Sep 2018 11:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.141217=20?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E4=BA=A7=E5=93=81=E5=88=86=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E9=9D=9E=E6=A0=87=E5=87=86=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E8=B4=A7=E7=9A=84=E6=97=B6=E5=80=99=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BB=B6=E6=8C=89=E6=8A=A5=E4=BB=B7=E6=95=B0=E9=87=8F=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=A4=87=E8=B4=A7=EF=BC=8C=E9=9D=9E=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BB=B6=E6=8C=89=E8=BE=85=E6=95=B0=E9=87=8F=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=A4=87=E8=B4=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClientGoodsSet_/ClientGoodsSetEdit.cs | 2 +- .../BO/Bill/SegmentProductionInfo.cs | 4 ++++ B3ClientService/BO/CarcassFullInfoView.cs | 4 +++- .../ClientGoodsSet_/ClientGoodsSet_Detail.cs | 4 ++++ B3ClientService/OfflinRpc/BaseInfoRpc.cs | 24 ++++++++++--------- .../OfflinRpc/SegmentInStoreRpc.cs | 5 ++-- .../OfflinRpc/SegmentProductionRpc.cs | 3 ++- 7 files changed, 30 insertions(+), 16 deletions(-) diff --git a/B3ClientService.Web/Pages/B3ClientService/BaseInfos/ClientGoodsSet_/ClientGoodsSetEdit.cs b/B3ClientService.Web/Pages/B3ClientService/BaseInfos/ClientGoodsSet_/ClientGoodsSetEdit.cs index 2b5496d..f3435bb 100644 --- a/B3ClientService.Web/Pages/B3ClientService/BaseInfos/ClientGoodsSet_/ClientGoodsSetEdit.cs +++ b/B3ClientService.Web/Pages/B3ClientService/BaseInfos/ClientGoodsSet_/ClientGoodsSetEdit.cs @@ -132,7 +132,7 @@ namespace BWP.Web.Pages.B3ClientService.BaseInfos.ClientGoodsSet_ _detailGrid.Columns.Add(new DFEditGridColumn("StandardWeight")); _detailGrid.Columns.Add(new DFEditGridColumn("StandardWeightUp")); _detailGrid.Columns.Add(new DFEditGridColumn("StandardWeightLow")); - + _detailGrid.Columns.Add(new DFEditGridColumn("StandardPic")); var section = mPageLayoutManager.AddSection("Detail", "存货明细"); titlePanel.SetPageLayoutSetting(mPageLayoutManager, section.Name); diff --git a/B3ClientService/BO/Bill/SegmentProductionInfo.cs b/B3ClientService/BO/Bill/SegmentProductionInfo.cs index f597489..f5a20ad 100644 --- a/B3ClientService/BO/Bill/SegmentProductionInfo.cs +++ b/B3ClientService/BO/Bill/SegmentProductionInfo.cs @@ -56,6 +56,10 @@ namespace BWP.B3ClientService.BO [LogicName("重量")] public decimal? Weight { get; set; } + + [LogicName("标准件")] + [DbColumn(DefaultValue = 0)] + public bool StandardPic { get; set; } #endregion #region 入库信息 diff --git a/B3ClientService/BO/CarcassFullInfoView.cs b/B3ClientService/BO/CarcassFullInfoView.cs index 188d6df..c1154d3 100644 --- a/B3ClientService/BO/CarcassFullInfoView.cs +++ b/B3ClientService/BO/CarcassFullInfoView.cs @@ -1,4 +1,5 @@ -using Forks.EnterpriseServices.DataForm; +using BWP.B3Frameworks.BO.NamedValueTemplate; +using Forks.EnterpriseServices.DataForm; using Forks.EnterpriseServices.DomainObjects2; using Forks.EnterpriseServices.DomainObjects2.DQuery; using Forks.EnterpriseServices.SqlDoms; @@ -134,6 +135,7 @@ namespace BWP.B3ClientService.BO query.Columns.Add(DQSelectColumn.Field("Date", "Time")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Value(true), "InStore")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Value(3), "Flag")); + query.Where.Conditions.Add(DQCondition.GreaterThanOrEqual("BillState", 单据状态.已审核)); return query; } } diff --git a/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs b/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs index da80714..ef02852 100644 --- a/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs +++ b/B3ClientService/BO/ClientGoodsSet_/ClientGoodsSet_Detail.cs @@ -46,6 +46,10 @@ namespace BWP.B3ClientService.BO [LogicName("标准重量下限")] public decimal? StandardWeightLow { get; set; } + + [LogicName("标准件")] + [DbColumn(DefaultValue = 0)] + public bool StandardPic { get; set; } } [Serializable] diff --git a/B3ClientService/OfflinRpc/BaseInfoRpc.cs b/B3ClientService/OfflinRpc/BaseInfoRpc.cs index fedeab9..472c3a0 100644 --- a/B3ClientService/OfflinRpc/BaseInfoRpc.cs +++ b/B3ClientService/OfflinRpc/BaseInfoRpc.cs @@ -88,6 +88,7 @@ namespace BWP.B3ClientService.Rpcs query.Columns.Add(DQSelectColumn.Field("StandardWeight", detail)); query.Columns.Add(DQSelectColumn.Field("StandardWeightUp", detail)); query.Columns.Add(DQSelectColumn.Field("StandardWeightLow", detail)); + query.Columns.Add(DQSelectColumn.Field("StandardPic", detail));//8 query.Columns.Add(DQSelectColumn.Field("Name", goods)); query.Columns.Add(DQSelectColumn.Field("Code", goods)); query.Columns.Add(DQSelectColumn.Field("Spec", goods)); @@ -149,12 +150,13 @@ namespace BWP.B3ClientService.Rpcs d.StandardWeight = (decimal?)reader[5]; d.StandardWeightUp = (decimal?)reader[6]; d.StandardWeightLow = (decimal?)reader[7]; + d.StandardPic = (bool)reader[8]; } if (!gsID.Contains(goodsID)) gsID.Add(goodsID); - var gVersion = (int)reader[13]; + var gVersion = (int)reader[14]; if (!g2.Any(x => x.Item1 == goodsID))//insert { if (!gInsert.Any(x => x.ID == goodsID)) @@ -163,11 +165,11 @@ namespace BWP.B3ClientService.Rpcs gInsert.Add(new MinGoods { ID = goodsID, - Name = (string)reader[8], - Code = (string)reader[9], - Spec = (string)reader[10], - MainUnit = (string)reader[11], - GoodsType = (NamedValue<存货类别>?)reader[12], + Name = (string)reader[9], + Code = (string)reader[10], + Spec = (string)reader[11], + MainUnit = (string)reader[12], + GoodsType = (NamedValue<存货类别>?)reader[13], RowVersion = gVersion }); } @@ -179,11 +181,11 @@ namespace BWP.B3ClientService.Rpcs gUpdate.Add(new MinGoods { ID = goodsID, - Name = (string)reader[8], - Code = (string)reader[9], - Spec = (string)reader[10], - MainUnit = (string)reader[11], - GoodsType = (NamedValue<存货类别>?)reader[12], + Name = (string)reader[9], + Code = (string)reader[10], + Spec = (string)reader[11], + MainUnit = (string)reader[12], + GoodsType = (NamedValue<存货类别>?)reader[13], RowVersion = gVersion }); } diff --git a/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs b/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs index 9aa728b..16f9890 100644 --- a/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs +++ b/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs @@ -147,11 +147,12 @@ namespace BWP.B3ClientService.Rpcs query.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(main, "Goods_ID", goods, "ID")); query.Columns.Add(DQSelectColumn.Field("Code", goods)); query.Columns.Add(DQSelectColumn.Field("Weight")); + query.Columns.Add(DQSelectColumn.Field("StandardPic")); query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("BarCode", barCode), DQCondition.IsNotNull(DQExpression.Field("InStoreTime")), DQCondition.IsNull(DQExpression.Field("BackTime")))); - var result = query.EExecuteScalar(); + var result = query.EExecuteScalar(); if (result == null) return string.Empty; - return JsonConvert.SerializeObject(new ExtensionObj { StringExt1 = result.Item1, DecimalExt1 = result.Item2 }); + return JsonConvert.SerializeObject(result); } } diff --git a/B3ClientService/OfflinRpc/SegmentProductionRpc.cs b/B3ClientService/OfflinRpc/SegmentProductionRpc.cs index 44f426f..5811dbe 100644 --- a/B3ClientService/OfflinRpc/SegmentProductionRpc.cs +++ b/B3ClientService/OfflinRpc/SegmentProductionRpc.cs @@ -14,7 +14,7 @@ namespace BWP.B3ClientService.Rpcs [Rpc] public static class SegmentProductionRpc { - static string[] ProductInfoFields = new string[] { "ProductTime", "Worker_ID", "WorkUnit_ID", "ProductBatch_ID", "Goods_ID", "Weight" }; + static string[] ProductInfoFields = new string[] { "ProductTime", "Worker_ID", "WorkUnit_ID", "ProductBatch_ID", "Goods_ID", "Weight", "StandardPic" }; static Type MinDmoType = typeof(SegmentProductionMin); [Rpc(RpcFlags.SkipAuth)] @@ -119,5 +119,6 @@ namespace BWP.B3ClientService.Rpcs public decimal? Weight { get; set; } public DateTime? InStoreTime { get; set; } public bool Delete { get; set; } + public bool StandardPic { get; set; } } }