1

DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0107.Designer.cs

@@ -29,29 +29,29 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
         /// </summary>
         private void InitializeComponent()
         {
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle69 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle61 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle62 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle63 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle64 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle65 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle66 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle67 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle68 = 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 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 dataGridViewCellStyle12 = 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 dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = 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 dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
 			this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
 			this.lblLabel3 = new Dongke.WinForm.Controls.LblLabel();
 			this.CBDataCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
@@ -68,14 +68,6 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.tabControl1 = new System.Windows.Forms.TabControl();
 			this.tabPage3 = new System.Windows.Forms.TabPage();
 			this.dgvTotal = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.DATACODETOTAL = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tabPage1 = new System.Windows.Forms.TabPage();
 			this.dgvLog = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.logdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -108,6 +100,17 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.ztype = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.zmsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.ZTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DATACODETOTAL = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DRJJBQTRCXDCCP = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DRCXFDRJJDCCP = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DIFFER = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.grpCollapsible1.SuspendLayout();
 			this.tsrToolStrip1.SuspendLayout();
 			this.tabControl1.SuspendLayout();
@@ -286,8 +289,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvTotal.AllowUserToDeleteRows = false;
 			this.dgvTotal.AllowUserToModifyRows = true;
 			this.dgvTotal.AllowUserToOrderColumns = true;
-			dataGridViewCellStyle47.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-			this.dgvTotal.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle47;
+			dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvTotal.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
 			this.dgvTotal.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
 			this.dgvTotal.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
 			this.dgvTotal.CellHeight = 23;
@@ -295,14 +298,14 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvTotal.ChildNodeColumnText = null;
 			this.dgvTotal.ColumnDeep = 1;
 			this.dgvTotal.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-			dataGridViewCellStyle48.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle48.ForeColor = System.Drawing.Color.White;
-			dataGridViewCellStyle48.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle48.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.dgvTotal.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle48;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvTotal.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
 			this.dgvTotal.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
 			this.dgvTotal.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.DATACODETOTAL,
@@ -312,7 +315,10 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.Column3,
             this.Column5,
             this.Column6,
-            this.Column7});
+            this.Column7,
+            this.DRJJBQTRCXDCCP,
+            this.DRCXFDRJJDCCP,
+            this.DIFFER});
 			this.dgvTotal.ColumnTreeView = new System.Windows.Forms.TreeView[0];
 			this.dgvTotal.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvTotal.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -336,8 +342,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvTotal.RefreshAtHscroll = false;
 			this.dgvTotal.RowHeadersWidth = 50;
 			this.dgvTotal.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle49.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgvTotal.RowsDefaultCellStyle = dataGridViewCellStyle49;
+			dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvTotal.RowsDefaultCellStyle = dataGridViewCellStyle3;
 			this.dgvTotal.RowTemplate.Height = 21;
 			this.dgvTotal.Size = new System.Drawing.Size(648, 235);
 			this.dgvTotal.SortOrderColumnName = null;
@@ -346,62 +352,6 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvTotal.TotalSumColumns = null;
 			this.dgvTotal.ViewRowFilter = "";
 			// 
