半成品工序质量表

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

@@ -32,17 +32,15 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = 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 dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = 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.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = 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 dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -60,12 +58,14 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = 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 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.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
             this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
             this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
             this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
@@ -83,22 +83,20 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.tabControl1 = new System.Windows.Forms.TabControl();
             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.tabPage2 = new System.Windows.Forms.TabPage();
             this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.yyyymmdd = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.goodscode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.sapcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.usercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ordercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.orderitem = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.outputnum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ScrapNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CleanupNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.recoverynum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.RepairNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ztype = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.zmsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ZTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.dgvFP = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.fpYYYYMMDD = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -127,18 +125,21 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.g4cleanupsum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g4repairnum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g4recoverynum = 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.yyyymmdd = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.goodscode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.sapcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.usercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.zscs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ordercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.orderitem = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.outputnum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ScrapNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CleanupNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.recoverynum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.RepairNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ztype = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.zmsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ZTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.grpCollapsible1.SuspendLayout();
             this.tsrToolStrip1.SuspendLayout();
             this.tabControl1.SuspendLayout();
@@ -395,6 +396,112 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.dgvLog.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvLog_CellDoubleClick);
             this.dgvLog.SelectionChanged += new System.EventHandler(this.dgvLog_SelectionChanged);
             // 
+            // logdate
+            // 
+            this.logdate.DataPropertyName = "yyyymmdd";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.logdate.DefaultCellStyle = dataGridViewCellStyle3;
+            this.logdate.HeaderText = "同步日期";
+            this.logdate.Name = "logdate";
+            this.logdate.ReadOnly = true;
+            // 
+            // BeginTime
+            // 
+            this.BeginTime.DataPropertyName = "BeginTime";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.Format = "yyyy-MM-dd HH:mm:ss";
+            this.BeginTime.DefaultCellStyle = dataGridViewCellStyle4;
+            this.BeginTime.HeaderText = "开始时间";
+            this.BeginTime.Name = "BeginTime";
+            this.BeginTime.ReadOnly = true;
+            // 
+            // EndTime
+            // 
+            this.EndTime.DataPropertyName = "EndTime";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
+            this.EndTime.DefaultCellStyle = dataGridViewCellStyle5;
+            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";
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.DataStuts.DefaultCellStyle = dataGridViewCellStyle6;
+            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";
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.Format = "yyyy-MM-dd HH:mm:ss";
+            dataGridViewCellStyle7.NullValue = null;
+            this.ExecuteDateBegin.DefaultCellStyle = dataGridViewCellStyle7;
+            this.ExecuteDateBegin.HeaderText = "业务数据开始时间";
+            this.ExecuteDateBegin.Name = "ExecuteDateBegin";
+            this.ExecuteDateBegin.ReadOnly = true;
+            this.ExecuteDateBegin.Width = 120;
+            // 
+            // ExecuteDateEnd
+            // 
+            this.ExecuteDateEnd.DataPropertyName = "ExecuteDateEnd";
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle8.Format = "yyyy-MM-dd HH:mm:ss";
+            this.ExecuteDateEnd.DefaultCellStyle = dataGridViewCellStyle8;
+            this.ExecuteDateEnd.HeaderText = "业务数据结束时间";
+            this.ExecuteDateEnd.Name = "ExecuteDateEnd";
+            this.ExecuteDateEnd.ReadOnly = true;
+            this.ExecuteDateEnd.Width = 120;
+            // 
             // tabPage2
             // 
             this.tabPage2.Controls.Add(this.dgvSum);
@@ -434,6 +541,7 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.goodscode,
             this.sapcode,
             this.usercode,
+            this.zscs,
             this.ordercode,
             this.orderitem,
             this.outputnum,
@@ -479,121 +587,6 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.dgvSum.TotalSumColumns = null;
             this.dgvSum.ViewRowFilter = "";
             // 
