فهرست منبع

产成品逐日出窑数据分析表增加回收标识

ztl 2 سال پیش
والد
کامیت
f6c255e7e3

+ 100 - 81
DK.Client/ReportModule/R04/M01/F_RPT_040110.Designer.cs

@@ -43,6 +43,21 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = 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 dataGridViewCellStyle7 = 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 dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = 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 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.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("产品名称");
 			System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("成型工号");
 			System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("成型线类型");
@@ -79,21 +94,6 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             treeNode26,
             treeNode27,
             treeNode28});
-			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 dataGridViewCellStyle7 = 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 dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = 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 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();
 			this.dropKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
 			this.lblKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.dropRptProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
@@ -112,7 +112,6 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.g2TV = new System.Windows.Forms.TreeView();
 			this.g3TV = new System.Windows.Forms.TreeView();
 			this.dgvTQ = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.treeView1 = new System.Windows.Forms.TreeView();
 			this.goodsname = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.gusercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.gltype = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -132,6 +131,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.SubstandardCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SubstandardSumPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SubstandardSumWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.treeView1 = new System.Windows.Forms.TreeView();
+			this.chkRecyclingFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvTQ)).BeginInit();
@@ -275,6 +276,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
 			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.chkRecyclingFlag);
 			this.gbxCondition.Controls.Add(this.chkG);
 			this.gbxCondition.Controls.Add(this.btnClearCondition);
 			this.gbxCondition.Controls.Add(this.btnSearch);
@@ -426,6 +428,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.dgvTQ.EnableHeadersVisualStyles = false;
 			this.dgvTQ.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dgvTQ.FormatQuantityColumns = null;
+			this.dgvTQ.HasNode = false;
 			this.dgvTQ.HorizontalMergeColumn = null;
 			this.dgvTQ.IsAutoCountSum = true;
 			this.dgvTQ.IsAutoResizeColumns = false;
@@ -454,71 +457,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.dgvTQ.Tag = "";
 			this.dgvTQ.TotalSumColumns = null;
 			this.dgvTQ.ViewRowFilter = "";
-			// 
-			// treeView1
-			// 
-			this.treeView1.LineColor = System.Drawing.Color.Empty;
-			this.treeView1.Location = new System.Drawing.Point(0, 0);
-			this.treeView1.Name = "treeView1";
-			treeNode7.Name = "产品名称";
-			treeNode7.Text = "产品名称";
-			treeNode8.Name = "成型工号";
-			treeNode8.Text = "成型工号";
-			treeNode9.Name = "成型线类型";
-			treeNode9.Text = "成型线类型";
-			treeNode10.Name = "产品商标";
-			treeNode10.Text = "产品商标";
-			treeNode11.Name = "单值";
-			treeNode11.Text = "单值";
-			treeNode12.Name = "单位重量";
-			treeNode12.Text = "单位重量";
-			treeNode13.Name = "数量";
-			treeNode13.Text = "数量";
-			treeNode14.Name = "折计值";
-			treeNode14.Text = "折计值";
-			treeNode15.Name = "重量";
-			treeNode15.Text = "重量";
-			treeNode16.Name = "出窑";
-			treeNode16.Text = "出窑";
-			treeNode17.Name = "合格率";
-			treeNode17.Text = "合格率";
-			treeNode18.Name = "数量";
-			treeNode18.Text = "数量";
-			treeNode19.Name = "折计值";
-			treeNode19.Text = "折计值";
-			treeNode20.Name = "重量";
-			treeNode20.Text = "重量";
-			treeNode21.Name = "合格品";
-			treeNode21.Text = "合格品";
-			treeNode22.Name = "数量";
-			treeNode22.Text = "数量";
-			treeNode23.Name = "折计值";
-			treeNode23.Text = "折计值";
-			treeNode24.Name = "重量";
-			treeNode24.Text = "重量";
-			treeNode25.Name = "重烧";
-			treeNode25.Text = "重烧";
-			treeNode26.Name = "数量";
-			treeNode26.Text = "数量";
-			treeNode27.Name = "折计值";
-			treeNode27.Text = "折计值";
-			treeNode28.Name = "重量";
-			treeNode28.Text = "重量";
-			treeNode29.Name = "次品";
-			treeNode29.Text = "次品";
-			this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode7,
-            treeNode8,
-            treeNode9,
-            treeNode10,
-            treeNode11,
-            treeNode12,
-            treeNode16,
-            treeNode21,
-            treeNode25,
-            treeNode29});
-			this.treeView1.Size = new System.Drawing.Size(121, 97);
-			this.treeView1.TabIndex = 0;
+			this.dgvTQ.VirtualNodes = false;
 			// 
 			// goodsname
 			// 
@@ -699,6 +638,85 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.SubstandardSumWeight.Name = "SubstandardSumWeight";
 			this.SubstandardSumWeight.ReadOnly = true;
 			// 