-			// DATACODETOTAL
-			// 
-			this.DATACODETOTAL.DataPropertyName = "DATACODE";
-			this.DATACODETOTAL.HeaderText = "数据节点";
-			this.DATACODETOTAL.Name = "DATACODETOTAL";
-			this.DATACODETOTAL.ReadOnly = true;
-			// 
-			// Column1
-			// 
-			this.Column1.DataPropertyName = "Actualoutput";
-			this.Column1.HeaderText = "实际产量";
-			this.Column1.Name = "Column1";
-			this.Column1.ReadOnly = true;
-			// 
-			// Column4
-			// 
-			this.Column4.DataPropertyName = "DATACODETD";
-			this.Column4.HeaderText = "数据节点";
-			this.Column4.Name = "Column4";
-			this.Column4.ReadOnly = true;
-			// 
-			// Column2
-			// 
-			this.Column2.DataPropertyName = "OUTPUT";
-			this.Column2.HeaderText = "产量";
-			this.Column2.Name = "Column2";
-			this.Column2.ReadOnly = true;
-			// 
-			// Column3
-			// 
-			this.Column3.DataPropertyName = "scrapnum";
-			this.Column3.HeaderText = "损坯";
-			this.Column3.Name = "Column3";
-			this.Column3.ReadOnly = true;
-			// 
-			// Column5
-			// 
-			this.Column5.DataPropertyName = "cleannupnum";
-			this.Column5.HeaderText = "清理";
-			this.Column5.Name = "Column5";
-			this.Column5.ReadOnly = true;
-			// 
-			// Column6
-			// 
-			this.Column6.DataPropertyName = "recoverynum";
-			this.Column6.HeaderText = "回收";
-			this.Column6.Name = "Column6";
-			this.Column6.ReadOnly = true;
-			// 
-			// Column7
-			// 
-			this.Column7.DataPropertyName = "repairnum";
-			this.Column7.HeaderText = "干补";
-			this.Column7.Name = "Column7";
-			this.Column7.ReadOnly = true;
-			// 
 			// tabPage1
 			// 
 			this.tabPage1.Controls.Add(this.dgvLog);
@@ -418,8 +368,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvLog.AllowUserToDeleteRows = false;
 			this.dgvLog.AllowUserToModifyRows = true;
 			this.dgvLog.AllowUserToOrderColumns = true;
-			dataGridViewCellStyle50.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-			this.dgvLog.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle50;
+			dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvLog.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
 			this.dgvLog.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
 			this.dgvLog.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
 			this.dgvLog.CellHeight = 23;
@@ -427,14 +377,14 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvLog.ChildNodeColumnText = null;
 			this.dgvLog.ColumnDeep = 1;
 			this.dgvLog.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle51.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-			dataGridViewCellStyle51.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle51.ForeColor = System.Drawing.Color.White;
-			dataGridViewCellStyle51.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle51.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.dgvLog.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle51;
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvLog.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
 			this.dgvLog.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
 			this.dgvLog.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.logdate,
@@ -474,8 +424,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvLog.RefreshAtHscroll = false;
 			this.dgvLog.RowHeadersWidth = 50;
 			this.dgvLog.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle58.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgvLog.RowsDefaultCellStyle = dataGridViewCellStyle58;
+			dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvLog.RowsDefaultCellStyle = dataGridViewCellStyle12;
 			this.dgvLog.RowTemplate.Height = 21;
 			this.dgvLog.Size = new System.Drawing.Size(648, 235);
 			this.dgvLog.SortOrderColumnName = null;
@@ -488,8 +438,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// logdate
 			// 
 			this.logdate.DataPropertyName = "yyyymmdd";
-			dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			this.logdate.DefaultCellStyle = dataGridViewCellStyle52;
+			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.logdate.DefaultCellStyle = dataGridViewCellStyle6;
 			this.logdate.HeaderText = "同步日期";
 			this.logdate.Name = "logdate";
 			this.logdate.ReadOnly = true;
@@ -497,9 +447,9 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// BeginTime
 			// 
 			this.BeginTime.DataPropertyName = "BeginTime";
-			dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle53.Format = "yyyy-MM-dd HH:mm:ss";
-			this.BeginTime.DefaultCellStyle = dataGridViewCellStyle53;
+			dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle7.Format = "yyyy-MM-dd HH:mm:ss";
+			this.BeginTime.DefaultCellStyle = dataGridViewCellStyle7;
 			this.BeginTime.HeaderText = "开始时间";
 			this.BeginTime.Name = "BeginTime";
 			this.BeginTime.ReadOnly = true;
@@ -507,9 +457,9 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// EndTime
 			// 
 			this.EndTime.DataPropertyName = "EndTime";
-			dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle54.Format = "yyyy-MM-dd HH:mm:ss";
-			this.EndTime.DefaultCellStyle = dataGridViewCellStyle54;
+			dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle8.Format = "yyyy-MM-dd HH:mm:ss";
+			this.EndTime.DefaultCellStyle = dataGridViewCellStyle8;
 			this.EndTime.HeaderText = "完成时间";
 			this.EndTime.Name = "EndTime";
 			this.EndTime.ReadOnly = true;
