1.报工同步日志增加车间汇总2.范湖裸瓷包装SKCK11和SKCK12

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

@@ -35,6 +35,12 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			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();
@@ -46,12 +52,6 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			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();
-			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();
 			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,18 +68,21 @@ 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.Actualoutput = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.OUTPUT = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.scrapnum1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.cleannupnum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.recoverynum1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.repairnum1 = 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.tabPage1 = new System.Windows.Forms.TabPage();
 			this.dgvLog = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.logdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.BeginTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.EndTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DataCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DataStuts = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DataMSG = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.synusercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.logid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.datalogid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DataCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ExecuteDateBegin = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ExecuteDateEnd = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tabPage2 = new System.Windows.Forms.TabPage();
 			this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.yyyymmdd = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -98,19 +101,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.logdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.BeginTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.EndTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.DataCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.DataStuts = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.DataMSG = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.synusercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.logid = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.datalogid = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.DataCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ExecuteDateBegin = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ExecuteDateEnd = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DATACODETOTAL = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Actualoutput = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.WORKSHOP = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.OUTPUT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.scrapnum1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.cleannupnum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.recoverynum1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.repairnum1 = 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();
@@ -310,6 +311,7 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvTotal.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.DATACODETOTAL,
             this.Actualoutput,
+            this.WORKSHOP,
             this.OUTPUT,
             this.scrapnum1,
             this.cleannupnum,
@@ -354,78 +356,6 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvTotal.ViewRowFilter = "";
 			this.dgvTotal.VirtualNodes = false;
 			// 
-			// DATACODETOTAL
-			// 
-			this.DATACODETOTAL.DataPropertyName = "DATACODE";
-			this.DATACODETOTAL.HeaderText = "数据节点";
-			this.DATACODETOTAL.Name = "DATACODETOTAL";
-			this.DATACODETOTAL.ReadOnly = true;
-			// 
-			// Actualoutput
-			// 
-			this.Actualoutput.DataPropertyName = "Actualoutput";
-			this.Actualoutput.HeaderText = "实际产量";
-			this.Actualoutput.Name = "Actualoutput";
-			this.Actualoutput.ReadOnly = true;
-			// 
-			// OUTPUT
-			// 
-			this.OUTPUT.DataPropertyName = "OUTPUT";
-			this.OUTPUT.HeaderText = "产量";
-			this.OUTPUT.Name = "OUTPUT";
-			this.OUTPUT.ReadOnly = true;
-			// 
-			// scrapnum1
-			// 
-			this.scrapnum1.DataPropertyName = "scrapnum";
-			this.scrapnum1.HeaderText = "损坯";
-			this.scrapnum1.Name = "scrapnum1";
-			this.scrapnum1.ReadOnly = true;
-			// 
-			// cleannupnum
-			// 
-			this.cleannupnum.DataPropertyName = "cleannupnum";
-			this.cleannupnum.HeaderText = "清理";
-			this.cleannupnum.Name = "cleannupnum";
-			this.cleannupnum.ReadOnly = true;
-			// 
-			// recoverynum1
-			// 
-			this.recoverynum1.DataPropertyName = "recoverynum";
-			this.recoverynum1.HeaderText = "回收";
-			this.recoverynum1.Name = "recoverynum1";
-			this.recoverynum1.ReadOnly = true;
-			// 
-			// repairnum1
-			// 
-			this.repairnum1.DataPropertyName = "repairnum";
-			this.repairnum1.HeaderText = "干补";
-			this.repairnum1.Name = "repairnum1";
-			this.repairnum1.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;
-			// 
 			// tabPage1
 			// 
 			this.tabPage1.Controls.Add(this.dgvLog);
@@ -512,6 +442,119 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.dgvLog.VirtualNodes = false;
 			this.dgvLog.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvLog_CellDoubleClick);
 			// 