-            // yyyymmdd
-            // 
-            this.yyyymmdd.DataPropertyName = "yyyymmdd";
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.yyyymmdd.DefaultCellStyle = dataGridViewCellStyle12;
-            this.yyyymmdd.HeaderText = "同步日期";
-            this.yyyymmdd.Name = "yyyymmdd";
-            this.yyyymmdd.ReadOnly = true;
-            // 
-            // goodscode
-            // 
-            this.goodscode.DataPropertyName = "goodscode";
-            this.goodscode.HeaderText = "产品编码";
-            this.goodscode.Name = "goodscode";
-            this.goodscode.ReadOnly = true;
-            // 
-            // sapcode
-            // 
-            this.sapcode.DataPropertyName = "sapcode";
-            this.sapcode.HeaderText = "物料编码";
-            this.sapcode.Name = "sapcode";
-            this.sapcode.ReadOnly = true;
-            // 
-            // usercode
-            // 
-            this.usercode.DataPropertyName = "usercode";
-            this.usercode.HeaderText = "生产工号";
-            this.usercode.Name = "usercode";
-            this.usercode.ReadOnly = true;
-            // 
-            // ordercode
-            // 
-            this.ordercode.DataPropertyName = "ordercode";
-            this.ordercode.HeaderText = "销售凭证 ";
-            this.ordercode.Name = "ordercode";
-            this.ordercode.ReadOnly = true;
-            // 
-            // orderitem
-            // 
-            this.orderitem.DataPropertyName = "orderitem";
-            this.orderitem.HeaderText = "凭证项目";
-            this.orderitem.Name = "orderitem";
-            this.orderitem.ReadOnly = true;
-            // 
-            // outputnum
-            // 
-            this.outputnum.DataPropertyName = "outputnum";
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.outputnum.DefaultCellStyle = dataGridViewCellStyle13;
-            this.outputnum.HeaderText = "产量";
-            this.outputnum.Name = "outputnum";
-            this.outputnum.ReadOnly = true;
-            // 
-            // ScrapNum
-            // 
-            this.ScrapNum.DataPropertyName = "ScrapNum";
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.ScrapNum.DefaultCellStyle = dataGridViewCellStyle14;
-            this.ScrapNum.HeaderText = "损坯";
-            this.ScrapNum.Name = "ScrapNum";
-            this.ScrapNum.ReadOnly = true;
-            // 
-            // CleanupNum
-            // 
-            this.CleanupNum.DataPropertyName = "CleanupNum";
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.CleanupNum.DefaultCellStyle = dataGridViewCellStyle15;
-            this.CleanupNum.HeaderText = "清除";
-            this.CleanupNum.Name = "CleanupNum";
-            this.CleanupNum.ReadOnly = true;
-            // 
-            // recoverynum
-            // 
-            this.recoverynum.DataPropertyName = "recoverynum";
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.recoverynum.DefaultCellStyle = dataGridViewCellStyle16;
-            this.recoverynum.HeaderText = "回收";
-            this.recoverynum.Name = "recoverynum";
-            this.recoverynum.ReadOnly = true;
-            // 
-            // RepairNum
-            // 
-            this.RepairNum.DataPropertyName = "RepairNum";
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.RepairNum.DefaultCellStyle = dataGridViewCellStyle17;
-            this.RepairNum.HeaderText = "干补";
-            this.RepairNum.Name = "RepairNum";
-            this.RepairNum.ReadOnly = true;
-            // 
-            // ztype
-            // 
-            this.ztype.DataPropertyName = "ztype";
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.ztype.DefaultCellStyle = dataGridViewCellStyle18;
-            this.ztype.HeaderText = "同步状态";
-            this.ztype.Name = "ztype";
-            this.ztype.ReadOnly = true;
-            // 
-            // zmsg
-            // 
-            this.zmsg.DataPropertyName = "zmsg";
-            this.zmsg.HeaderText = "同步消息";
-            this.zmsg.Name = "zmsg";
-            this.zmsg.ReadOnly = true;
-            // 
-            // ZTIME
-            // 
-            this.ZTIME.DataPropertyName = "ZTIME";
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle19.Format = "yyyy-MM-dd HH:mm:ss";
-            this.ZTIME.DefaultCellStyle = dataGridViewCellStyle19;
-            this.ZTIME.HeaderText = "同步时间";
-            this.ZTIME.Name = "ZTIME";
-            this.ZTIME.ReadOnly = true;
-            // 
             // tabPage3
             // 
             this.tabPage3.Controls.Add(this.dgvFP);