@@ -524,8 +474,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// DataStuts
 			// 
 			this.DataStuts.DataPropertyName = "DataStuts";
-			dataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			this.DataStuts.DefaultCellStyle = dataGridViewCellStyle55;
+			dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.DataStuts.DefaultCellStyle = dataGridViewCellStyle9;
 			this.DataStuts.HeaderText = "同步状态";
 			this.DataStuts.Name = "DataStuts";
 			this.DataStuts.ReadOnly = true;
@@ -571,10 +521,10 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// ExecuteDateBegin
 			// 
 			this.ExecuteDateBegin.DataPropertyName = "ExecuteDateBegin";
-			dataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle56.Format = "yyyy-MM-dd HH:mm:ss";
-			dataGridViewCellStyle56.NullValue = null;
-			this.ExecuteDateBegin.DefaultCellStyle = dataGridViewCellStyle56;
+			dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle10.Format = "yyyy-MM-dd HH:mm:ss";
+			dataGridViewCellStyle10.NullValue = null;
+			this.ExecuteDateBegin.DefaultCellStyle = dataGridViewCellStyle10;
 			this.ExecuteDateBegin.HeaderText = "业务数据开始时间";
 			this.ExecuteDateBegin.Name = "ExecuteDateBegin";
 			this.ExecuteDateBegin.ReadOnly = true;
@@ -583,9 +533,9 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// ExecuteDateEnd
 			// 
 			this.ExecuteDateEnd.DataPropertyName = "ExecuteDateEnd";
-			dataGridViewCellStyle57.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle57.Format = "yyyy-MM-dd HH:mm:ss";
-			this.ExecuteDateEnd.DefaultCellStyle = dataGridViewCellStyle57;
+			dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle11.Format = "yyyy-MM-dd HH:mm:ss";
+			this.ExecuteDateEnd.DefaultCellStyle = dataGridViewCellStyle11;
 			this.ExecuteDateEnd.HeaderText = "业务数据结束时间";
 			this.ExecuteDateEnd.Name = "ExecuteDateEnd";
 			this.ExecuteDateEnd.ReadOnly = true;
@@ -607,8 +557,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvSum.AllowUserToDeleteRows = false;
 			this.dgvSum.AllowUserToModifyRows = true;
 			this.dgvSum.AllowUserToOrderColumns = true;
-			dataGridViewCellStyle59.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-			this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle59;
+			dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13;
 			this.dgvSum.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
 			this.dgvSum.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
 			this.dgvSum.CellHeight = 23;
@@ -616,14 +566,14 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvSum.ChildNodeColumnText = null;
 			this.dgvSum.ColumnDeep = 1;
 			this.dgvSum.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			dataGridViewCellStyle60.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle60.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-			dataGridViewCellStyle60.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle60.ForeColor = System.Drawing.Color.White;
-			dataGridViewCellStyle60.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle60.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle60.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle60;
+			dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
 			this.dgvSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
 			this.dgvSum.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.yyyymmdd,
@@ -667,8 +617,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvSum.RefreshAtHscroll = false;
 			this.dgvSum.RowHeadersWidth = 50;
 			this.dgvSum.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle69.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle69;
+			dataGridViewCellStyle23.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle23;
 			this.dgvSum.RowTemplate.Height = 21;
 			this.dgvSum.Size = new System.Drawing.Size(648, 235);
 			this.dgvSum.SortOrderColumnName = null;
@@ -680,8 +630,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// yyyymmdd
 			// 
 			this.yyyymmdd.DataPropertyName = "yyyymmdd";
-			dataGridViewCellStyle61.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			this.yyyymmdd.DefaultCellStyle = dataGridViewCellStyle61;
+			dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.yyyymmdd.DefaultCellStyle = dataGridViewCellStyle15;
 			this.yyyymmdd.HeaderText = "同步日期";
 			this.yyyymmdd.Name = "yyyymmdd";
 			this.yyyymmdd.ReadOnly = true;