+			// logdate
+			// 
+			this.logdate.DataPropertyName = "yyyymmdd";
+			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.logdate.DefaultCellStyle = dataGridViewCellStyle6;
+			this.logdate.HeaderText = "同步日期";
+			this.logdate.Name = "logdate";
+			this.logdate.ReadOnly = true;
+			// 
+			// BeginTime
+			// 
+			this.BeginTime.DataPropertyName = "BeginTime";
+			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;
+			// 
+			// EndTime
+			// 
+			this.EndTime.DataPropertyName = "EndTime";
+			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;
+			// 
+			// DataCodeName
+			// 
+			this.DataCodeName.DataPropertyName = "DataCodeName";
+			this.DataCodeName.HeaderText = "数据节点";
+			this.DataCodeName.Name = "DataCodeName";
+			this.DataCodeName.ReadOnly = true;
+			// 
+			// DataStuts
+			// 
+			this.DataStuts.DataPropertyName = "DataStuts";
+			dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.DataStuts.DefaultCellStyle = dataGridViewCellStyle9;
+			this.DataStuts.HeaderText = "同步状态";
+			this.DataStuts.Name = "DataStuts";
+			this.DataStuts.ReadOnly = true;
+			// 
+			// DataMSG
+			// 
+			this.DataMSG.DataPropertyName = "DataMSG";
+			this.DataMSG.HeaderText = "同步消息";
+			this.DataMSG.Name = "DataMSG";
+			this.DataMSG.ReadOnly = true;
+			// 
+			// synusercode
+			// 
+			this.synusercode.DataPropertyName = "synusercode";
+			this.synusercode.HeaderText = "同步工号";
+			this.synusercode.Name = "synusercode";
+			this.synusercode.ReadOnly = true;
+			// 
+			// logid
+			// 
+			this.logid.DataPropertyName = "logid";
+			this.logid.HeaderText = "logid";
+			this.logid.Name = "logid";
+			this.logid.ReadOnly = true;
+			this.logid.Visible = false;
+			// 
+			// datalogid
+			// 
+			this.datalogid.DataPropertyName = "datalogid";
+			this.datalogid.HeaderText = "datalogid";
+			this.datalogid.Name = "datalogid";
+			this.datalogid.ReadOnly = true;
+			this.datalogid.Visible = false;
+			// 
+			// DataCode
+			// 
+			this.DataCode.DataPropertyName = "DataCode";
+			this.DataCode.HeaderText = "DataCode";
+			this.DataCode.Name = "DataCode";
+			this.DataCode.ReadOnly = true;
+			this.DataCode.Visible = false;
+			// 
+			// ExecuteDateBegin
+			// 
+			this.ExecuteDateBegin.DataPropertyName = "ExecuteDateBegin";
+			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;
+			this.ExecuteDateBegin.Width = 120;
+			// 
+			// ExecuteDateEnd
+			// 
+			this.ExecuteDateEnd.DataPropertyName = "ExecuteDateEnd";
+			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;
+			this.ExecuteDateEnd.Width = 120;
+			// 
+			// Remarks
+			// 
+			this.Remarks.DataPropertyName = "Remarks";
+			this.Remarks.HeaderText = "备注";
+			this.Remarks.Name = "Remarks";
+			this.Remarks.ReadOnly = true;
+			// 
 			// tabPage2
 			// 
 			this.tabPage2.Controls.Add(this.dgvSum);
@@ -735,118 +778,84 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 			this.ZTIME.ReadOnly = true;
 			this.ZTIME.Visible = false;
 			// 
-			// logdate
-			// 
-			this.logdate.DataPropertyName = "yyyymmdd";
-			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			this.logdate.DefaultCellStyle = dataGridViewCellStyle6;
-			this.logdate.HeaderText = "同步日期";
-			this.logdate.Name = "logdate";
-			this.logdate.ReadOnly = true;
-			// 
-			// BeginTime
-			// 
-			this.BeginTime.DataPropertyName = "BeginTime";
-			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;
+			// DATACODETOTAL
 			// 
-			// EndTime
+			this.DATACODETOTAL.DataPropertyName = "DATACODE";
+			this.DATACODETOTAL.HeaderText = "数据节点";
+			this.DATACODETOTAL.Name = "DATACODETOTAL";
+			this.DATACODETOTAL.ReadOnly = true;
 			// 
-			this.EndTime.DataPropertyName = "EndTime";
-			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;
+			// Actualoutput
 			// 
-			// DataCodeName
+			this.Actualoutput.DataPropertyName = "Actualoutput";
+			this.Actualoutput.HeaderText = "实际产量";
+			this.Actualoutput.Name = "Actualoutput";
+			this.Actualoutput.ReadOnly = true;
 			// 
-			this.DataCodeName.DataPropertyName = "DataCodeName";
-			this.DataCodeName.HeaderText = "数据节点";
-			this.DataCodeName.Name = "DataCodeName";
-			this.DataCodeName.ReadOnly = true;
+			// WORKSHOP
 			// 
-			// DataStuts
+			this.WORKSHOP.DataPropertyName = "WORKSHOP";
+			this.WORKSHOP.HeaderText = "车间";
+			this.WORKSHOP.Name = "WORKSHOP";
+			this.WORKSHOP.ReadOnly = true;
 			// 