@@ -948,111 +941,127 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.g4recoverynum.Name = "g4recoverynum";
             this.g4recoverynum.ReadOnly = true;
             // 
-            // logdate
+            // yyyymmdd
             // 
-            this.logdate.DataPropertyName = "yyyymmdd";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.logdate.DefaultCellStyle = dataGridViewCellStyle3;
-            this.logdate.HeaderText = "同步日期";
-            this.logdate.Name = "logdate";
-            this.logdate.ReadOnly = true;
+            this.yyyymmdd.DataPropertyName = "yyyymmdd";
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.yyyymmdd.DefaultCellStyle = dataGridViewCellStyle12;
+            this.yyyymmdd.HeaderText = "同步日期";
+            this.yyyymmdd.Name = "yyyymmdd";
+            this.yyyymmdd.ReadOnly = true;
             // 
-            // BeginTime
+            // goodscode
             // 
-            this.BeginTime.DataPropertyName = "BeginTime";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.Format = "yyyy-MM-dd HH:mm:ss";
-            this.BeginTime.DefaultCellStyle = dataGridViewCellStyle4;
-            this.BeginTime.HeaderText = "开始时间";
-            this.BeginTime.Name = "BeginTime";
-            this.BeginTime.ReadOnly = true;
+            this.goodscode.DataPropertyName = "goodscode";
+            this.goodscode.HeaderText = "产品编码";
+            this.goodscode.Name = "goodscode";
+            this.goodscode.ReadOnly = true;
             // 
-            // EndTime
+            // sapcode
             // 
-            this.EndTime.DataPropertyName = "EndTime";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
-            this.EndTime.DefaultCellStyle = dataGridViewCellStyle5;
-            this.EndTime.HeaderText = "完成时间";
-            this.EndTime.Name = "EndTime";
-            this.EndTime.ReadOnly = true;
+            this.sapcode.DataPropertyName = "sapcode";
+            this.sapcode.HeaderText = "物料编码";
+            this.sapcode.Name = "sapcode";
+            this.sapcode.ReadOnly = true;
             // 
-            // DataCodeName
+            // usercode
             // 
-            this.DataCodeName.DataPropertyName = "DataCodeName";
-            this.DataCodeName.HeaderText = "数据节点";
-            this.DataCodeName.Name = "DataCodeName";
-            this.DataCodeName.ReadOnly = true;
+            this.usercode.DataPropertyName = "usercode";
+            this.usercode.HeaderText = "生产工号";
+            this.usercode.Name = "usercode";
+            this.usercode.ReadOnly = true;
             // 
-            // DataStuts
+            // zscs
             // 
-            this.DataStuts.DataPropertyName = "DataStuts";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.DataStuts.DefaultCellStyle = dataGridViewCellStyle6;
-            this.DataStuts.HeaderText = "同步状态";
-            this.DataStuts.Name = "DataStuts";
-            this.DataStuts.ReadOnly = true;
+            this.zscs.DataPropertyName = "zscs";
+            this.zscs.HeaderText = "注浆类型";
+            this.zscs.Name = "zscs";
+            this.zscs.ReadOnly = true;
             // 
-            // DataMSG
+            // ordercode
             // 