@@ -731,8 +681,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// outputnum
 			// 
 			this.outputnum.DataPropertyName = "outputnum";
-			dataGridViewCellStyle62.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.outputnum.DefaultCellStyle = dataGridViewCellStyle62;
+			dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.outputnum.DefaultCellStyle = dataGridViewCellStyle16;
 			this.outputnum.HeaderText = "产量";
 			this.outputnum.Name = "outputnum";
 			this.outputnum.ReadOnly = true;
@@ -740,8 +690,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// ScrapNum
 			// 
 			this.ScrapNum.DataPropertyName = "ScrapNum";
-			dataGridViewCellStyle63.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.ScrapNum.DefaultCellStyle = dataGridViewCellStyle63;
+			dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.ScrapNum.DefaultCellStyle = dataGridViewCellStyle17;
 			this.ScrapNum.HeaderText = "损坯";
 			this.ScrapNum.Name = "ScrapNum";
 			this.ScrapNum.ReadOnly = true;
@@ -749,8 +699,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// CleanupNum
 			// 
 			this.CleanupNum.DataPropertyName = "CleanupNum";
-			dataGridViewCellStyle64.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.CleanupNum.DefaultCellStyle = dataGridViewCellStyle64;
+			dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.CleanupNum.DefaultCellStyle = dataGridViewCellStyle18;
 			this.CleanupNum.HeaderText = "清除";
 			this.CleanupNum.Name = "CleanupNum";
 			this.CleanupNum.ReadOnly = true;
@@ -758,8 +708,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// recoverynum
 			// 
 			this.recoverynum.DataPropertyName = "recoverynum";
-			dataGridViewCellStyle65.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.recoverynum.DefaultCellStyle = dataGridViewCellStyle65;
+			dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.recoverynum.DefaultCellStyle = dataGridViewCellStyle19;
 			this.recoverynum.HeaderText = "回收";
 			this.recoverynum.Name = "recoverynum";
 			this.recoverynum.ReadOnly = true;
@@ -767,8 +717,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// RepairNum
 			// 
 			this.RepairNum.DataPropertyName = "RepairNum";
-			dataGridViewCellStyle66.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.RepairNum.DefaultCellStyle = dataGridViewCellStyle66;
+			dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.RepairNum.DefaultCellStyle = dataGridViewCellStyle20;
 			this.RepairNum.HeaderText = "干补";
 			this.RepairNum.Name = "RepairNum";
 			this.RepairNum.ReadOnly = true;
@@ -786,8 +736,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// ztype
 			// 
 			this.ztype.DataPropertyName = "ztype";
-			dataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			this.ztype.DefaultCellStyle = dataGridViewCellStyle67;
+			dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.ztype.DefaultCellStyle = dataGridViewCellStyle21;
 			this.ztype.HeaderText = "同步状态";
 			this.ztype.Name = "ztype";
 			this.ztype.ReadOnly = true;
@@ -804,14 +754,93 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			// ZTIME
 			// 
 			this.ZTIME.DataPropertyName = "ZTIME";
-			dataGridViewCellStyle68.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle68.Format = "yyyy-MM-dd HH:mm:ss";
-			this.ZTIME.DefaultCellStyle = dataGridViewCellStyle68;
+			dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle22.Format = "yyyy-MM-dd HH:mm:ss";
+			this.ZTIME.DefaultCellStyle = dataGridViewCellStyle22;
 			this.ZTIME.HeaderText = "同步时间";
 			this.ZTIME.Name = "ZTIME";
 			this.ZTIME.ReadOnly = true;
 			this.ZTIME.Visible = false;
 			// 