-			this.DataStuts.DataPropertyName = "DataStuts";
-			dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			this.DataStuts.DefaultCellStyle = dataGridViewCellStyle9;
-			this.DataStuts.HeaderText = "同步状态";
-			this.DataStuts.Name = "DataStuts";
-			this.DataStuts.ReadOnly = true;
-			// 
-			// DataMSG
+			// OUTPUT
 			// 
-			this.DataMSG.DataPropertyName = "DataMSG";
-			this.DataMSG.HeaderText = "同步消息";
-			this.DataMSG.Name = "DataMSG";
-			this.DataMSG.ReadOnly = true;
+			this.OUTPUT.DataPropertyName = "OUTPUT";
+			this.OUTPUT.HeaderText = "产量";
+			this.OUTPUT.Name = "OUTPUT";
+			this.OUTPUT.ReadOnly = true;
 			// 
-			// synusercode
+			// scrapnum1
 			// 
-			this.synusercode.DataPropertyName = "synusercode";
-			this.synusercode.HeaderText = "同步工号";
-			this.synusercode.Name = "synusercode";
-			this.synusercode.ReadOnly = true;
+			this.scrapnum1.DataPropertyName = "scrapnum";
+			this.scrapnum1.HeaderText = "损坯";
+			this.scrapnum1.Name = "scrapnum1";
+			this.scrapnum1.ReadOnly = true;
 			// 
-			// logid
+			// cleannupnum
 			// 
-			this.logid.DataPropertyName = "logid";
-			this.logid.HeaderText = "logid";
-			this.logid.Name = "logid";
-			this.logid.ReadOnly = true;
-			this.logid.Visible = false;
+			this.cleannupnum.DataPropertyName = "cleannupnum";
+			this.cleannupnum.HeaderText = "清理";
+			this.cleannupnum.Name = "cleannupnum";
+			this.cleannupnum.ReadOnly = true;
 			// 
-			// datalogid
+			// recoverynum1
 			// 
-			this.datalogid.DataPropertyName = "datalogid";
-			this.datalogid.HeaderText = "datalogid";
-			this.datalogid.Name = "datalogid";
-			this.datalogid.ReadOnly = true;
-			this.datalogid.Visible = false;
+			this.recoverynum1.DataPropertyName = "recoverynum";
+			this.recoverynum1.HeaderText = "回收";
+			this.recoverynum1.Name = "recoverynum1";
+			this.recoverynum1.ReadOnly = true;
 			// 
-			// DataCode
+			// repairnum1
 			// 
-			this.DataCode.DataPropertyName = "DataCode";
-			this.DataCode.HeaderText = "DataCode";
-			this.DataCode.Name = "DataCode";
-			this.DataCode.ReadOnly = true;
-			this.DataCode.Visible = false;
+			this.repairnum1.DataPropertyName = "repairnum";
+			this.repairnum1.HeaderText = "干补";
+			this.repairnum1.Name = "repairnum1";
+			this.repairnum1.ReadOnly = true;
 			// 
-			// ExecuteDateBegin
+			// DRJJBQTRCXDCCP
 			// 
-			this.ExecuteDateBegin.DataPropertyName = "ExecuteDateBegin";
-			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;
-			this.ExecuteDateBegin.Width = 120;
+			this.DRJJBQTRCXDCCP.DataPropertyName = "DRJJBQTRCXDCCP";
+			this.DRJJBQTRCXDCCP.HeaderText = "当日交接被其它日撤销的产成品";
+			this.DRJJBQTRCXDCCP.Name = "DRJJBQTRCXDCCP";
+			this.DRJJBQTRCXDCCP.ReadOnly = true;
+			this.DRJJBQTRCXDCCP.Width = 180;
 			// 
-			// ExecuteDateEnd
+			// DRCXFDRJJDCCP
 			// 
-			this.ExecuteDateEnd.DataPropertyName = "ExecuteDateEnd";
-			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;
-			this.ExecuteDateEnd.Width = 120;
+			this.DRCXFDRJJDCCP.DataPropertyName = "DRCXFDRJJDCCP";
+			this.DRCXFDRJJDCCP.HeaderText = "当日撤销非当日交接的产成品";
+			this.DRCXFDRJJDCCP.Name = "DRCXFDRJJDCCP";
+			this.DRCXFDRJJDCCP.ReadOnly = true;
+			this.DRCXFDRJJDCCP.Width = 180;
 			// 
-			// Remarks
+			// DIFFER
 			// 