+			// treeView1
+			// 
+			this.treeView1.LineColor = System.Drawing.Color.Empty;
+			this.treeView1.Location = new System.Drawing.Point(0, 0);
+			this.treeView1.Name = "treeView1";
+			treeNode7.Name = "产品名称";
+			treeNode7.Text = "产品名称";
+			treeNode8.Name = "成型工号";
+			treeNode8.Text = "成型工号";
+			treeNode9.Name = "成型线类型";
+			treeNode9.Text = "成型线类型";
+			treeNode10.Name = "产品商标";
+			treeNode10.Text = "产品商标";
+			treeNode11.Name = "单值";
+			treeNode11.Text = "单值";
+			treeNode12.Name = "单位重量";
+			treeNode12.Text = "单位重量";
+			treeNode13.Name = "数量";
+			treeNode13.Text = "数量";
+			treeNode14.Name = "折计值";
+			treeNode14.Text = "折计值";
+			treeNode15.Name = "重量";
+			treeNode15.Text = "重量";
+			treeNode16.Name = "出窑";
+			treeNode16.Text = "出窑";
+			treeNode17.Name = "合格率";
+			treeNode17.Text = "合格率";
+			treeNode18.Name = "数量";
+			treeNode18.Text = "数量";
+			treeNode19.Name = "折计值";
+			treeNode19.Text = "折计值";
+			treeNode20.Name = "重量";
+			treeNode20.Text = "重量";
+			treeNode21.Name = "合格品";
+			treeNode21.Text = "合格品";
+			treeNode22.Name = "数量";
+			treeNode22.Text = "数量";
+			treeNode23.Name = "折计值";
+			treeNode23.Text = "折计值";
+			treeNode24.Name = "重量";
+			treeNode24.Text = "重量";
+			treeNode25.Name = "重烧";
+			treeNode25.Text = "重烧";
+			treeNode26.Name = "数量";
+			treeNode26.Text = "数量";
+			treeNode27.Name = "折计值";
+			treeNode27.Text = "折计值";
+			treeNode28.Name = "重量";
+			treeNode28.Text = "重量";
+			treeNode29.Name = "次品";
+			treeNode29.Text = "次品";
+			this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
+            treeNode7,
+            treeNode8,
+            treeNode9,
+            treeNode10,
+            treeNode11,
+            treeNode12,
+            treeNode16,
+            treeNode21,
+            treeNode25,
+            treeNode29});
+			this.treeView1.Size = new System.Drawing.Size(121, 97);
+			this.treeView1.TabIndex = 0;
+			// 
+			// chkRecyclingFlag
+			// 
+			this.chkRecyclingFlag.BackColor = System.Drawing.SystemColors.Window;
+			this.chkRecyclingFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkRecyclingFlag.BackgroundImage")));
+			this.chkRecyclingFlag.FalseText = "否";
+			this.chkRecyclingFlag.Location = new System.Drawing.Point(879, 22);
+			this.chkRecyclingFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+			this.chkRecyclingFlag.Name = "chkRecyclingFlag";
+			this.chkRecyclingFlag.Size = new System.Drawing.Size(124, 25);
+			this.chkRecyclingFlag.TabIndex = 11;
+			this.chkRecyclingFlag.Title = "回收标识";
+			this.chkRecyclingFlag.TitleAlign = System.Drawing.ContentAlignment.TopLeft;
+			this.chkRecyclingFlag.TrueText = "是";
+			// 
 			// F_RPT_040110
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -760,5 +778,6 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		private System.Windows.Forms.DataGridViewTextBoxColumn SubstandardCount;
 		private System.Windows.Forms.DataGridViewTextBoxColumn SubstandardSumPrice;
 		private System.Windows.Forms.DataGridViewTextBoxColumn SubstandardSumWeight;
+		private Basics.BaseControls.C_StatusCheckBox chkRecyclingFlag;
 	}
 }

+ 7 - 1
DK.Client/ReportModule/R04/M01/F_RPT_040110.cs

@@ -98,6 +98,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 this.dgvTQ.AutoGenerateColumns = false;
 
                 this.dropRptProcedure.Focus();
+                //回收标识默认选否
+                this.chkRecyclingFlag.FalseItemCheck();
                 // 初始化时间控件为当前日期
                 this.dtpAccountDateStart.Value = DateTime.Now.Date;
                 this.dtpAccountDateEnd.Value = this.dtpAccountDateStart.Value.AddDays(1).AddSeconds(-1);
@@ -251,7 +253,11 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 {
                     se.KilnID = Convert.ToInt32(this.dropKilnCode.SelectedValue);
                 }
-
+                object[] testRecyclingFlags = this.chkRecyclingFlag.SelectedValues;
+                if (testRecyclingFlags.Length == 1)
+                {
+                    se.RECYCLINGFLAG = Convert.ToInt32(testRecyclingFlags[0]);
+                }
                 se.CreateTimeStart = DateTime.Parse(this.dtpAccountDateStart.Value.ToString("yyyy-MM-dd HH:mm") + ":00");
                 se.CreateTimeEnd = DateTime.Parse(this.dtpAccountDateEnd.Value.ToString("yyyy-MM-dd HH:mm") + ":59");
 				se.IsShowG = this.chkG.Checked;

+ 57 - 0
DK.Client/ReportModule/R04/M01/F_RPT_040110.resx

@@ -178,6 +178,63 @@
         TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="chkRecyclingFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO

+ 1 - 0
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -5980,6 +5980,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     new OracleParameter("in_DateBegin", OracleDbType.Date, se.CreateTimeStart, ParameterDirection.Input),
                     new OracleParameter("in_DateEnd", OracleDbType.Date, se.CreateTimeEnd, ParameterDirection.Input),
                     new OracleParameter("in_OutKilnProcedureID", OracleDbType.Int32, se.RptSProcedureID , ParameterDirection.Input),
+                    new OracleParameter("in_RECYCLINGFLAG", OracleDbType.Int32, se.RECYCLINGFLAG , ParameterDirection.Input),
                     new OracleParameter("in_KilnID", OracleDbType.Int32, se.KilnID , ParameterDirection.Input),
                     new OracleParameter("out_data1", OracleDbType.RefCursor, null , ParameterDirection.Output),
                 };

+ 10 - 0
WCF.Service/WCF.DataModels/SearchEntity/RPT/RPT040110_SE.cs

@@ -50,6 +50,16 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         }
 
         /// <summary>
+        /// 回收标识
+        /// </summary>
+        [DataMember]
+        public int? RECYCLINGFLAG
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
         /// 数据源工序操作开始时间
         /// </summary>
         [DataMember]