+			// DATACODETOTAL
+			// 
+			this.DATACODETOTAL.DataPropertyName = "DATACODE";
+			this.DATACODETOTAL.HeaderText = "数据节点";
+			this.DATACODETOTAL.Name = "DATACODETOTAL";
+			this.DATACODETOTAL.ReadOnly = true;
+			// 
+			// Column1
+			// 
+			this.Column1.DataPropertyName = "Actualoutput";
+			this.Column1.HeaderText = "实际产量";
+			this.Column1.Name = "Column1";
+			this.Column1.ReadOnly = true;
+			// 
+			// Column4
+			// 
+			this.Column4.DataPropertyName = "DATACODETD";
+			this.Column4.HeaderText = "数据节点";
+			this.Column4.Name = "Column4";
+			this.Column4.ReadOnly = true;
+			// 
+			// Column2
+			// 
+			this.Column2.DataPropertyName = "OUTPUT";
+			this.Column2.HeaderText = "产量";
+			this.Column2.Name = "Column2";
+			this.Column2.ReadOnly = true;
+			// 
+			// Column3
+			// 
+			this.Column3.DataPropertyName = "scrapnum";
+			this.Column3.HeaderText = "损坯";
+			this.Column3.Name = "Column3";
+			this.Column3.ReadOnly = true;
+			// 
+			// Column5
+			// 
+			this.Column5.DataPropertyName = "cleannupnum";
+			this.Column5.HeaderText = "清理";
+			this.Column5.Name = "Column5";
+			this.Column5.ReadOnly = true;
+			// 
+			// Column6
+			// 
+			this.Column6.DataPropertyName = "recoverynum";
+			this.Column6.HeaderText = "回收";
+			this.Column6.Name = "Column6";
+			this.Column6.ReadOnly = true;
+			// 
+			// Column7
+			// 
+			this.Column7.DataPropertyName = "repairnum";
+			this.Column7.HeaderText = "干补";
+			this.Column7.Name = "Column7";
+			this.Column7.ReadOnly = true;
+			// 
+			// DRJJBQTRCXDCCP
+			// 
+			this.DRJJBQTRCXDCCP.DataPropertyName = "DRJJBQTRCXDCCP";
+			this.DRJJBQTRCXDCCP.HeaderText = "当日交接被其它日撤销的产成品";
+			this.DRJJBQTRCXDCCP.Name = "DRJJBQTRCXDCCP";
+			this.DRJJBQTRCXDCCP.ReadOnly = true;
+			this.DRJJBQTRCXDCCP.Width = 180;
+			// 
+			// DRCXFDRJJDCCP
+			// 
+			this.DRCXFDRJJDCCP.DataPropertyName = "DRCXFDRJJDCCP";
+			this.DRCXFDRJJDCCP.HeaderText = "当日撤销非当日交接的产成品";
+			this.DRCXFDRJJDCCP.Name = "DRCXFDRJJDCCP";
+			this.DRCXFDRJJDCCP.ReadOnly = true;
+			this.DRCXFDRJJDCCP.Width = 180;
+			// 
+			// DIFFER
+			// 
+			this.DIFFER.DataPropertyName = "DIFFER";
+			this.DIFFER.HeaderText = "差异";
+			this.DIFFER.Name = "DIFFER";
+			this.DIFFER.ReadOnly = true;
+			// 
 			// F_SAP_HEGII_0107
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -887,6 +916,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 		private Basics.BaseControls.C_DateTimePicker dtpDatebegin;
 		private WinForm.Controls.LblLabel lblLabel2;
 		private Basics.BaseControls.C_DateTimePicker dtpDateend;
+		private WinForm.Controls.LblLabel lblLabel3;
+		private Basics.BaseControls.C_ComboBox CBDataCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn DATACODETOTAL;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
@@ -895,7 +926,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 		private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
-		private WinForm.Controls.LblLabel lblLabel3;
-		private Basics.BaseControls.C_ComboBox CBDataCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn DRJJBQTRCXDCCP;
+		private System.Windows.Forms.DataGridViewTextBoxColumn DRCXFDRJJDCCP;
+		private System.Windows.Forms.DataGridViewTextBoxColumn DIFFER;
 	}
 }

DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0107.cs

@@ -88,8 +88,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			dgvLog.AutoGenerateColumns = false;
 
 			//update xiacm 2022-10-12
-			this.dtpDatebegin.Value = DateTime.Now.Date;
-			this.dtpDateend.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1);
+			this.dtpDatebegin.Value = DateTime.Now.Date.AddDays(-1);
+			this.dtpDateend.Value = DateTime.Now.Date.AddMilliseconds(-1);
 
 			//数据节点数据绑定 add xiacm 2022-10-12
 			DataTable DataCodeDt = new DataTable();