-			this.Remarks.DataPropertyName = "Remarks";
-			this.Remarks.HeaderText = "备注";
-			this.Remarks.Name = "Remarks";
-			this.Remarks.ReadOnly = true;
+			this.DIFFER.DataPropertyName = "DIFFER";
+			this.DIFFER.HeaderText = "差异";
+			this.DIFFER.Name = "DIFFER";
+			this.DIFFER.ReadOnly = true;
 			// 
 			// F_SAP_HEGII_0107
 			// 
@@ -913,16 +922,6 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 		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 Actualoutput;
-        private System.Windows.Forms.DataGridViewTextBoxColumn OUTPUT;
-        private System.Windows.Forms.DataGridViewTextBoxColumn scrapnum1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn cleannupnum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn recoverynum1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn repairnum1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DRJJBQTRCXDCCP;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DRCXFDRJJDCCP;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DIFFER;
 		private System.Windows.Forms.DataGridViewTextBoxColumn logdate;
 		private System.Windows.Forms.DataGridViewTextBoxColumn BeginTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn EndTime;
@@ -936,5 +935,16 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 		private System.Windows.Forms.DataGridViewTextBoxColumn ExecuteDateBegin;
 		private System.Windows.Forms.DataGridViewTextBoxColumn ExecuteDateEnd;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
+		private System.Windows.Forms.DataGridViewTextBoxColumn DATACODETOTAL;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Actualoutput;
+		private System.Windows.Forms.DataGridViewTextBoxColumn WORKSHOP;
+		private System.Windows.Forms.DataGridViewTextBoxColumn OUTPUT;
+		private System.Windows.Forms.DataGridViewTextBoxColumn scrapnum1;
+		private System.Windows.Forms.DataGridViewTextBoxColumn cleannupnum;
+		private System.Windows.Forms.DataGridViewTextBoxColumn recoverynum1;
+		private System.Windows.Forms.DataGridViewTextBoxColumn repairnum1;
+		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.resx

@@ -126,6 +126,9 @@
   <metadata name="Actualoutput.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="WORKSHOP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="OUTPUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -26535,7 +26535,8 @@ updateuserid=:updateuserid where barcode=:barcode";
                                        --      ,'0'
                                        --      ,''
                                        --      ,DECODE(G.GOODS_LINE_CODE, 'G', 'A', 'M', 'A', 'L', 'B', '')) AS ZSCS,
-                                       DECODE(BAR.LUOCIFLAG ,'1' ,'J' ,'T') AS ZSCS,   
+                                       --DECODE(BAR.LUOCIFLAG ,'1' ,'J' ,'T') AS ZSCS,
+                                       CASE WHEN GH.FHUSERCODE IN('SKCK11','SKCK12')  THEN  'J' ELSE 'T' END AS ZSCS,
                                        CASE
                                            WHEN O.ORDERID IS NULL
                                                 OR O.ORDERNO LIKE 'HEGII%' THEN
@@ -26560,7 +26561,8 @@ updateuserid=:updateuserid where barcode=:barcode";
                                        END ORDERITEM,
                                        CASE
                                            --裸瓷撤销产品产成品交接车间4
-                                            WHEN BAR.LUOCIFLAG = '1' THEN
+                                           --WHEN BAR.LUOCIFLAG = '1' THEN
+                                            WHEN GH.FHUSERCODE IN('SKCK11','SKCK12') THEN
                                              4
                                            --临时增加产品特殊处理 H307小件 有一部分在二部生产，报工按原逻辑车间为9，暂时强制为1
                                             WHEN INSTR(BAR.GROUTINGLINECODE, 'B') = 1  AND INSTR(GT.GOODSTYPECODE, '001002') = 1 
@@ -27917,7 +27919,8 @@ updateuserid=:updateuserid where barcode=:barcode";
                                        --      ,'0'
                                        --      ,''
                                        --      ,DECODE(G.GOODS_LINE_CODE, 'G', 'A', 'M', 'A', 'L', 'B', '')) AS ZSCS,
-                                       DECODE(BAR.LUOCIFLAG ,'1' ,'J' ,'T') AS ZSCS,   
+                                       --DECODE(BAR.LUOCIFLAG ,'1' ,'J' ,'T') AS ZSCS,  
+                                       CASE WHEN GH.FHUSERCODE IN('SKCK11','SKCK12')  THEN  'J' ELSE 'T' END AS ZSCS,
                                        CASE
                                            WHEN O.ORDERID IS NULL
                                                 OR O.ORDERNO LIKE 'HEGII%' THEN