-            this.DataMSG.DataPropertyName = "DataMSG";
-            this.DataMSG.HeaderText = "同步消息";
-            this.DataMSG.Name = "DataMSG";
-            this.DataMSG.ReadOnly = true;
+            this.ordercode.DataPropertyName = "ordercode";
+            this.ordercode.HeaderText = "销售凭证 ";
+            this.ordercode.Name = "ordercode";
+            this.ordercode.ReadOnly = true;
             // 
-            // synusercode
+            // orderitem
             // 
-            this.synusercode.DataPropertyName = "synusercode";
-            this.synusercode.HeaderText = "同步工号";
-            this.synusercode.Name = "synusercode";
-            this.synusercode.ReadOnly = true;
+            this.orderitem.DataPropertyName = "orderitem";
+            this.orderitem.HeaderText = "凭证项目";
+            this.orderitem.Name = "orderitem";
+            this.orderitem.ReadOnly = true;
             // 
-            // logid
+            // outputnum
             // 
-            this.logid.DataPropertyName = "logid";
-            this.logid.HeaderText = "logid";
-            this.logid.Name = "logid";
-            this.logid.ReadOnly = true;
-            this.logid.Visible = false;
+            this.outputnum.DataPropertyName = "outputnum";
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.outputnum.DefaultCellStyle = dataGridViewCellStyle13;
+            this.outputnum.HeaderText = "产量";
+            this.outputnum.Name = "outputnum";
+            this.outputnum.ReadOnly = true;
             // 
-            // datalogid
+            // ScrapNum
             // 
-            this.datalogid.DataPropertyName = "datalogid";
-            this.datalogid.HeaderText = "datalogid";
-            this.datalogid.Name = "datalogid";
-            this.datalogid.ReadOnly = true;
-            this.datalogid.Visible = false;
+            this.ScrapNum.DataPropertyName = "ScrapNum";
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.ScrapNum.DefaultCellStyle = dataGridViewCellStyle14;
+            this.ScrapNum.HeaderText = "损坯";
+            this.ScrapNum.Name = "ScrapNum";
+            this.ScrapNum.ReadOnly = true;
             // 
-            // DataCode
+            // CleanupNum
             // 
-            this.DataCode.DataPropertyName = "DataCode";
-            this.DataCode.HeaderText = "DataCode";
-            this.DataCode.Name = "DataCode";
-            this.DataCode.ReadOnly = true;
-            this.DataCode.Visible = false;
+            this.CleanupNum.DataPropertyName = "CleanupNum";
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.CleanupNum.DefaultCellStyle = dataGridViewCellStyle15;
+            this.CleanupNum.HeaderText = "清除";
+            this.CleanupNum.Name = "CleanupNum";
+            this.CleanupNum.ReadOnly = true;
             // 
-            // ExecuteDateBegin
+            // recoverynum
             // 
-            this.ExecuteDateBegin.DataPropertyName = "ExecuteDateBegin";
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.Format = "yyyy-MM-dd HH:mm:ss";
-            dataGridViewCellStyle7.NullValue = null;
-            this.ExecuteDateBegin.DefaultCellStyle = dataGridViewCellStyle7;
-            this.ExecuteDateBegin.HeaderText = "业务数据开始时间";
-            this.ExecuteDateBegin.Name = "ExecuteDateBegin";
-            this.ExecuteDateBegin.ReadOnly = true;
-            this.ExecuteDateBegin.Width = 120;
+            this.recoverynum.DataPropertyName = "recoverynum";
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.recoverynum.DefaultCellStyle = dataGridViewCellStyle16;
+            this.recoverynum.HeaderText = "回收";
+            this.recoverynum.Name = "recoverynum";
+            this.recoverynum.ReadOnly = true;
             // 
-            // ExecuteDateEnd
+            // RepairNum
             // 
