diff --git a/ButcherFactory.BO/BaseInfo/ClientGoodsSet.cs b/ButcherFactory.BO/BaseInfo/ClientGoodsSet.cs index d27ea1b..338bce7 100644 --- a/ButcherFactory.BO/BaseInfo/ClientGoodsSet.cs +++ b/ButcherFactory.BO/BaseInfo/ClientGoodsSet.cs @@ -39,7 +39,11 @@ namespace ButcherFactory.BO [ReferenceTo(typeof(Goods), "GoodsType")] [Join("Goods_ID", "ID")] - public short? GoodsType { get; set; } + public short? GoodsType { get; set; } + + [ReferenceTo(typeof(Goods), "MainUnit")] + [Join("Goods_ID", "ID")] + public string MainUnit { get; set; } public decimal? StandardWeight { get; set; } diff --git a/ButcherFactory.BO/Bill/SegmentProduction.cs b/ButcherFactory.BO/Bill/SegmentProduction.cs index bd11948..5744c7a 100644 --- a/ButcherFactory.BO/Bill/SegmentProduction.cs +++ b/ButcherFactory.BO/Bill/SegmentProduction.cs @@ -65,7 +65,11 @@ namespace ButcherFactory.BO [DbColumn(DefaultValue = 0)] public bool StandardPic { get; set; } - public string MsgID { get; set; } + public string MsgID { get; set; } + + [ReferenceTo(typeof(Goods), "MainUnit")] + [Join("Goods_ID", "ID")] + public string MainUnit { get; set; } } [MapToTable("Butcher_SegmentLog")] diff --git a/ButcherFactory.BO/LocalBL/FormClientGoodsSetBL.cs b/ButcherFactory.BO/LocalBL/FormClientGoodsSetBL.cs index d02758c..a97110c 100644 --- a/ButcherFactory.BO/LocalBL/FormClientGoodsSetBL.cs +++ b/ButcherFactory.BO/LocalBL/FormClientGoodsSetBL.cs @@ -67,8 +67,9 @@ namespace ButcherFactory.BO.LocalBL query.Columns.Add(DQSelectColumn.Field("StandardWeightLow", detail)); query.Columns.Add(DQSelectColumn.Field("Goods_Spec", detail)); query.Columns.Add(DQSelectColumn.Field("Goods_Code", detail)); - query.Columns.Add(DQSelectColumn.Field("GoodsType", detail)); - query.Columns.Add(DQSelectColumn.Field("StandardPic", detail)); + query.Columns.Add(DQSelectColumn.Field("GoodsType", detail)); + query.Columns.Add(DQSelectColumn.Field("StandardPic", detail)); + query.Columns.Add(DQSelectColumn.Field("MainUnit", detail)); query.OrderBy.Expressions.Add(DQOrderByExpression.Create(main, "ID")); query.OrderBy.Expressions.Add(DQOrderByExpression.Create(detail, "ID")); @@ -90,7 +91,8 @@ namespace ButcherFactory.BO.LocalBL entity.Goods_Spec = (string)reader[6]; entity.Goods_Code = (string)reader[7]; entity.GoodsType = (short?)reader[8]; - entity.StandardPic = (bool)reader[9]; + entity.StandardPic = (bool)reader[9]; + entity.MainUnit = (string)reader[10]; if (result.ContainsKey(key)) result[key].Add(entity); else diff --git a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs index d789acc..946f5bf 100644 --- a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs +++ b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs @@ -205,7 +205,8 @@ namespace ButcherFactory.SegmentProductionAuto_ SegmentProductionBL.InsertAndSetGroupID(entity, batchDate.Value); entity.Goods_Code = detail.Goods_Code; entity.Goods_Name = detail.Goods_Name; - entity.Goods_Spec = detail.Goods_Spec; + entity.Goods_Spec = detail.Goods_Spec; + entity.MainUnit = detail.MainUnit; GoodsLabel.Text = entity.Goods_Name; historyList.Insert(0, entity); diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs b/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs index a30e774..b4b7a03 100644 --- a/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs @@ -153,7 +153,8 @@ namespace ButcherFactory.SegmentProduction_ Start(true); var entity = SegmentProductionBL.Insert(detail.Goods_ID, weight, workUnitID, batchID.Value, batchDate.Value); entity.Goods_Name = detail.Goods_Name; - entity.Goods_Spec = detail.Goods_Spec; + entity.Goods_Spec = detail.Goods_Spec; + entity.MainUnit = detail.MainUnit; GoodsLabel.Text = entity.Goods_Name; unSubmitList.Insert(0, entity); historyList.Insert(0, entity); diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs index 0c5ec04..fa34c02 100644 --- a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs @@ -23,11 +23,11 @@ namespace ButcherFactory.SegmentProduction_ dt = DateTime.Today; var dic = new Dictionary(); dic.Add("$Goods_Name", entity.Goods_Name); - var info = string.Empty; - if (entity.StandardPic) - info = string.Format("规格：{0}", entity.Goods_Spec); - else - info = string.Format("重量：{0:#0.##}KG", entity.Weight); + var info = string.Empty; + if (entity.StandardPic) + info = string.Format("规格：{0}", entity.Goods_Spec); + else + info = string.Format("重量：{0:#0.##}{1}", entity.Weight, entity.MainUnit); dic.Add("$Info", info); dic.Add("$Date", dt.Value.ToString("yyyy/MM/dd")); var code = entity.BarCode; diff --git a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.Designer.cs b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.Designer.cs index b5aa837..0447efb 100644 --- a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.Designer.cs +++ b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.Designer.cs @@ -28,25 +28,25 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); this.uScanPanel1 = new WinFormControl.UScanPanel(); this.panel4 = new System.Windows.Forms.Panel(); this.goodsLbl = new System.Windows.Forms.Label(); @@ -205,8 +205,8 @@ this.mainGridView.AllowUserToDeleteRows = false; this.mainGridView.AllowUserToResizeColumns = false; this.mainGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); - this.mainGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.mainGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13; this.mainGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); @@ -214,12 +214,12 @@ this.mainGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.mainGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.mainGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); - dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 10F); - dataGridViewCellStyle21.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mainGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); + dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 10F); + dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mainGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14; this.mainGridView.ColumnHeadersHeight = 30; this.mainGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.mainGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -237,10 +237,10 @@ this.mainGridView.Name = "mainGridView"; this.mainGridView.ReadOnly = true; this.mainGridView.RowHeadersVisible = false; - dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(234)))), ((int)(((byte)(243)))), ((int)(((byte)(250))))); - dataGridViewCellStyle26.Font = new System.Drawing.Font("宋体", 9F); - dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); - this.mainGridView.RowsDefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(234)))), ((int)(((byte)(243)))), ((int)(((byte)(250))))); + dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 9F); + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); + this.mainGridView.RowsDefaultCellStyle = dataGridViewCellStyle19; this.mainGridView.RowTemplate.Height = 40; this.mainGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.mainGridView.Size = new System.Drawing.Size(545, 320); @@ -286,8 +286,8 @@ // D_SecondNumber // this.D_SecondNumber.DataPropertyName = "SecondNumber"; - dataGridViewCellStyle22.Format = "#0.######"; - this.D_SecondNumber.DefaultCellStyle = dataGridViewCellStyle22; + dataGridViewCellStyle15.Format = "#0.######"; + this.D_SecondNumber.DefaultCellStyle = dataGridViewCellStyle15; this.D_SecondNumber.HeaderText = "订货数量"; this.D_SecondNumber.Name = "D_SecondNumber"; this.D_SecondNumber.ReadOnly = true; @@ -296,8 +296,8 @@ // D_UnitNum // this.D_UnitNum.DataPropertyName = "UnitNum"; - dataGridViewCellStyle23.Format = "#0.######"; - this.D_UnitNum.DefaultCellStyle = dataGridViewCellStyle23; + dataGridViewCellStyle16.Format = "#0.######"; + this.D_UnitNum.DefaultCellStyle = dataGridViewCellStyle16; this.D_UnitNum.HeaderText = "订货重量"; this.D_UnitNum.Name = "D_UnitNum"; this.D_UnitNum.ReadOnly = true; @@ -306,8 +306,8 @@ // D_SSecondNumber // this.D_SSecondNumber.DataPropertyName = "SSecondNumber"; - dataGridViewCellStyle24.Format = "#0.######"; - this.D_SSecondNumber.DefaultCellStyle = dataGridViewCellStyle24; + dataGridViewCellStyle17.Format = "#0.######"; + this.D_SSecondNumber.DefaultCellStyle = dataGridViewCellStyle17; this.D_SSecondNumber.HeaderText = "备货数量"; this.D_SSecondNumber.Name = "D_SSecondNumber"; this.D_SSecondNumber.ReadOnly = true; @@ -316,8 +316,8 @@ // D_SUnitNum // this.D_SUnitNum.DataPropertyName = "SUnitNum"; - dataGridViewCellStyle25.Format = "#0.######"; - this.D_SUnitNum.DefaultCellStyle = dataGridViewCellStyle25; + dataGridViewCellStyle18.Format = "#0.######"; + this.D_SUnitNum.DefaultCellStyle = dataGridViewCellStyle18; this.D_SUnitNum.HeaderText = "备货重量"; this.D_SUnitNum.Name = "D_SUnitNum"; this.D_SUnitNum.ReadOnly = true; @@ -353,8 +353,8 @@ this.finishGrid.AllowUserToDeleteRows = false; this.finishGrid.AllowUserToResizeColumns = false; this.finishGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(228)))), ((int)(((byte)(203))))); - this.finishGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle27; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(228)))), ((int)(((byte)(203))))); + this.finishGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.finishGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); @@ -362,12 +362,12 @@ this.finishGrid.BorderStyle = System.Windows.Forms.BorderStyle.None; this.finishGrid.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.finishGrid.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(129)))), ((int)(((byte)(213)))), ((int)(((byte)(68))))); - dataGridViewCellStyle28.Font = new System.Drawing.Font("宋体", 10F); - dataGridViewCellStyle28.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.finishGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(129)))), ((int)(((byte)(213)))), ((int)(((byte)(68))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 10F); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.finishGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.finishGrid.ColumnHeadersHeight = 30; this.finishGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.finishGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -383,10 +383,10 @@ this.finishGrid.Name = "finishGrid"; this.finishGrid.ReadOnly = true; this.finishGrid.RowHeadersVisible = false; - dataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(247)))), ((int)(((byte)(240))))); - dataGridViewCellStyle33.Font = new System.Drawing.Font("宋体", 10F); - dataGridViewCellStyle33.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(129)))), ((int)(((byte)(213)))), ((int)(((byte)(68))))); - this.finishGrid.RowsDefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(247)))), ((int)(((byte)(240))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 10F); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(129)))), ((int)(((byte)(213)))), ((int)(((byte)(68))))); + this.finishGrid.RowsDefaultCellStyle = dataGridViewCellStyle7; this.finishGrid.RowTemplate.Height = 40; this.finishGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.finishGrid.Size = new System.Drawing.Size(580, 37); @@ -412,8 +412,8 @@ // F_UnitNum // this.F_UnitNum.DataPropertyName = "UnitNum"; - dataGridViewCellStyle29.Format = "#0.######"; - this.F_UnitNum.DefaultCellStyle = dataGridViewCellStyle29; + dataGridViewCellStyle3.Format = "#0.######"; + this.F_UnitNum.DefaultCellStyle = dataGridViewCellStyle3; this.F_UnitNum.HeaderText = "订货重量"; this.F_UnitNum.Name = "F_UnitNum"; this.F_UnitNum.ReadOnly = true; @@ -421,8 +421,8 @@ // F_SecondNumber // this.F_SecondNumber.DataPropertyName = "SecondNumber"; - dataGridViewCellStyle30.Format = "#0.######"; - this.F_SecondNumber.DefaultCellStyle = dataGridViewCellStyle30; + dataGridViewCellStyle4.Format = "#0.######"; + this.F_SecondNumber.DefaultCellStyle = dataGridViewCellStyle4; this.F_SecondNumber.HeaderText = "订货数量"; this.F_SecondNumber.Name = "F_SecondNumber"; this.F_SecondNumber.ReadOnly = true; @@ -430,8 +430,8 @@ // F_SUnitNum // this.F_SUnitNum.DataPropertyName = "SUnitNum"; - dataGridViewCellStyle31.Format = "#0.######"; - this.F_SUnitNum.DefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle5.Format = "#0.######"; + this.F_SUnitNum.DefaultCellStyle = dataGridViewCellStyle5; this.F_SUnitNum.HeaderText = "备货重量"; this.F_SUnitNum.Name = "F_SUnitNum"; this.F_SUnitNum.ReadOnly = true; @@ -439,8 +439,8 @@ // F_SSecondNumber // this.F_SSecondNumber.DataPropertyName = "SSecondNumber"; - dataGridViewCellStyle32.Format = "#0.######"; - this.F_SSecondNumber.DefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle6.Format = "#0.######"; + this.F_SSecondNumber.DefaultCellStyle = dataGridViewCellStyle6; this.F_SSecondNumber.HeaderText = "备货数量"; this.F_SSecondNumber.Name = "F_SSecondNumber"; this.F_SSecondNumber.ReadOnly = true; @@ -462,20 +462,20 @@ this.detailGridView.AllowUserToDeleteRows = false; this.detailGridView.AllowUserToResizeColumns = false; this.detailGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(228)))), ((int)(((byte)(203))))); - this.detailGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle34; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(228)))), ((int)(((byte)(203))))); + this.detailGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; this.detailGridView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.detailGridView.BackgroundColor = System.Drawing.Color.White; this.detailGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.detailGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.detailGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(148)))), ((int)(((byte)(74))))); - dataGridViewCellStyle35.Font = new System.Drawing.Font("宋体", 10F); - dataGridViewCellStyle35.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.detailGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(148)))), ((int)(((byte)(74))))); + dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 10F); + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.detailGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; this.detailGridView.ColumnHeadersHeight = 30; this.detailGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.detailGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -491,10 +491,10 @@ this.detailGridView.Name = "detailGridView"; this.detailGridView.ReadOnly = true; this.detailGridView.RowHeadersVisible = false; - dataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(247)))), ((int)(((byte)(240))))); - dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 10F); - dataGridViewCellStyle38.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(148)))), ((int)(((byte)(74))))); - this.detailGridView.RowsDefaultCellStyle = dataGridViewCellStyle38; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(247)))), ((int)(((byte)(240))))); + dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 10F); + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(148)))), ((int)(((byte)(74))))); + this.detailGridView.RowsDefaultCellStyle = dataGridViewCellStyle12; this.detailGridView.RowTemplate.Height = 40; this.detailGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.detailGridView.Size = new System.Drawing.Size(580, 268); @@ -538,8 +538,8 @@ // B_SecondNumber // this.B_SecondNumber.DataPropertyName = "SecondNumber"; - dataGridViewCellStyle36.Format = "#0.######"; - this.B_SecondNumber.DefaultCellStyle = dataGridViewCellStyle36; + dataGridViewCellStyle10.Format = "#0.######"; + this.B_SecondNumber.DefaultCellStyle = dataGridViewCellStyle10; this.B_SecondNumber.HeaderText = "数量"; this.B_SecondNumber.Name = "B_SecondNumber"; this.B_SecondNumber.ReadOnly = true; @@ -548,8 +548,8 @@ // B_UnitNumber // this.B_UnitNumber.DataPropertyName = "UnitNumber"; - dataGridViewCellStyle37.Format = "#0.######"; - this.B_UnitNumber.DefaultCellStyle = dataGridViewCellStyle37; + dataGridViewCellStyle11.Format = "#0.######"; + this.B_UnitNumber.DefaultCellStyle = dataGridViewCellStyle11; this.B_UnitNumber.HeaderText = "重量"; this.B_UnitNumber.Name = "B_UnitNumber"; this.B_UnitNumber.ReadOnly = true; @@ -645,6 +645,8 @@ // printCk // this.printCk.AutoSize = true; + this.printCk.Checked = true; + this.printCk.CheckState = System.Windows.Forms.CheckState.Checked; this.printCk.Font = new System.Drawing.Font("黑体", 12F); this.printCk.Location = new System.Drawing.Point(14, 13); this.printCk.Name = "printCk"; diff --git a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.resx b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.resx index 4399334..e1ec653 100644 --- a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.resx +++ b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.resx @@ -117,64 +117,64 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True \ No newline at end of file