@@ -140,6 +140,7 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			{
 				//this.dgvLog.DataSource = null;
 				this.QueryDataFromOther();
+				tsbtnAdaptive_Click(null, null);
 			}
 			catch (Exception ex)
 			{
@@ -157,8 +158,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 		private void tsbtnClearCondition_Click(object sender, EventArgs e)
 		{
 			//update xiacm 2022-10-12
-			this.dtpDatebegin.Value = DateTime.Now.Date;
-			this.dtpDateend.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1);
+			this.dtpDatebegin.Value = DateTime.Now.Date.AddDays(-1);
+			this.dtpDateend.Value = DateTime.Now.Date.AddMilliseconds(-1);
 			this.CBDataCode.SelectedValue = "-1";
 		}
 

DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0107.resx

@@ -144,6 +144,15 @@
   <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="DRJJBQTRCXDCCP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DRCXFDRJJDCCP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DIFFER.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="logdate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/WMSDataService/WMSDataLogic.cs

@@ -664,7 +664,15 @@ namespace Dongke.IBOSS.PRD.Service.WMSDataService
                     sqlString = @"
                     SELECT T1.DATACODE,
                            T1.ACTUALOUTPUT,
-                           T2.*
+                           T2.OUTPUT,
+                           T2.SCRAPNUM,
+                           T2.CLEANNUPNUM,
+                           T2.RECOVERYNUM,
+                           T2.REPAIRNUM,
+                           T3.DRCXFDRJJDCCP,
+                           T4.DRJJBQTRCXDCCP,
+                           T1.ACTUALOUTPUT + NVL(T4.DRJJBQTRCXDCCP, 0) - NVL(T3.DRCXFDRJJDCCP, 0) -
+                           (T2.OUTPUT + T2.RECOVERYNUM) AS DIFFER
                       FROM (
                             -- 业务数据汇总
                             -- 10
@@ -772,6 +780,34 @@ namespace Dongke.IBOSS.PRD.Service.WMSDataService
                                   GROUP BY DATACODE
                                   ORDER BY DATACODE) T2
                         ON T2.DATACODETD = T1.DATACODE
+                         LEFT JOIN (
+                                                     -- 当日撤销非当日交接的产成品
+                                                     SELECT '60' AS DATACODE,
+                                                             COUNT(WL.CODEI) AS DRCXFDRJJDCCP
+                                                       FROM TP_WMS_LOG WL
+                                                      WHERE LOGTYPE = 2
+                                                        AND EXISTS (SELECT 1
+                                                               FROM TP_WMS_LOG WL1
+                                                              WHERE WL1.CODEI = WL.CODEI
+                                                                AND WL1.LOGTYPE = 1
+                                                                AND TRUNC(WL1.CREATETIME) < TRUNC(WL.CREATETIME))
+                                                        AND WL.CREATETIME >= :DATEBEGIN
+                                                        AND WL.CREATETIME < :DATEEND) T3
+                                            ON T3.DATACODE = T1.DATACODE
+                                          LEFT JOIN (
+                                                     -- 当日交接被其他日撤销的产成品
+                                                     SELECT '60' AS DATACODE,
+                                                             COUNT(WL.CODEI) AS DRJJBQTRCXDCCP
+                                                       FROM TP_WMS_LOG WL
+                                                      WHERE LOGTYPE = 1
+                                                        AND EXISTS (SELECT 1
+                                                               FROM TP_WMS_LOG WL1
+                                                              WHERE WL1.CODEI = WL.CODEI
+                                                                AND WL1.LOGTYPE = 2
+                                                                AND TRUNC(WL1.CREATETIME) > TRUNC(WL.CREATETIME))
+                                                        AND WL.CREATETIME >= :DATEBEGIN
+                                                        AND WL.CREATETIME < :DATEEND) T4
+                                            ON T4.DATACODE = T1.DATACODE
                      WHERE (-1 = :DATACODE OR T1.DATACODE = :DATACODE)
                      ORDER BY T1.DATACODE ";
                 }