-            this.ExecuteDateEnd.DataPropertyName = "ExecuteDateEnd";
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle8.Format = "yyyy-MM-dd HH:mm:ss";
-            this.ExecuteDateEnd.DefaultCellStyle = dataGridViewCellStyle8;
-            this.ExecuteDateEnd.HeaderText = "业务数据结束时间";
-            this.ExecuteDateEnd.Name = "ExecuteDateEnd";
-            this.ExecuteDateEnd.ReadOnly = true;
-            this.ExecuteDateEnd.Width = 120;
+            this.RepairNum.DataPropertyName = "RepairNum";
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.RepairNum.DefaultCellStyle = dataGridViewCellStyle17;
+            this.RepairNum.HeaderText = "干补";
+            this.RepairNum.Name = "RepairNum";
+            this.RepairNum.ReadOnly = true;
+            // 
+            // ztype
+            // 
+            this.ztype.DataPropertyName = "ztype";
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.ztype.DefaultCellStyle = dataGridViewCellStyle18;
+            this.ztype.HeaderText = "同步状态";
+            this.ztype.Name = "ztype";
+            this.ztype.ReadOnly = true;
+            // 
+            // zmsg
+            // 
+            this.zmsg.DataPropertyName = "zmsg";
+            this.zmsg.HeaderText = "同步消息";
+            this.zmsg.Name = "zmsg";
+            this.zmsg.ReadOnly = true;
+            // 
+            // ZTIME
+            // 
+            this.ZTIME.DataPropertyName = "ZTIME";
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle19.Format = "yyyy-MM-dd HH:mm:ss";
+            this.ZTIME.DefaultCellStyle = dataGridViewCellStyle19;
+            this.ZTIME.HeaderText = "同步时间";
+            this.ZTIME.Name = "ZTIME";
+            this.ZTIME.ReadOnly = true;
             // 
             // F_SAP_HEGII_0103
             // 
@@ -1103,20 +1112,6 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
         private Basics.BaseControls.C_DataGridView dgvSum;
         private System.Windows.Forms.TabPage tabPage3;
         private Basics.BaseControls.C_DataGridView dgvFP;
-        private System.Windows.Forms.DataGridViewTextBoxColumn yyyymmdd;
-        private System.Windows.Forms.DataGridViewTextBoxColumn goodscode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn sapcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn usercode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ordercode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn orderitem;
-        private System.Windows.Forms.DataGridViewTextBoxColumn outputnum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ScrapNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CleanupNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn recoverynum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn RepairNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ztype;
-        private System.Windows.Forms.DataGridViewTextBoxColumn zmsg;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ZTIME;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripButton tsbtnSyn;
 		private System.Windows.Forms.TabPage tabPage4;
@@ -1158,5 +1153,20 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
         private System.Windows.Forms.DataGridViewTextBoxColumn DataCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn ExecuteDateBegin;
         private System.Windows.Forms.DataGridViewTextBoxColumn ExecuteDateEnd;
+        private System.Windows.Forms.DataGridViewTextBoxColumn yyyymmdd;
+        private System.Windows.Forms.DataGridViewTextBoxColumn goodscode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn sapcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn usercode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn zscs;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ordercode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn orderitem;
+        private System.Windows.Forms.DataGridViewTextBoxColumn outputnum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ScrapNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CleanupNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn recoverynum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn RepairNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ztype;
+        private System.Windows.Forms.DataGridViewTextBoxColumn zmsg;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ZTIME;
     }
 }

DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0103.resx

@@ -168,6 +168,9 @@
   <metadata name="usercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="zscs.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ordercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -15892,7 +15892,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 
 
         /// <summary>
-        /// 成品工艺质量表-恒洁三水
+        /// 半成品工序质量表-恒洁三水
         /// </summary>
         /// <param name="cre"></param>
         /// <param name="sUserInfo"></param>
@@ -15913,7 +15913,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "      ,SUM(PP.PCOUNT) - SUM(PP.BUHEGE) - SUM(PP.FANGONG) HEGE\n" +
                 "      ,SUM(PP.BUHEGE) BUHEGE\n" +
                 "      ,SUM(PP.FANGONG) FANGONG\n" +