@@ -27942,7 +27945,8 @@ updateuserid=:updateuserid where barcode=:barcode";
                                        END ORDERITEM,
                                        CASE
                                            --裸瓷撤销产品产成品交接车间4
-                                            WHEN BAR.LUOCIFLAG = '1' THEN
+                                            --WHEN BAR.LUOCIFLAG = '1' THEN
+                                            WHEN GH.FHUSERCODE IN('SKCK11','SKCK12') THEN
                                              4
                                            --临时增加产品特殊处理 H307小件 有一部分在二部生产，报工按原逻辑车间为9，暂时强制为1
                                             WHEN INSTR(BAR.GROUTINGLINECODE, 'B') = 1  AND INSTR(GT.GOODSTYPECODE, '001002') = 1 

DK.Service/SAPDataService/SAPDataLogicPartial.cs

@@ -3662,18 +3662,29 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 
             try
             {
-                string sqlString = @"
+                string sqlString = @"   SELECT T.DATACODE,
+                       T.ACTUALOUTPUT,
+                       T.WORKSHOP,
+                       T.OUTPUT,
+                       T.SCRAPNUM,
+                       T.CLEANNUPNUM,
+                       T.RECOVERYNUM,
+                       T.REPAIRNUM,
+                       T.DRCXFDRJJDCCP,
+                       T.DRJJBQTRCXDCCP,
+                       T.DIFFER FROM (
                 SELECT T1.DATACODE,
-                       T1.ACTUALOUTPUT,
+                       to_char(T1.ACTUALOUTPUT) ACTUALOUTPUT,
+                       '-' as WORKSHOP,
                        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
+                       to_char(T3.DRCXFDRJJDCCP) DRCXFDRJJDCCP,
+                       to_char(T4.DRJJBQTRCXDCCP) DRJJBQTRCXDCCP,
+                       to_char(T1.ACTUALOUTPUT + NVL(T4.DRJJBQTRCXDCCP, 0) - NVL(T3.DRCXFDRJJDCCP, 0) -
+                       (T2.OUTPUT + T2.RECOVERYNUM)) AS DIFFER
                   FROM (
                         -- 业务数据汇总
                         -- 10
@@ -3845,9 +3856,40 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 									AND P.BACKOUTTIME >:DATEEND 
                                 	AND p.VALUEFLAG = 0 
                     ) T4
-                    ON T4.DATACODE = T1.DATACODE
-                 WHERE (-1 = :DATACODE OR T1.DATACODE = :DATACODE)
-                 ORDER BY T1.DATACODE ";
+                    ON T4.DATACODE = T1.DATACODE 
+                UNION ALL 
+                     SELECT T2.DATACODE,
+                       '' ACTUALOUTPUT,
+                       TO_CHAR(T2.WORKSHOP) WORKSHOP,
+                       T2.OUTPUT,
+                       T2.SCRAPNUM,
+                       T2.CLEANNUPNUM,
+                       T2.RECOVERYNUM,
+                       T2.REPAIRNUM,
+                       '' AS DRCXFDRJJDCCP,
+                       '' AS DRJJBQTRCXDCCP,
+                       '' AS DIFFER 
+                       FROM  (
+                             -- 当日推送日志数据汇总
+                             SELECT DATACODE , 
+                                    WORKSHOP,
+                                     SUM(TO_NUMBER(OUTPUTNUM)) AS OUTPUT,
+                                     SUM(TO_NUMBER(SCRAPNUM)) AS SCRAPNUM,
+                                     SUM(TO_NUMBER(CLEANUPNUM)) AS CLEANNUPNUM,
+                                     SUM(TO_NUMBER(RECOVERYNUM)) AS RECOVERYNUM,
+                                     SUM(TO_NUMBER(REPAIRNUM)) AS REPAIRNUM
+                               FROM TSAP_HEGII_WORKDATA_BG
+                              WHERE LOGID IN (SELECT LOGID
+                                                FROM TSAP_HEGII_DATALOG_BG T
+                                               WHERE DATASTUTS = 'S'
+                                                 AND T.DATACODE IN ('20','30','40','50','55','60')
+                                                 AND EXECUTEDATEBEGIN >= :DATEBEGIN
+                                                 AND EXECUTEDATEEND <= :DATEEND )
+                              GROUP BY DATACODE ,WORKSHOP
+                              ORDER BY DATACODE ) T2 
+                    ) T       
+                WHERE (-1 = :DATACODE OR T.DATACODE = :DATACODE)
+                ORDER BY  T.DATACODE,T.WORKSHOP";
 
                 OracleParameter[] oracleParameter = new OracleParameter[]
                 {