@@ -782,7 +818,15 @@ namespace Dongke.IBOSS.PRD.Service.WMSDataService
                     sqlString = @"
                     SELECT T1.DATACODE,
                            T1.ACTUALOUTPUT,
-                           T2.*
+                           T2.OUTPUT,
+                           T2.SCRAPNUM,
+                           T2.CLEANNUPNUM,
+                           T2.RECOVERYNUM,
+                           T2.REPAIRNUM,
+                           T3.DRCXFDRJJDCCP,
+                           T4.DRJJBQTRCXDCCP,
+                           T1.ACTUALOUTPUT + NVL(T4.DRJJBQTRCXDCCP, 0) - NVL(T3.DRCXFDRJJDCCP, 0) -
+                           (T2.OUTPUT + T2.RECOVERYNUM) AS DIFFER
                       FROM (
                             -- 业务数据汇总
                             -- 10
@@ -890,6 +934,34 @@ namespace Dongke.IBOSS.PRD.Service.WMSDataService
                                   GROUP BY DATACODE
                                   ORDER BY DATACODE) T2
                         ON T2.DATACODETD = T1.DATACODE
+                      LEFT JOIN (
+                             -- 当日撤销非当日交接的产成品
+                             SELECT '60' AS DATACODE,
+                                     COUNT(WL.CODEI) AS DRCXFDRJJDCCP
+                               FROM TP_WMS_LOG WL
+                              WHERE LOGTYPE = 2
+                                AND EXISTS (SELECT 1
+                                       FROM TP_WMS_LOG WL1
+                                      WHERE WL1.CODEI = WL.CODEI
+                                        AND WL1.LOGTYPE = 1
+                                        AND TRUNC(WL1.CREATETIME) < TRUNC(WL.CREATETIME))
+                                AND WL.CREATETIME >= :DATEBEGIN
+                                AND WL.CREATETIME < :DATEEND) T3
+                    ON T3.DATACODE = T1.DATACODE
+                  LEFT JOIN (
+                             -- 当日交接被其他日撤销的产成品
+                             SELECT '60' AS DATACODE,
+                                     COUNT(WL.CODEI) AS DRJJBQTRCXDCCP
+                               FROM TP_WMS_LOG WL
+                              WHERE LOGTYPE = 1
+                                AND EXISTS (SELECT 1
+                                       FROM TP_WMS_LOG WL1
+                                      WHERE WL1.CODEI = WL.CODEI
+                                        AND WL1.LOGTYPE = 2
+                                        AND TRUNC(WL1.CREATETIME) > TRUNC(WL.CREATETIME))
+                                AND WL.CREATETIME >= :DATEBEGIN
+                                AND WL.CREATETIME < :DATEEND) T4
+                    ON T4.DATACODE = T1.DATACODE
                      WHERE (-1 = :DATACODE OR T1.DATACODE = :DATACODE)
                      ORDER BY T1.DATACODE ";
                 }

WCF.Service/WCF.Hosting/Config.ini

@@ -3,13 +3,13 @@ ServiceName=
 Description=
 
 [DBSetting]
-DBIP=172.19.22.131
-#DBIP=172.19.22.61
+#DBIP=172.19.22.131
+DBIP=172.19.22.61
 DBPort=1521
-SID=hgcz3
-DBUser=hgcz3
-#SID=hgcz1
-#DBUser=hgcz1
+#SID=hgcz3
+#DBUser=hgcz3
+SID=hgcz2
+DBUser=hgcz2
 DBPassword=etLHPkLTOLw=
 
 [WCFSetting]

WCF.Service/WCF.Hosting/SAP_HEGII.ini

@@ -44,7 +44,7 @@ Url030=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM030
 Url033=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM033
 Url034=http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM034
 UserName=hgsapdk:Sapdk#240
-Factory=5310
+Factory=5320
 
 
 #Url030=http://hgs4powd1.hegii.com:8000/RESTAdapter/DKMES/ZPPFM030