-                "      ,round((SUM(PP.PCOUNT) - SUM(PP.BUHEGE) - SUM(PP.FANGONG)) / SUM(PP.PCOUNT),4) HEGELV\n" +
+                "      ,decode(SUM(PP.PCOUNT),null,0,0,0, round((SUM(PP.PCOUNT) - SUM(PP.BUHEGE) - SUM(PP.FANGONG)) / SUM(PP.PCOUNT),4)) HEGELV\n" +
                 "  FROM (\n" +
                 "        -- 成型产量\n" +
                 "        SELECT 0 PROCEDUREID\n" +
@@ -15991,7 +15991,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            ON T.PROCEDUREID = P.PROCEDUREID\n" +
                 "         WHERE T.VALUEFLAG = '1'\n" +
                 "           AND P.IS_BEFOREFIRE = '1'\n" +
-                "           AND T.SEMICHECKTYPE = 2\n" +
+                "           AND T.SEMICHECKTYPE = 1\n" +
                 "           AND T.CREATETIME >= :timebegin\n" +
                 "           AND T.CREATETIME < :timeend) PP\n" +
                 " INNER JOIN TP_MST_GOODS G\n" +
@@ -16006,7 +16006,6 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 " ORDER BY PP.DISPLAYNO\n" +
                 "         ,PP.PROCEDURENAME";
 
-
                 OracleParameter[] oracleParameter = new OracleParameter[]
                 {
                     //new OracleParameter(":accountid",OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
@@ -16049,7 +16048,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
         }
 
         /// <summary>
-        /// 成品工艺质量表-缺陷明细-恒洁三水
+        /// 半成品工序质量表-缺陷明细-恒洁三水
         /// </summary>
         /// <param name="cre"></param>
         /// <param name="sUserInfo"></param>

WCF.Service/WCF.Ex_HGS3_QRS/WCF.ExHGS3QRS.csproj

@@ -30,6 +30,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Curtain.DataAccess, Version=1.1.7285.24561, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

WCF.Service/WCF.Hosting/App.config

@@ -301,22 +301,22 @@
     <!--HEGII SAP同步 正式 800-->
     <!--<client>
       <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
-        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND"/>
+        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_800"/>
       <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm010/800/zppfm010/zppfm010_bind" binding="customBinding"
         bindingConfiguration="ZPPFM010_BIND_soap12" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_soap12"/>
       <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
-        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND"/>
+        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_800"/>
       <endpoint address="http://S4PRDAPP1.HEGII.COM:8080/sap/bc/srt/rfc/sap/zppfm008/800/zppfm008/zppfm008_bind" binding="customBinding"
         bindingConfiguration="ZPPFM008_BIND_soap12" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_soap12"/>
     </client>-->
     <!--HEGII SAP同步 测试 240-->
     <!--<client>
       <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/240/zppfm010/zppfm010_bind" binding="customBinding"
-        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND"/>
+        bindingConfiguration="ZPPFM010_BIND" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_240"/>
       <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm010/240/zppfm010/zppfm010_bind" binding="customBinding"
         bindingConfiguration="ZPPFM010_BIND_soap12" contract="HGSAPDK_ZPPFM010.ZPPFM010" name="ZPPFM010_BIND_soap12"/>
       <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/240/zppfm008/zppfm008_bind" binding="customBinding"
-        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND"/>
+        bindingConfiguration="ZPPFM008_BIND" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_240"/>
       <endpoint address="http://S4DEVAPP.hegii.com:8080/sap/bc/srt/rfc/sap/zppfm008/240/zppfm008/zppfm008_bind" binding="customBinding"
         bindingConfiguration="ZPPFM008_BIND_soap12" contract="HGSAPDK_ZPPFM008.ZPPFM008" name="ZPPFM008_BIND_soap12"/>
     </client>-->