Browse Source

报工日志

Administrator 3 years ago
parent
commit
46158efec1

+ 234 - 0
DK.Client/SAPDataModule/F_SAP_HEGII_0107.resx

@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tsrToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="DATACODETOTAL.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column7.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>
+  <metadata name="BeginTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="EndTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataStuts.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataMSG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="synusercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="logid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="datalogid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ExecuteDateBegin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ExecuteDateEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="yyyymmdd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="goodscode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sapcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <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>
+  <metadata name="orderitem.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="outputnum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ScrapNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CleanupNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="recoverynum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="RepairNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="testmouldflag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ztype.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="zmsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ZTIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>39</value>
+  </metadata>
+</root>

+ 901 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0107.Designer.cs

@@ -0,0 +1,901 @@
+
+namespace Dongke.IBOSS.PRD.Client.SAPDataModule
+{
+    partial class F_SAP_HEGII_0107
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </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();
+			this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
+			this.lblLabel3 = new Dongke.WinForm.Controls.LblLabel();
+			this.CBDataCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+			this.dtpDateend = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.dtpDatebegin = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
+			this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
+			this.tsrToolStrip1 = new Dongke.WinForm.Controls.TsrToolStrip();
+			this.tsbtnSearch = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnClearCondition = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+			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();
+			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.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.testmouldflag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			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();
+			this.tabPage3.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvTotal)).BeginInit();
+			this.tabPage1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvLog)).BeginInit();
+			this.tabPage2.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvSum)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// grpCollapsible1
+			// 
+			this.grpCollapsible1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.grpCollapsible1.Controls.Add(this.lblLabel3);
+			this.grpCollapsible1.Controls.Add(this.CBDataCode);
+			this.grpCollapsible1.Controls.Add(this.dtpDateend);
+			this.grpCollapsible1.Controls.Add(this.dtpDatebegin);
+			this.grpCollapsible1.Controls.Add(this.lblLabel2);
+			this.grpCollapsible1.Controls.Add(this.lblLabel1);
+			this.grpCollapsible1.Location = new System.Drawing.Point(0, 38);
+			this.grpCollapsible1.Name = "grpCollapsible1";
+			this.grpCollapsible1.Size = new System.Drawing.Size(656, 52);
+			this.grpCollapsible1.TabIndex = 1;
+			this.grpCollapsible1.TabStop = false;
+			this.grpCollapsible1.Text = "查询条件";
+			// 
+			// lblLabel3
+			// 
+			this.lblLabel3.Location = new System.Drawing.Point(414, 24);
+			this.lblLabel3.Name = "lblLabel3";
+			this.lblLabel3.Size = new System.Drawing.Size(53, 12);
+			this.lblLabel3.TabIndex = 7;
+			this.lblLabel3.Text = "数据节点";
+			// 
+			// CBDataCode
+			// 
+			this.CBDataCode.BackColor = System.Drawing.SystemColors.Window;
+			this.CBDataCode.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.CBDataCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.CBDataCode.FormattingEnabled = true;
+			this.CBDataCode.Location = new System.Drawing.Point(473, 20);
+			this.CBDataCode.Name = "CBDataCode";
+			this.CBDataCode.Size = new System.Drawing.Size(121, 20);
+			this.CBDataCode.TabIndex = 6;
+			// 
+			// dtpDateend
+			// 
+			this.dtpDateend.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+			this.dtpDateend.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpDateend.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpDateend.Location = new System.Drawing.Point(254, 20);
+			this.dtpDateend.Name = "dtpDateend";
+			this.dtpDateend.Size = new System.Drawing.Size(154, 21);
+			this.dtpDateend.TabIndex = 5;
+			// 
+			// dtpDatebegin
+			// 
+			this.dtpDatebegin.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+			this.dtpDatebegin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpDatebegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpDatebegin.Location = new System.Drawing.Point(71, 20);
+			this.dtpDatebegin.Name = "dtpDatebegin";
+			this.dtpDatebegin.Size = new System.Drawing.Size(154, 21);
+			this.dtpDatebegin.TabIndex = 4;
+			// 
+			// lblLabel2
+			// 
+			this.lblLabel2.Location = new System.Drawing.Point(231, 24);
+			this.lblLabel2.Name = "lblLabel2";
+			this.lblLabel2.Size = new System.Drawing.Size(17, 12);
+			this.lblLabel2.TabIndex = 2;
+			this.lblLabel2.Text = "至";
+			this.lblLabel2.Click += new System.EventHandler(this.lblLabel2_Click);
+			// 
+			// lblLabel1
+			// 
+			this.lblLabel1.Location = new System.Drawing.Point(12, 24);
+			this.lblLabel1.Name = "lblLabel1";
+			this.lblLabel1.Size = new System.Drawing.Size(53, 12);
+			this.lblLabel1.TabIndex = 0;
+			this.lblLabel1.Text = "同步日期";
+			// 
+			// tsrToolStrip1
+			// 
+			this.tsrToolStrip1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsrToolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbtnSearch,
+            this.tsbtnClearCondition,
+            this.toolStripSeparator1,
+            this.tsbtnAdaptive,
+            this.tsbtnClose});
+			this.tsrToolStrip1.Location = new System.Drawing.Point(0, 0);
+			this.tsrToolStrip1.Name = "tsrToolStrip1";
+			this.tsrToolStrip1.Size = new System.Drawing.Size(668, 35);
+			this.tsrToolStrip1.TabIndex = 0;
+			// 
+			// tsbtnSearch
+			// 
+			this.tsbtnSearch.AutoSize = false;
+			this.tsbtnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnSearch.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnSearch.Name = "tsbtnSearch";
+			this.tsbtnSearch.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnSearch.Text = "查询(&Q)";
+			this.tsbtnSearch.Click += new System.EventHandler(this.tsbtnSearch_Click);
+			// 
+			// tsbtnClearCondition
+			// 
+			this.tsbtnClearCondition.AutoSize = false;
+			this.tsbtnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnClearCondition.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnClearCondition.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnClearCondition.Name = "tsbtnClearCondition";
+			this.tsbtnClearCondition.Size = new System.Drawing.Size(80, 25);
+			this.tsbtnClearCondition.Text = "清空条件(&C)";
+			this.tsbtnClearCondition.Click += new System.EventHandler(this.tsbtnClearCondition_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.AutoSize = false;
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+			// 
+			// tsbtnAdaptive
+			// 
+			this.tsbtnAdaptive.AutoSize = false;
+			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+			// 
+			// tsbtnClose
+			// 
+			this.tsbtnClose.AutoSize = false;
+			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnClose.Name = "tsbtnClose";
+			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnClose.Text = "关闭(&X)";
+			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+			// 
+			// tabControl1
+			// 
+			this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.tabControl1.Controls.Add(this.tabPage3);
+			this.tabControl1.Controls.Add(this.tabPage1);
+			this.tabControl1.Controls.Add(this.tabPage2);
+			this.tabControl1.Location = new System.Drawing.Point(0, 96);
+			this.tabControl1.Name = "tabControl1";
+			this.tabControl1.SelectedIndex = 0;
+			this.tabControl1.Size = new System.Drawing.Size(656, 261);
+			this.tabControl1.TabIndex = 2;
+			// 
+			// tabPage3
+			// 
+			this.tabPage3.Controls.Add(this.dgvTotal);
+			this.tabPage3.Location = new System.Drawing.Point(4, 22);
+			this.tabPage3.Name = "tabPage3";
+			this.tabPage3.Size = new System.Drawing.Size(648, 235);
+			this.tabPage3.TabIndex = 2;
+			this.tabPage3.Text = "报工汇总";
+			this.tabPage3.UseVisualStyleBackColor = true;
+			// 
+			// dgvTotal
+			// 
+			this.dgvTotal.AllowUserToAddRows = false;
+			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;
+			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;
+			this.dgvTotal.ChildNodeColumnName = null;
+			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;
+			this.dgvTotal.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvTotal.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.DATACODETOTAL,
+            this.Column1,
+            this.Column4,
+            this.Column2,
+            this.Column3,
+            this.Column5,
+            this.Column6,
+            this.Column7});
+			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;
+			this.dgvTotal.DynamicColumnName = "";
+			this.dgvTotal.EnableHeadersVisualStyles = false;
+			this.dgvTotal.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvTotal.FormatQuantityColumns = null;
+			this.dgvTotal.HorizontalMergeColumn = null;
+			this.dgvTotal.IsAutoCountSum = true;
+			this.dgvTotal.IsAutoResizeColumns = false;
+			this.dgvTotal.IsClickF12 = false;
+			this.dgvTotal.IsOpenMergeCellFlag = false;
+			this.dgvTotal.IsSubTotalFlag = false;
+			this.dgvTotal.IsTopDeep = false;
+			this.dgvTotal.Location = new System.Drawing.Point(0, 0);
+			this.dgvTotal.MergeColumnNames = null;
+			this.dgvTotal.MergeDetailColumnNames = null;
+			this.dgvTotal.MergeDetailOnlyColumn = null;
+			this.dgvTotal.MergeOnlyColumn = null;
+			this.dgvTotal.Name = "dgvTotal";
+			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;
+			this.dgvTotal.RowTemplate.Height = 21;
+			this.dgvTotal.Size = new System.Drawing.Size(648, 235);
+			this.dgvTotal.SortOrderColumnName = null;
+			this.dgvTotal.TabIndex = 0;
+			this.dgvTotal.Tag = true;
+			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);
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Size = new System.Drawing.Size(648, 235);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "同步日志";
+			this.tabPage1.UseVisualStyleBackColor = true;
+			// 
+			// dgvLog
+			// 
+			this.dgvLog.AllowUserToAddRows = false;
+			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;
+			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;
+			this.dgvLog.ChildNodeColumnName = null;
+			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;
+			this.dgvLog.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvLog.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.logdate,
+            this.BeginTime,
+            this.EndTime,
+            this.DataCodeName,
+            this.DataStuts,
+            this.DataMSG,
+            this.synusercode,
+            this.logid,
+            this.datalogid,
+            this.DataCode,
+            this.ExecuteDateBegin,
+            this.ExecuteDateEnd});
+			this.dgvLog.ColumnTreeView = new System.Windows.Forms.TreeView[0];
+			this.dgvLog.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.dgvLog.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.dgvLog.DynamicColumnName = "";
+			this.dgvLog.EnableHeadersVisualStyles = false;
+			this.dgvLog.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvLog.FormatQuantityColumns = null;
+			this.dgvLog.HorizontalMergeColumn = null;
+			this.dgvLog.IsAutoCountSum = true;
+			this.dgvLog.IsAutoResizeColumns = false;
+			this.dgvLog.IsClickF12 = false;
+			this.dgvLog.IsOpenMergeCellFlag = false;
+			this.dgvLog.IsSubTotalFlag = false;
+			this.dgvLog.IsTopDeep = false;
+			this.dgvLog.Location = new System.Drawing.Point(0, 0);
+			this.dgvLog.MergeColumnNames = null;
+			this.dgvLog.MergeDetailColumnNames = null;
+			this.dgvLog.MergeDetailOnlyColumn = null;
+			this.dgvLog.MergeOnlyColumn = null;
+			this.dgvLog.MultiSelect = false;
+			this.dgvLog.Name = "dgvLog";
+			this.dgvLog.ReadOnly = true;
+			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;
+			this.dgvLog.RowTemplate.Height = 21;
+			this.dgvLog.Size = new System.Drawing.Size(648, 235);
+			this.dgvLog.SortOrderColumnName = null;
+			this.dgvLog.TabIndex = 1;
+			this.dgvLog.Tag = "";
+			this.dgvLog.TotalSumColumns = null;
+			this.dgvLog.ViewRowFilter = "";
+			this.dgvLog.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvLog_CellDoubleClick);
+			// 
+			// logdate
+			// 
+			this.logdate.DataPropertyName = "yyyymmdd";
+			dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.logdate.DefaultCellStyle = dataGridViewCellStyle52;
+			this.logdate.HeaderText = "同步日期";
+			this.logdate.Name = "logdate";
+			this.logdate.ReadOnly = true;
+			// 
+			// BeginTime
+			// 
+			this.BeginTime.DataPropertyName = "BeginTime";
+			dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle53.Format = "yyyy-MM-dd HH:mm:ss";
+			this.BeginTime.DefaultCellStyle = dataGridViewCellStyle53;
+			this.BeginTime.HeaderText = "开始时间";
+			this.BeginTime.Name = "BeginTime";
+			this.BeginTime.ReadOnly = true;
+			// 
+			// EndTime
+			// 
+			this.EndTime.DataPropertyName = "EndTime";
+			dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle54.Format = "yyyy-MM-dd HH:mm:ss";
+			this.EndTime.DefaultCellStyle = dataGridViewCellStyle54;
+			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";
+			dataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.DataStuts.DefaultCellStyle = dataGridViewCellStyle55;
+			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";
+			dataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle56.Format = "yyyy-MM-dd HH:mm:ss";
+			dataGridViewCellStyle56.NullValue = null;
+			this.ExecuteDateBegin.DefaultCellStyle = dataGridViewCellStyle56;
+			this.ExecuteDateBegin.HeaderText = "业务数据开始时间";
+			this.ExecuteDateBegin.Name = "ExecuteDateBegin";
+			this.ExecuteDateBegin.ReadOnly = true;
+			this.ExecuteDateBegin.Width = 120;
+			// 
+			// ExecuteDateEnd
+			// 
+			this.ExecuteDateEnd.DataPropertyName = "ExecuteDateEnd";
+			dataGridViewCellStyle57.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle57.Format = "yyyy-MM-dd HH:mm:ss";
+			this.ExecuteDateEnd.DefaultCellStyle = dataGridViewCellStyle57;
+			this.ExecuteDateEnd.HeaderText = "业务数据结束时间";
+			this.ExecuteDateEnd.Name = "ExecuteDateEnd";
+			this.ExecuteDateEnd.ReadOnly = true;
+			this.ExecuteDateEnd.Width = 120;
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(this.dgvSum);
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Size = new System.Drawing.Size(648, 235);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "同步明细";
+			this.tabPage2.UseVisualStyleBackColor = true;
+			// 
+			// dgvSum
+			// 
+			this.dgvSum.AllowUserToAddRows = false;
+			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;
+			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;
+			this.dgvSum.ChildNodeColumnName = null;
+			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;
+			this.dgvSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvSum.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.yyyymmdd,
+            this.goodscode,
+            this.sapcode,
+            this.usercode,
+            this.zscs,
+            this.ordercode,
+            this.orderitem,
+            this.outputnum,
+            this.ScrapNum,
+            this.CleanupNum,
+            this.recoverynum,
+            this.RepairNum,
+            this.testmouldflag,
+            this.ztype,
+            this.zmsg,
+            this.ZTIME});
+			this.dgvSum.ColumnTreeView = new System.Windows.Forms.TreeView[0];
+			this.dgvSum.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.dgvSum.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.dgvSum.DynamicColumnName = "";
+			this.dgvSum.EnableHeadersVisualStyles = false;
+			this.dgvSum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvSum.FormatQuantityColumns = null;
+			this.dgvSum.HorizontalMergeColumn = null;
+			this.dgvSum.IsAutoCountSum = true;
+			this.dgvSum.IsAutoResizeColumns = false;
+			this.dgvSum.IsClickF12 = false;
+			this.dgvSum.IsOpenMergeCellFlag = false;
+			this.dgvSum.IsSubTotalFlag = false;
+			this.dgvSum.IsTopDeep = false;
+			this.dgvSum.Location = new System.Drawing.Point(0, 0);
+			this.dgvSum.MergeColumnNames = null;
+			this.dgvSum.MergeDetailColumnNames = null;
+			this.dgvSum.MergeDetailOnlyColumn = null;
+			this.dgvSum.MergeOnlyColumn = null;
+			this.dgvSum.MultiSelect = false;
+			this.dgvSum.Name = "dgvSum";
+			this.dgvSum.ReadOnly = true;
+			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;
+			this.dgvSum.RowTemplate.Height = 21;
+			this.dgvSum.Size = new System.Drawing.Size(648, 235);
+			this.dgvSum.SortOrderColumnName = null;
+			this.dgvSum.TabIndex = 2;
+			this.dgvSum.Tag = "";
+			this.dgvSum.TotalSumColumns = null;
+			this.dgvSum.ViewRowFilter = "";
+			// 
+			// yyyymmdd
+			// 
+			this.yyyymmdd.DataPropertyName = "yyyymmdd";
+			dataGridViewCellStyle61.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.yyyymmdd.DefaultCellStyle = dataGridViewCellStyle61;
+			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;
+			// 
+			// zscs
+			// 
+			this.zscs.DataPropertyName = "zscs";
+			this.zscs.HeaderText = "注浆类型";
+			this.zscs.Name = "zscs";
+			this.zscs.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";
+			dataGridViewCellStyle62.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.outputnum.DefaultCellStyle = dataGridViewCellStyle62;
+			this.outputnum.HeaderText = "产量";
+			this.outputnum.Name = "outputnum";
+			this.outputnum.ReadOnly = true;
+			// 
+			// ScrapNum
+			// 
+			this.ScrapNum.DataPropertyName = "ScrapNum";
+			dataGridViewCellStyle63.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.ScrapNum.DefaultCellStyle = dataGridViewCellStyle63;
+			this.ScrapNum.HeaderText = "损坯";
+			this.ScrapNum.Name = "ScrapNum";
+			this.ScrapNum.ReadOnly = true;
+			// 
+			// CleanupNum
+			// 
+			this.CleanupNum.DataPropertyName = "CleanupNum";
+			dataGridViewCellStyle64.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.CleanupNum.DefaultCellStyle = dataGridViewCellStyle64;
+			this.CleanupNum.HeaderText = "清除";
+			this.CleanupNum.Name = "CleanupNum";
+			this.CleanupNum.ReadOnly = true;
+			// 
+			// recoverynum
+			// 
+			this.recoverynum.DataPropertyName = "recoverynum";
+			dataGridViewCellStyle65.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.recoverynum.DefaultCellStyle = dataGridViewCellStyle65;
+			this.recoverynum.HeaderText = "回收";
+			this.recoverynum.Name = "recoverynum";
+			this.recoverynum.ReadOnly = true;
+			// 
+			// RepairNum
+			// 
+			this.RepairNum.DataPropertyName = "RepairNum";
+			dataGridViewCellStyle66.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.RepairNum.DefaultCellStyle = dataGridViewCellStyle66;
+			this.RepairNum.HeaderText = "干补";
+			this.RepairNum.Name = "RepairNum";
+			this.RepairNum.ReadOnly = true;
+			// 
+			// testmouldflag
+			// 
+			this.testmouldflag.DataPropertyName = "testmouldflag";
+			this.testmouldflag.FalseValue = "0";
+			this.testmouldflag.HeaderText = "试验标识";
+			this.testmouldflag.IndeterminateValue = "0";
+			this.testmouldflag.Name = "testmouldflag";
+			this.testmouldflag.ReadOnly = true;
+			this.testmouldflag.TrueValue = "1";
+			// 
+			// ztype
+			// 
+			this.ztype.DataPropertyName = "ztype";
+			dataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.ztype.DefaultCellStyle = dataGridViewCellStyle67;
+			this.ztype.HeaderText = "同步状态";
+			this.ztype.Name = "ztype";
+			this.ztype.ReadOnly = true;
+			this.ztype.Visible = false;
+			// 
+			// zmsg
+			// 
+			this.zmsg.DataPropertyName = "zmsg";
+			this.zmsg.HeaderText = "同步消息";
+			this.zmsg.Name = "zmsg";
+			this.zmsg.ReadOnly = true;
+			this.zmsg.Visible = false;
+			// 
+			// ZTIME
+			// 
+			this.ZTIME.DataPropertyName = "ZTIME";
+			dataGridViewCellStyle68.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle68.Format = "yyyy-MM-dd HH:mm:ss";
+			this.ZTIME.DefaultCellStyle = dataGridViewCellStyle68;
+			this.ZTIME.HeaderText = "同步时间";
+			this.ZTIME.Name = "ZTIME";
+			this.ZTIME.ReadOnly = true;
+			this.ZTIME.Visible = false;
+			// 
+			// F_SAP_HEGII_0107
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(668, 357);
+			this.Controls.Add(this.tabControl1);
+			this.Controls.Add(this.grpCollapsible1);
+			this.Controls.Add(this.tsrToolStrip1);
+			this.Name = "F_SAP_HEGII_0107";
+			this.Text = "报工SAP日志";
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_SAP_HEGII_0107_FormClosed);
+			this.Load += new System.EventHandler(this.F_SAP_HEGII_0107_Load);
+			this.grpCollapsible1.ResumeLayout(false);
+			this.grpCollapsible1.PerformLayout();
+			this.tsrToolStrip1.ResumeLayout(false);
+			this.tsrToolStrip1.PerformLayout();
+			this.tabControl1.ResumeLayout(false);
+			this.tabPage3.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.dgvTotal)).EndInit();
+			this.tabPage1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.dgvLog)).EndInit();
+			this.tabPage2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.dgvSum)).EndInit();
+			this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Dongke.WinForm.Controls.TsrToolStrip tsrToolStrip1;
+        private System.Windows.Forms.ToolStripButton tsbtnSearch;
+        private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
+        private System.Windows.Forms.ToolStripButton tsbtnClose;
+        private WinForm.Controls.GrpCollapsible grpCollapsible1;
+        private WinForm.Controls.LblLabel lblLabel1;
+        private System.Windows.Forms.ToolStripButton tsbtnClearCondition;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private Basics.BaseControls.C_DataGridView dgvLog;
+        private System.Windows.Forms.DataGridViewTextBoxColumn logdate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BeginTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn EndTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DataCodeName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DataStuts;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DataMSG;
+        private System.Windows.Forms.DataGridViewTextBoxColumn synusercode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn logid;
+        private System.Windows.Forms.DataGridViewTextBoxColumn datalogid;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DataCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ExecuteDateBegin;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ExecuteDateEnd;
+        private Basics.BaseControls.C_DataGridView dgvSum;
+        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.DataGridViewCheckBoxColumn testmouldflag;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ztype;
+        private System.Windows.Forms.DataGridViewTextBoxColumn zmsg;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ZTIME;
+		private System.Windows.Forms.TabPage tabPage3;
+		private Basics.BaseControls.C_DataGridView dgvTotal;
+		private Basics.BaseControls.C_DateTimePicker dtpDatebegin;
+		private WinForm.Controls.LblLabel lblLabel2;
+		private Basics.BaseControls.C_DateTimePicker dtpDateend;
+		private System.Windows.Forms.DataGridViewTextBoxColumn DATACODETOTAL;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+		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;
+	}
+}

+ 320 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0107.cs

@@ -0,0 +1,320 @@
+/*******************************************************************************
+ * Copyright(c) 2016 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:F_SAP_HEGII_0107.cs
+ *      2.功能描述:成品SAP日志
+ * 编辑履历:
+ *      作者            日期                版本            修改内容
+ *      fy              2022/09/07          1.00            新建
+ *******************************************************************************/
+using System;
+using System.Data;
+using System.Reflection;
+using System.Windows.Forms;
+
+using Dongke.IBOSS.PRD.Basics.BaseControls;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.Client.Controls;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+
+namespace Dongke.IBOSS.PRD.Client.SAPDataModule
+{
+	/// <summary>
+	/// 成品SAP日志
+	/// </summary>
+	public partial class F_SAP_HEGII_0107 : DKDockPanelBase
+	{
+		#region 成员变量
+		private static F_SAP_HEGII_0107 _instance = null;
+		#endregion
+
+		#region 单例模式
+
+		/// <summary>
+		/// 单例模式,防止重复创建窗体
+		/// </summary>
+		public static F_SAP_HEGII_0107 Instance
+		{
+			get
+			{
+				if (_instance == null)
+				{
+					_instance = new F_SAP_HEGII_0107();
+				}
+				return _instance;
+			}
+		}
+
+		#endregion
+
+		#region 构造函数
+		/// <summary>
+		/// 成品SAP日志
+		/// </summary>
+		public F_SAP_HEGII_0107()
+		{
+			InitializeComponent();
+			this.Text = "报工同步日志";
+
+			this.tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
+			this.tsbtnClose.Text = ButtonText.TSBTN_CLOSE;
+
+			this.dgvLog.AutoGenerateColumns = false;
+			this.dgvSum.AutoGenerateColumns = false;
+			this.dgvTotal.AutoGenerateColumns = false;
+		}
+		#endregion
+
+		#region 控件事件
+		/// <summary>
+		/// 关闭
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_SAP_HEGII_0107_FormClosed(object sender, FormClosedEventArgs e)
+		{
+			_instance = null;
+		}
+
+		/// <summary>
+		/// 画面加载
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_SAP_HEGII_0107_Load(object sender, System.EventArgs e)
+		{
+			dgvLog.AutoGenerateColumns = false;
+
+			//update xiacm 2022-10-12
+			this.dtpDatebegin.Value = DateTime.Now.Date;
+			this.dtpDateend.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1);
+
+			//数据节点数据绑定 add xiacm 2022-10-12
+			DataTable DataCodeDt = new DataTable();
+			DataCodeDt.Columns.Add("DataCodeName",typeof(string));
+			DataCodeDt.Columns.Add("DataCode", typeof(string));
+			DataRow dr = DataCodeDt.NewRow();
+			dr["DataCodeName"] = "";
+			dr["DataCode"] = "-1";
+			DataCodeDt.Rows.InsertAt(dr, 0);
+			dr = DataCodeDt.NewRow();
+			dr["DataCodeName"] = "模具";
+			dr["DataCode"] = "10";
+			DataCodeDt.Rows.InsertAt(dr, 1);
+			dr = DataCodeDt.NewRow();
+			dr["DataCodeName"] = "湿坯";
+			dr["DataCode"] = "20";
+			DataCodeDt.Rows.InsertAt(dr, 2);
+			dr = DataCodeDt.NewRow();
+			dr["DataCodeName"] = "精坯";
+			dr["DataCode"] = "30";
+			DataCodeDt.Rows.InsertAt(dr, 3);
+			dr = DataCodeDt.NewRow();
+			dr["DataCodeName"] = "釉坯";
+			dr["DataCode"] = "40";
+			DataCodeDt.Rows.InsertAt(dr, 4);
+			dr = DataCodeDt.NewRow();
+			dr["DataCodeName"] = "烧成";
+			dr["DataCode"] = "50";
+			DataCodeDt.Rows.InsertAt(dr, 5);
+			dr = DataCodeDt.NewRow();
+			dr["DataCodeName"] = "成品";
+			dr["DataCode"] = "60";
+			DataCodeDt.Rows.InsertAt(dr, 6);
+			this.CBDataCode.DisplayMember = "DataCodeName";
+			this.CBDataCode.ValueMember = "DataCode";
+			this.CBDataCode.DataSource = DataCodeDt;
+			this.CBDataCode.SelectedValue = "-1";
+		}
+
+		/// <summary>
+		/// 查询
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnSearch_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				//this.dgvLog.DataSource = null;
+				this.QueryDataFromOther();
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+
+		/// <summary>
+		/// 清除条件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		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.CBDataCode.SelectedValue = "-1";
+		}
+
+		/// <summary>
+		/// 自适应列宽
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnAdaptive_Click(object sender, EventArgs e)
+		{
+			this.dgvLog.AutoResizeColumns();
+			this.dgvSum.AutoResizeColumns();
+			this.dgvTotal.AutoResizeColumns();//add xiacm 2022-10-12
+		}
+
+		/// <summary>
+		/// 关闭画面
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnClose_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		/// <summary>
+		/// 查询同步明细
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void dgvLog_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+		{
+			if (e.RowIndex < 0 || this.dgvLog.CurrentRow == null)
+			{
+				return;
+			}
+			try
+			{
+				DataGridViewRow dgvr = this.dgvLog.CurrentRow;
+				this.dgvSum.DataSource = null;
+				ClientRequestEntity cre = new ClientRequestEntity();
+				cre.NameSpace = "Hegii";
+				cre.Name = "GetWorkData_BG";
+				cre.Request = dgvr.Cells["logid"].Value;
+
+				ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
+					{
+						return SAPDataModuleProxy.Service.DoRequest(cre);
+					}
+				);
+
+				if (sre.Status == Constant.ServiceResultStatus.Success)
+				{
+					// 查询成功
+					this.dgvSum.DataSource = sre.Data.Tables[0];
+				}
+				this.tabControl1.SelectedIndex = 2;
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+		#endregion
+
+		#region 私有方法
+
+		/// <summary>
+		/// 查询数据
+		/// </summary>
+		private void QueryDataFromOther()
+		{
+			if (this.dtpDatebegin.Value == null ||
+				this.dtpDateend.Value == null)
+			{
+				return;
+			}
+			try
+			{
+				this.tsrToolStrip1.Focus();
+				int Indexed = this.tabControl1.SelectedIndex;
+				string datacode = this.CBDataCode.SelectedValue.ToString();//数据节点
+				ClientRequestEntity cre = new ClientRequestEntity();
+				cre.Properties["datebegin"] = this.dtpDatebegin.Value;
+				cre.Properties["dateend"] = this.dtpDateend.Value.AddMilliseconds(1);
+				cre.Properties["datacode"] = datacode;
+				cre.NameSpace = "Hegii";
+				if (Indexed == 0)//报工汇总
+				{
+					cre.Properties["datebegin"] = this.dtpDatebegin.Value;
+					cre.Properties["dateend"] = Convert.ToDateTime( this.dtpDateend.Value).AddSeconds(1);
+					this.dgvTotal.DataSource = null;
+					cre.Name = "GetDataLogTotal_BG";
+				}
+				else if (Indexed == 1)//同步日志
+				{
+					this.dgvLog.DataSource = null;
+					cre.Name = "GetDataLog_BG";
+				}
+				else//同步明细
+				{
+					this.dgvSum.DataSource = null;
+					cre.Name = "GetWorkData_BG";
+				}
+
+				ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
+					{
+						return SAPDataModuleProxy.Service.DoRequest(cre);
+					}
+				);
+
+				if (sre.Status == Constant.ServiceResultStatus.Success)
+				{
+					if (Indexed == 0)//报工汇总
+					{
+						// 查询成功
+						this.dgvTotal.DataSource = sre.Data.Tables[0];
+						if(this.dgvTotal.RowCount ==0)
+						{
+							DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_001);
+						}
+					}
+					else if (Indexed == 1)
+					{
+						// 查询成功
+						this.dgvLog.DataSource = sre.Data.Tables[0];
+						// this.tabControl1.SelectedIndex = 0;
+						if (this.dgvLog.RowCount == 0)
+						{
+							DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_001);
+						}
+					}
+					else
+					{
+						// 查询成功
+						this.dgvSum.DataSource = sre.Data.Tables[0];
+						if (this.dgvSum.RowCount == 0)
+						{
+							DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_001);
+						}
+					}
+
+				}
+			}
+			catch (Exception ex)
+			{
+				throw ex;
+			}
+		}
+		#endregion
+
+		private void lblLabel2_Click(object sender, EventArgs e)
+		{
+
+		}
+	}
+}

+ 234 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0107.resx

@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tsrToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="DATACODETOTAL.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column7.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>
+  <metadata name="BeginTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="EndTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataStuts.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataMSG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="synusercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="logid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="datalogid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DataCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ExecuteDateBegin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ExecuteDateEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="yyyymmdd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="goodscode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sapcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <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>
+  <metadata name="orderitem.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="outputnum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ScrapNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CleanupNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="recoverynum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="RepairNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="testmouldflag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ztype.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="zmsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ZTIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>39</value>
+  </metadata>
+</root>

+ 9 - 0
DK.Client/SAPDataModule/SAPDataModule.csproj

@@ -104,6 +104,12 @@
     <Compile Include="Hegii\F_SAP_HEGII_0104.Designer.cs">
       <DependentUpon>F_SAP_HEGII_0104.cs</DependentUpon>
     </Compile>
+    <Compile Include="Hegii\F_SAP_HEGII_0107.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Hegii\F_SAP_HEGII_0107.Designer.cs">
+      <DependentUpon>F_SAP_HEGII_0107.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -164,6 +170,9 @@
     <EmbeddedResource Include="Hegii\F_SAP_HEGII_0104.resx">
       <DependentUpon>F_SAP_HEGII_0104.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Hegii\F_SAP_HEGII_0107.resx">
+      <DependentUpon>F_SAP_HEGII_0107.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 303 - 166
DK.Service/SAPDataService/SAPDataLogicPartial.cs

@@ -1056,12 +1056,14 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
                     "    on u.userid = dl.createuserid\n" +
                     " where dl.logtype IN('2','3')\n" +
                     "   and dl.yyyymmdd >= :DATEBEGIN\n" +
-                    "   and dl.yyyymmdd <= :DATEEND\n";
+                    "   and dl.yyyymmdd < :DATEEND\n" +
+                     "   and (-1= :DATACODE or dl.datacode=:DATACODE )";//add xiacm 2022-10-12
 
                 OracleParameter[] oracleParameter = new OracleParameter[]
                 {
                     new OracleParameter(":DATEBEGIN",OracleDbType.Varchar2, cre.Properties["datebegin"], ParameterDirection.Input),
                     new OracleParameter(":DATEEND",OracleDbType.Varchar2, cre.Properties["dateend"], ParameterDirection.Input),
+                    new OracleParameter(":DATACODE",OracleDbType.Varchar2, cre.Properties["datacode"], ParameterDirection.Input),
                 };
 
                 sqlString += "ORDER BY dl.logid DESC\n";
@@ -1081,12 +1083,13 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
         /// <param name="logid"></param>
         /// <param name="userInfo"></param>
         /// <returns></returns>
-        public static ServiceResultEntity GetWorkData_BG(int logid)
+        public static ServiceResultEntity GetWorkData_BG(ClientRequestEntity cre)
         {
             IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
             ServiceResultEntity sre = new ServiceResultEntity();
             try
             {
+                int logid = Convert.ToInt32(cre.Request);
                 string sqlString = "\n" +
                 "select wd.yyyymmdd\n" +
                 "      ,wd.workcode\n" +
@@ -1111,12 +1114,24 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
                 "      ,wd.logid\n" +
                 "  from tsap_hegii_workdata_BG wd\n" +
                 " inner join tsap_hegii_datacode dc\n" +
-                "    on dc.datacode = wd.datacode\n" +
-                " where wd.logid = :logid \n" +
-                " order by wd.goodscode,wd.sapcode,wd.usercode,wd.ordercode,wd.outputnum \n";
+                "    on dc.datacode = wd.datacode\n";
+               //update xiacm 2022-10-17
+                if (logid > 0)
+                {
+                    sqlString += " where wd.logid = :logid \n";
+                }
+                else
+                {
+                    sqlString += " where dl.executedatebegin >= :DATEBEGIN and dl.executedateend < :DATEEND";
+                    sqlString += " and (-1= :DATACODE OR wd.datacode = :DATACODE)";
+                }
+                sqlString += " order by wd.goodscode,wd.sapcode,wd.usercode,wd.ordercode,wd.outputnum \n";
                 OracleParameter[] oracleParameter = new OracleParameter[]
                 {
-                    new OracleParameter(":logid",OracleDbType.Int32, logid, ParameterDirection.Input),
+                   new OracleParameter(":logid",OracleDbType.Int32, logid, ParameterDirection.Input),
+                    new OracleParameter(":DATEBEGIN",OracleDbType.Date, cre.Properties["datebegin"], ParameterDirection.Input),
+                    new OracleParameter(":DATEEND",OracleDbType.Date, cre.Properties["dateend"], ParameterDirection.Input),
+                    new OracleParameter(":DATACODE",OracleDbType.Varchar2, cre.Properties["datacode"], ParameterDirection.Input),
                 };
 
                 sre.Data = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -1127,6 +1142,128 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
                 throw ex;
             }
         }
+
+        /// <summary>
+        /// 报工汇总 add xiacm 2022-10-12
+        /// </summary>
+        /// <param name="cre"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetDataLogTotal_BG(ClientRequestEntity cre)
+        {
+            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+
+            ServiceResultEntity sre = new ServiceResultEntity();
+
+            try
+            {
+
+                string sqlString =
+                            "SELECT T1.DATACODE,\n" +
+                            "       T1.Actualoutput,\n" +
+                            "       T2.*\n" +
+                            "  FROM (\n" +
+                            "        -- 业务数据汇总\n" +
+                            "        -- 10\n" +
+                            "        SELECT '10' AS DATACODE,\n" +
+                            "                SUM(DECODE(MHH.OPERATIONTYPE, 1, M.STANDARDGROUTINGSUM, 0)) AS Actualoutput\n" +
+                            "          FROM (SELECT MH.GOODSID,\n" +
+                            "                        MH.MOULDID,\n" +
+                            "                        MH.OPERATIONTYPE,\n" +
+                            "                        MH.GROUTINGNUM\n" +
+                            "                   FROM TP_PC_MOULDCHANGEHISTORY MH\n" +
+                            "                  WHERE MH.OPERATIONTYPE IN (1, 2, 3, 9, 11, -1)\n" +
+                            "                    AND MH.CREATETIME >= :DATEBEGIN\n" +
+                            "                    AND MH.CREATETIME < :DATEEND\n" +
+                            "                 UNION ALL\n" +
+                            "                 SELECT MH.GOODSIDAFTER,\n" +
+                            "                        MH.MOULDID,\n" +
+                            "                        0,\n" +
+                            "                        MH.GROUTINGNUM\n" +
+                            "                   FROM TP_PC_MOULDCHANGEHISTORY MH\n" +
+                            "                  WHERE MH.OPERATIONTYPE = -1\n" +
+                            "                    AND MH.CREATETIME >= :DATEBEGIN\n" +
+                            "                    AND MH.CREATETIME < :DATEEND) MHH\n" +
+                            "         INNER JOIN TP_PC_MOULD M\n" +
+                            "            ON M.MOULDID = MHH.MOULDID\n" +
+                            "        UNION ALL\n" +
+                            "        -- 20\n" +
+                            "        SELECT '20' AS DATACODE,\n" +
+                            "                COUNT(1) AS Businessoutput\n" +
+                            "          FROM TP_PM_GROUTINGDAILYDETAIL GDD\n" +
+                            "          LEFT JOIN TP_MST_GOODS G\n" +
+                            "            ON GDD.GOODSID = G.GOODSID\n" +
+                            "         WHERE GDD.CREATETIME >= :DATEBEGIN\n" +
+                            "           AND GDD.CREATETIME < :DATEEND\n" +
+                            "           AND GDD.GROUTINGFLAG = '1'\n" +
+                            "           AND G.SCRAPSUMFLAG = '1'\n" +
+                            "        UNION ALL\n" +
+                            "        -- 30\n" +
+                            "        SELECT '30' AS DATACODE,\n" +
+                            "                COUNT(DISTINCT P.BARCODE) AS Businessoutput\n" +
+                            "          FROM TP_PM_PRODUCTIONDATA P\n" +
+                            "         WHERE ((P.PROCEDUREID = 53 AND P.VALUEFLAG = 1) OR (P.PROCEDUREID = 97 AND P.VALUEFLAG = 1))\n" +
+                            "           AND P.CREATETIME >= :DATEBEGIN\n" +
+                            "           AND P.CREATETIME < :DATEEND\n" +
+                            "        UNION ALL\n" +
+                            "        -- 40\n" +
+                            "        SELECT '40' AS DATACODE,\n" +
+                            "                COUNT(DISTINCT P.BARCODE) AS Businessoutput\n" +
+                            "          FROM TP_PM_PRODUCTIONDATA P\n" +
+                            "         WHERE ((P.PROCEDUREID = 65 AND P.VALUEFLAG = 1) OR (P.PROCEDUREID = 99 AND P.VALUEFLAG = 1))\n" +
+                            "           AND P.CREATETIME >= :DATEBEGIN\n" +
+                            "           AND P.CREATETIME < :DATEEND\n" +
+                            "        UNION ALL\n" +
+                            "        -- 50\n" +
+                            "        SELECT '50' AS DATACODE,\n" +
+                            "                COUNT(DISTINCT P.BARCODE) AS Businessoutput\n" +
+                            "          FROM TP_PM_PRODUCTIONDATA P\n" +
+                            "         WHERE ((P.PROCEDUREID = 11 AND P.VALUEFLAG = 1) OR\n" +
+                            "               (P.PROCEDUREID = 104 AND P.CHECKFLAG = 1 AND P.ISREFIRE = 0))\n" +
+                            "           AND P.CREATETIME >= :DATEBEGIN\n" +
+                            "           AND P.CREATETIME < :DATEEND\n" +
+                            "        UNION ALL\n" +
+                            "        -- 60\n" +
+                            "        SELECT '60' AS DATACODE,\n" +
+                            "                COUNT(1) AS Businessoutput\n" +
+                            "          FROM TP_PM_FINISHEDPRODUCT GH\n" +
+                            "         WHERE GH.FHTIME >= :DATEBEGIN\n" +
+                            "           AND GH.FHTIME < :DATEEND) T1\n" +
+                            "  LEFT JOIN (\n" +
+                            "             -- 当日推送日志数据汇总\n" +
+                            "             SELECT DATACODE AS DATACODETD,\n" +
+                            "                     SUM(TO_NUMBER(OUTPUTNUM)) AS output,\n" +
+                            "                     SUM(TO_NUMBER(SCRAPNUM)) AS scrapnum,\n" +
+                            "                     SUM(TO_NUMBER(CLEANUPNUM)) AS cleannupnum,\n" +
+                            "                     SUM(TO_NUMBER(RECOVERYNUM)) AS recoverynum,\n" +
+                            "                     SUM(TO_NUMBER(REPAIRNUM)) AS repairnum\n" +
+                            "               FROM TSAP_HEGII_WORKDATA_BG\n" +
+                            "              WHERE LOGID IN (SELECT LOGID\n" +
+                            "                                FROM TSAP_HEGII_DATALOG_BG T\n" +
+                            "                               WHERE DATASTUTS = 'S'\n" +
+                            "                                 AND EXECUTEDATEBEGIN >= :DATEBEGIN\n" +
+                            "                                 AND EXECUTEDATEEND <= :DATEEND)\n" +
+                            "              GROUP BY DATACODE\n" +
+                            "              ORDER BY DATACODE) T2\n" +
+                            "    ON T2.DATACODETD = T1.DATACODE\n" +
+                            "  where (-1=:DATACODE OR T1.DATACODE= :DATACODE)\n" +
+                            " ORDER BY T1.DATACODE";
+                OracleParameter[] oracleParameter = new OracleParameter[]
+               {
+                    new OracleParameter(":DATEBEGIN",OracleDbType.Date, cre.Properties["datebegin"], ParameterDirection.Input),
+                    new OracleParameter(":DATEEND",OracleDbType.Date, cre.Properties["dateend"], ParameterDirection.Input),
+                    new OracleParameter(":DATACODE",OracleDbType.Varchar2, cre.Properties["datacode"], ParameterDirection.Input),
+               };
+
+                sre.Data = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
+                return sre;
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
         #endregion
 
         #region 报工移库
@@ -1176,16 +1313,16 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
         //        // WHERE LOGID = :LOGID ";
         //        sqlString = @"SELECT
         //                        A.WERKS,
-	       //                     A.MATNR,
-	       //                     A.ZJDNU,
-	       //                     -- A.ZSCS,
-	       //                     'T' AS ZSCS,
-	       //                     A.ZSCCJ,
-	       //                     A.ZSCMS,
-	       //                     A.CHARG,
-	       //                     A.MENGE,
-	       //                     A.ZMLID,
-	       //                     to_char(B.EXECUTEDATEBEGIN, 'yyyymmddhh24miss') AS ZYWKS,
+        //                     A.MATNR,
+        //                     A.ZJDNU,
+        //                     -- A.ZSCS,
+        //                     'T' AS ZSCS,
+        //                     A.ZSCCJ,
+        //                     A.ZSCMS,
+        //                     A.CHARG,
+        //                     A.MENGE,
+        //                     A.ZMLID,
+        //                     to_char(B.EXECUTEDATEBEGIN, 'yyyymmddhh24miss') AS ZYWKS,
         //                        to_char(B.EXECUTEDATEEND, 'yyyymmddhh24miss' ) AS ZYWJS,
         //                        to_char(SYSDATE, 'yyyymmdd' ) AS ZBUDAT,
         //                        to_char(SYSDATE, 'yyyymmddhh24miss' ) AS ZMONT,
@@ -1272,164 +1409,164 @@ namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
         //                        to_char(SYSDATE, 'yyyymmdd' ) AS ZBUDAT,
         //                        to_char(SYSDATE, 'yyyymmddhh24miss' ) AS ZMONT FROM (
         //                SELECT
-	       //                 T.MATNR,
-	       //                 '30' AS ZJDNU,
-	       //                 G.GOODS_LINE_CODE AS ZSCS,
-	       //                 '2' AS ZSCCJ,
-	       //                 T.ZSCMS,
-	       //                 TO_CHAR( SYSDATE, 'yyyymm' ) AS CHARG,
-	       //                 SUM( T.MENGE ) AS MENGE,
-	       //                 '3' AS ZMLID 
+        //                 T.MATNR,
+        //                 '30' AS ZJDNU,
+        //                 G.GOODS_LINE_CODE AS ZSCS,
+        //                 '2' AS ZSCCJ,
+        //                 T.ZSCMS,
+        //                 TO_CHAR( SYSDATE, 'yyyymm' ) AS CHARG,
+        //                 SUM( T.MENGE ) AS MENGE,
+        //                 '3' AS ZMLID 
         //                FROM
-	       //                 (-- 3-3线上施釉(3)到3#刮登(99)
-	       //                 SELECT
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE AS MATNR,
-		      //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
-		      //                  COUNT( 1 ) AS MENGE 
-	       //                 FROM
-		      //                  TP_PM_PRODUCTIONDATA PD1
-		      //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
-	       //                 WHERE
-		      //                  PD1.CREATETIME >= :V_DATEBEGIN 
-		      //                  AND PD1.CREATETIME < :IN_DATEEND 
-		      //                  AND PD1.PROCEDUREID = 99 
-		      //                  AND PD1.VALUEFLAG = '1' 
-		      //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 3 ) 
-	       //                 GROUP BY
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE,
-		      //                  GDD.TESTMOULDFLAG UNION ALL-- 3-3线上施釉(3)到3#刮登(99)撤销了的
-	       //                 SELECT
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE AS MATNR,
-		      //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
-		      //                  - COUNT( 1 ) AS MENGE 
-	       //                 FROM
-		      //                  TP_PM_PRODUCTIONDATA PD1
-		      //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
-	       //                 WHERE
-		      //                  PD1.BACKOUTTIME >= :V_DATEBEGIN 
-		      //                  AND PD1.BACKOUTTIME < :IN_DATEEND 
-		      //                  AND PD1.PROCEDUREID = 99 
-		      //                  AND PD1.VALUEFLAG = '0' 
-		      //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 3 ) 
-	       //                 GROUP BY
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE,
-		      //                  GDD.TESTMOULDFLAG 
-	       //                 ) T
-	       //                 LEFT JOIN TP_MST_GOODS G ON G.GOODSID = T.GOODSID 
+        //                 (-- 3-3线上施釉(3)到3#刮登(99)
+        //                 SELECT
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE AS MATNR,
+        //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
+        //                  COUNT( 1 ) AS MENGE 
+        //                 FROM
+        //                  TP_PM_PRODUCTIONDATA PD1
+        //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
+        //                 WHERE
+        //                  PD1.CREATETIME >= :V_DATEBEGIN 
+        //                  AND PD1.CREATETIME < :IN_DATEEND 
+        //                  AND PD1.PROCEDUREID = 99 
+        //                  AND PD1.VALUEFLAG = '1' 
+        //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 3 ) 
+        //                 GROUP BY
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE,
+        //                  GDD.TESTMOULDFLAG UNION ALL-- 3-3线上施釉(3)到3#刮登(99)撤销了的
+        //                 SELECT
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE AS MATNR,
+        //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
+        //                  - COUNT( 1 ) AS MENGE 
+        //                 FROM
+        //                  TP_PM_PRODUCTIONDATA PD1
+        //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
+        //                 WHERE
+        //                  PD1.BACKOUTTIME >= :V_DATEBEGIN 
+        //                  AND PD1.BACKOUTTIME < :IN_DATEEND 
+        //                  AND PD1.PROCEDUREID = 99 
+        //                  AND PD1.VALUEFLAG = '0' 
+        //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 3 ) 
+        //                 GROUP BY
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE,
+        //                  GDD.TESTMOULDFLAG 
+        //                 ) T
+        //                 LEFT JOIN TP_MST_GOODS G ON G.GOODSID = T.GOODSID 
         //                GROUP BY
-	       //                 T.MATNR,
-	       //                 T.ZSCMS,
-	       //                 G.GOODS_LINE_CODE UNION ALL
+        //                 T.MATNR,
+        //                 T.ZSCMS,
+        //                 G.GOODS_LINE_CODE UNION ALL
         //                SELECT
-	       //                 T.MATNR,
-	       //                 '40' AS ZJDNU,
-	       //                 G.GOODS_LINE_CODE AS ZSCS,
-	       //                 '2' AS ZSCCJ,
-	       //                 T.ZSCMS,
-	       //                 TO_CHAR( SYSDATE, 'yyyymm' ) AS CHARG,
-	       //                 SUM( T.MENGE ) AS MENGE,
-	       //                 '3' AS ZMLID 
+        //                 T.MATNR,
+        //                 '40' AS ZJDNU,
+        //                 G.GOODS_LINE_CODE AS ZSCS,
+        //                 '2' AS ZSCCJ,
+        //                 T.ZSCMS,
+        //                 TO_CHAR( SYSDATE, 'yyyymm' ) AS CHARG,
+        //                 SUM( T.MENGE ) AS MENGE,
+        //                 '3' AS ZMLID 
         //                FROM
-	       //                 (-- 3#卸窑(103)到7-1成检出窑交接(11)
-	       //                 SELECT
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE AS MATNR,
-		      //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
-		      //                  COUNT( 1 ) AS MENGE 
-	       //                 FROM
-		      //                  TP_PM_PRODUCTIONDATA PD1
-		      //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
-	       //                 WHERE
-		      //                  PD1.CREATETIME >= :V_DATEBEGIN 
-		      //                  AND PD1.CREATETIME < :IN_DATEEND 
-		      //                  AND PD1.PROCEDUREID = 11 
-		      //                  AND PD1.VALUEFLAG = '1' 
-		      //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 103 ) 
-	       //                 GROUP BY
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE,
-		      //                  GDD.TESTMOULDFLAG UNION ALL-- 3-3线上施釉(3)到3#刮登(99)撤销了的
-	       //                 SELECT
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE AS MATNR,
-		      //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
-		      //                  - COUNT( 1 ) AS MENGE 
-	       //                 FROM
-		      //                  TP_PM_PRODUCTIONDATA PD1
-		      //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
-	       //                 WHERE
-		      //                  PD1.BACKOUTTIME >= :V_DATEBEGIN 
-		      //                  AND PD1.BACKOUTTIME < :IN_DATEEND 
-		      //                  AND PD1.PROCEDUREID = 11 
-		      //                  AND PD1.VALUEFLAG = '0' 
-		      //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 103 ) 
-	       //                 GROUP BY
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE,
-		      //                  GDD.TESTMOULDFLAG 
-	       //                 ) T
-	       //                 LEFT JOIN TP_MST_GOODS G ON G.GOODSID = T.GOODSID 
+        //                 (-- 3#卸窑(103)到7-1成检出窑交接(11)
+        //                 SELECT
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE AS MATNR,
+        //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
+        //                  COUNT( 1 ) AS MENGE 
+        //                 FROM
+        //                  TP_PM_PRODUCTIONDATA PD1
+        //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
+        //                 WHERE
+        //                  PD1.CREATETIME >= :V_DATEBEGIN 
+        //                  AND PD1.CREATETIME < :IN_DATEEND 
+        //                  AND PD1.PROCEDUREID = 11 
+        //                  AND PD1.VALUEFLAG = '1' 
+        //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 103 ) 
+        //                 GROUP BY
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE,
+        //                  GDD.TESTMOULDFLAG UNION ALL-- 3-3线上施釉(3)到3#刮登(99)撤销了的
+        //                 SELECT
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE AS MATNR,
+        //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
+        //                  - COUNT( 1 ) AS MENGE 
+        //                 FROM
+        //                  TP_PM_PRODUCTIONDATA PD1
+        //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
+        //                 WHERE
+        //                  PD1.BACKOUTTIME >= :V_DATEBEGIN 
+        //                  AND PD1.BACKOUTTIME < :IN_DATEEND 
+        //                  AND PD1.PROCEDUREID = 11 
+        //                  AND PD1.VALUEFLAG = '0' 
+        //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 103 ) 
+        //                 GROUP BY
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE,
+        //                  GDD.TESTMOULDFLAG 
+        //                 ) T
+        //                 LEFT JOIN TP_MST_GOODS G ON G.GOODSID = T.GOODSID 
         //                GROUP BY
-	       //                 T.MATNR,
-	       //                 T.ZSCMS,
-	       //                 G.GOODS_LINE_CODE UNION ALL
+        //                 T.MATNR,
+        //                 T.ZSCMS,
+        //                 G.GOODS_LINE_CODE UNION ALL
         //                SELECT
-	       //                 T.MATNR,
-	       //                 '40' AS ZJDNU,
-	       //                 G.GOODS_LINE_CODE AS ZSCS,
-	       //                 '3' AS ZSCCJ,
-	       //                 T.ZSCMS,
-	       //                 TO_CHAR( SYSDATE, 'yyyymm' ) AS CHARG,
-	       //                 SUM( T.MENGE ) AS MENGE,
-	       //                 '2' AS ZMLID 
+        //                 T.MATNR,
+        //                 '40' AS ZJDNU,
+        //                 G.GOODS_LINE_CODE AS ZSCS,
+        //                 '3' AS ZSCCJ,
+        //                 T.ZSCMS,
+        //                 TO_CHAR( SYSDATE, 'yyyymm' ) AS CHARG,
+        //                 SUM( T.MENGE ) AS MENGE,
+        //                 '2' AS ZMLID 
         //                FROM
-	       //                 (-- 6-1卸窑(10)到3#成检交接(104)
-	       //                 SELECT
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE AS MATNR,
-		      //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
-		      //                  COUNT( 1 ) AS MENGE 
-	       //                 FROM
-		      //                  TP_PM_PRODUCTIONDATA PD1
-		      //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
-	       //                 WHERE
-		      //                  PD1.CREATETIME >= :V_DATEBEGIN 
-		      //                  AND PD1.CREATETIME < :IN_DATEEND 
-		      //                  AND PD1.PROCEDUREID = 104 
-		      //                  AND PD1.VALUEFLAG = '1' 
-		      //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 10 ) 
-	       //                 GROUP BY
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE,
-		      //                  GDD.TESTMOULDFLAG UNION ALL-- 6-1卸窑(10)到3#成检交接(104)撤销了的
-	       //                 SELECT
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE AS MATNR,
-		      //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
-		      //                  - COUNT( 1 ) AS MENGE 
-	       //                 FROM
-		      //                  TP_PM_PRODUCTIONDATA PD1
-		      //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
-	       //                 WHERE
-		      //                  PD1.BACKOUTTIME >= :V_DATEBEGIN 
-		      //                  AND PD1.BACKOUTTIME < :IN_DATEEND 
-		      //                  AND PD1.PROCEDUREID = 104 
-		      //                  AND PD1.VALUEFLAG = '0' 
-		      //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 10 ) 
-	       //                 GROUP BY
-		      //                  GDD.GOODSID,
-		      //                  GDD.MATERIALCODE,
-		      //                  GDD.TESTMOULDFLAG 
-	       //                 ) T
-	       //                 LEFT JOIN TP_MST_GOODS G ON G.GOODSID = T.GOODSID 
+        //                 (-- 6-1卸窑(10)到3#成检交接(104)
+        //                 SELECT
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE AS MATNR,
+        //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
+        //                  COUNT( 1 ) AS MENGE 
+        //                 FROM
+        //                  TP_PM_PRODUCTIONDATA PD1
+        //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
+        //                 WHERE
+        //                  PD1.CREATETIME >= :V_DATEBEGIN 
+        //                  AND PD1.CREATETIME < :IN_DATEEND 
+        //                  AND PD1.PROCEDUREID = 104 
+        //                  AND PD1.VALUEFLAG = '1' 
+        //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 10 ) 
+        //                 GROUP BY
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE,
+        //                  GDD.TESTMOULDFLAG UNION ALL-- 6-1卸窑(10)到3#成检交接(104)撤销了的
+        //                 SELECT
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE AS MATNR,
+        //                  DECODE( GDD.TESTMOULDFLAG, '1', 'Y', 'C' ) AS ZSCMS,
+        //                  - COUNT( 1 ) AS MENGE 
+        //                 FROM
+        //                  TP_PM_PRODUCTIONDATA PD1
+        //                  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = PD1.GROUTINGDAILYDETAILID 
+        //                 WHERE
+        //                  PD1.BACKOUTTIME >= :V_DATEBEGIN 
+        //                  AND PD1.BACKOUTTIME < :IN_DATEEND 
+        //                  AND PD1.PROCEDUREID = 104 
+        //                  AND PD1.VALUEFLAG = '0' 
+        //                  AND EXISTS ( SELECT 1 FROM TP_PM_PRODUCTIONDATA PD2 WHERE PD2.BARCODE = PD1.BARCODE AND PD2.PROCEDUREID = 10 ) 
+        //                 GROUP BY
+        //                  GDD.GOODSID,
+        //                  GDD.MATERIALCODE,
+        //                  GDD.TESTMOULDFLAG 
+        //                 ) T
+        //                 LEFT JOIN TP_MST_GOODS G ON G.GOODSID = T.GOODSID 
         //                GROUP BY
-	       //                 T.MATNR,
-	       //                 T.ZSCMS,
-	       //                 G.GOODS_LINE_CODE
+        //                 T.MATNR,
+        //                 T.ZSCMS,
+        //                 G.GOODS_LINE_CODE
         //                ) WHERE MENGE > 0";
 
         //        OracleParameter[] paras = new OracleParameter[]

+ 4 - 1
DK.Service/SAPDataService/SAPHegiiDataService.csproj

@@ -73,7 +73,10 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Utilities, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
+    <Reference Include="Utilities, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DLL\Utilities.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />

+ 396 - 0
DK.Service/WMSDataService/WMSDataLogic.cs

@@ -510,5 +510,401 @@ namespace Dongke.IBOSS.PRD.Service.WMSDataService
                 throw ex;
             }
         }
+
+        /// <summary>
+        /// 查询同步日志
+        /// </summary>
+        /// <param name="cre"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetDataLog_BG(ClientRequestEntity cre)
+        {
+            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+
+            ServiceResultEntity sre = new ServiceResultEntity();
+            try
+            {
+                string sqlString =
+                    "select dl.logid\n" +
+                    "      ,dl.logtype\n" +
+                    "      ,dl.begintime\n" +
+                    "      ,dl.endtime\n" +
+                    "      ,dl.yyyymmdd\n" +
+                    "      ,dl.workcode\n" +
+                    "      ,dl.datacode\n" +
+                    "      ,dc.datacodename\n" +
+                    "      ,dl.datastuts\n" +
+                    "      ,dl.datamsg\n" +
+                    "      ,dl.datalogid\n" +
+                    "      ,dl.executedatebegin\n" +
+                    "      ,dl.executedateend\n" +
+                    "      ,u.usercode synusercode\n" +
+                    "  from TSAP_HEGII_DATALOG_BG dl\n" +
+                    " inner join tsap_hegii_datacode dc\n" +
+                    "    on dc.datacode = dl.datacode\n" +
+                    "  left join tp_mst_user u\n" +
+                    "    on u.userid = dl.createuserid\n" +
+                    " where dl.logtype IN('2','3')\n" +
+                    "   and dl.yyyymmdd >= :DATEBEGIN\n" +
+                    "   and dl.yyyymmdd < :DATEEND\n" +
+                     "   and (-1= :DATACODE or dl.datacode=:DATACODE )";//add xiacm 2022-10-12
+
+                OracleParameter[] oracleParameter = new OracleParameter[]
+                {
+                    new OracleParameter(":DATEBEGIN",OracleDbType.Varchar2, cre.Properties["datebegin"], ParameterDirection.Input),
+                    new OracleParameter(":DATEEND",OracleDbType.Varchar2, cre.Properties["dateend"], ParameterDirection.Input),
+                    new OracleParameter(":DATACODE",OracleDbType.Varchar2, cre.Properties["datacode"], ParameterDirection.Input),
+                };
+
+                sqlString += "ORDER BY dl.logid DESC\n";
+
+                sre.Data = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 查询同步明细
+        /// </summary>
+        /// <param name="logid"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetWorkData_BG(ClientRequestEntity cre)
+        {
+            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+            ServiceResultEntity sre = new ServiceResultEntity();
+            try
+            {
+                int logid = Convert.ToInt32(cre.Request);
+                string sqlString = "\n" +
+                "select wd.yyyymmdd\n" +
+                "      ,wd.workcode\n" +
+                "      ,wd.datacode\n" +
+                "      ,dc.datacodename\n" +
+                "      ,wd.goodscode\n" +
+                "      ,wd.sapcode\n" +
+                "      ,wd.usercode\n" +
+                "      ,wd.ordercode\n" +
+                "      ,wd.orderitem\n" +
+                "      ,to_number(wd.outputnum) outputnum\n" +
+                "      ,to_number(wd.scrapnum) scrapnum\n" +
+                "      ,to_number(wd.cleanupnum) cleanupnum\n" +
+                "      ,to_number(wd.recoverynum) recoverynum\n" +
+                "      ,to_number(wd.repairnum) repairnum\n" +
+                "      ,wd.createtime\n" +
+                "      ,wd.ztype\n" +
+                "      ,wd.zmsg\n" +
+                "      ,wd.ztime\n" +
+                "      ,wd.testmouldflag\n" +
+                "      ,wd.zscs\n" +
+                "      ,wd.logid\n" +
+                "  from tsap_hegii_workdata_BG wd\n" +
+                " inner join TSAP_HEGII_DATALOG_BG dl\n" +
+                "    on dl.logid = wd.logid\n" +
+                " inner join tsap_hegii_datacode dc\n" +
+                "    on dc.datacode = wd.datacode\n";
+                //update xiacm 2022-10-17
+                if (logid > 0)
+                {
+                    sqlString += " where wd.logid = :logid \n";
+                }
+                else
+                {
+                    sqlString += " where dl.executedatebegin >= :DATEBEGIN and dl.executedateend < :DATEEND";
+                    sqlString += " and ('-1'= :DATACODE OR wd.datacode = :DATACODE)";
+                }
+                sqlString += " order by wd.goodscode,wd.sapcode,wd.usercode,wd.ordercode,wd.outputnum \n";
+                OracleParameter[] oracleParameter = new OracleParameter[]
+                {
+                   new OracleParameter(":logid",OracleDbType.Int32, logid, ParameterDirection.Input),
+                    new OracleParameter(":DATEBEGIN",OracleDbType.Date, cre.Properties["datebegin"], ParameterDirection.Input),
+                    new OracleParameter(":DATEEND",OracleDbType.Date, cre.Properties["dateend"], ParameterDirection.Input),
+                    new OracleParameter(":DATACODE",OracleDbType.Varchar2, cre.Properties["datacode"], ParameterDirection.Input),
+                };
+
+                sre.Data = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 报工汇总 add xiacm 2022-10-12
+        /// </summary>
+        /// <param name="cre"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetDataLogTotal_BG(ClientRequestEntity cre)
+        {
+            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+
+            ServiceResultEntity sre = new ServiceResultEntity();
+
+            try
+            {
+                string sqlString = string.Empty;
+                INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
+
+                // 配置文件
+                string SAP_NEW_INFO = ini.ReadIniData("SAP_NEW_INFO", "Factory");
+                //一厂 add xiacm 2022-10-17
+                if("5310".Equals(SAP_NEW_INFO))
+				{
+                     sqlString = "\n" +
+                    "SELECT T1.DATACODE,\n" +
+                    "       T1.Actualoutput,\n" +
+                    "       T2.*\n" +
+                    "  FROM (\n" +
+                    "        -- 业务数据汇总\n" +
+                    "        -- 10\n" +
+                    "        SELECT '10' AS DATACODE,\n" +
+                    "                SUM(DECODE(MHH.OPERATIONTYPE, 1, M.STANDARDGROUTINGSUM, 0)) AS Actualoutput\n" +
+                    "          FROM (SELECT MH.GOODSID,\n" +
+                    "                        MH.MOULDID,\n" +
+                    "                        MH.OPERATIONTYPE,\n" +
+                    "                        MH.GROUTINGNUM\n" +
+                    "                   FROM TP_PC_MOULDCHANGEHISTORY MH\n" +
+                    "                  WHERE MH.OPERATIONTYPE IN (1, 2, 3, 9, 11, -1)\n" +
+                    "                    AND MH.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND MH.CREATETIME < :DATEEND\n" +
+                    "                 UNION ALL\n" +
+                    "                 SELECT MH.GOODSIDAFTER,\n" +
+                    "                        MH.MOULDID,\n" +
+                    "                        0,\n" +
+                    "                        MH.GROUTINGNUM\n" +
+                    "                   FROM TP_PC_MOULDCHANGEHISTORY MH\n" +
+                    "                  WHERE MH.OPERATIONTYPE = -1\n" +
+                    "                    AND MH.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND MH.CREATETIME < :DATEEND) MHH\n" +
+                    "         INNER JOIN TP_PC_MOULD M\n" +
+                    "            ON M.MOULDID = MHH.MOULDID\n" +
+                    "        UNION ALL\n" +
+                    "        -- 20\n" +
+                    "        SELECT '20' AS DATACODE,\n" +
+                    "                COUNT(1) AS Businessoutput\n" +
+                    "          FROM TP_PM_GROUTINGDAILYDETAIL GDD\n" +
+                    "          LEFT JOIN TP_MST_GOODS G\n" +
+                    "            ON GDD.GOODSID = G.GOODSID\n" +
+                    "         WHERE GDD.CREATETIME >= :DATEBEGIN\n" +
+                    "           AND GDD.CREATETIME < :DATEEND\n" +
+                    "           AND GDD.GROUTINGFLAG = '1'\n" +
+                    "           AND G.SCRAPSUMFLAG = '1'\n" +
+                    "        UNION ALL\n" +
+                    "        -- 30\n" +
+                    "        SELECT '30' AS DATACODE,\n" +
+                    "                SUM(T1.CC) AS Businessoutput\n" +
+                    "          FROM (SELECT 1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (20,23,55)\n" +
+                    "                    AND P.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND P.CREATETIME < :DATEEND\n" +
+                    "                 UNION ALL\n" +
+                    "                 SELECT -1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (20,23,55)\n" +
+                    "                    AND P.VALUEFLAG = '0'\n" +
+                    "                    AND P.BACKOUTTIME >= :DATEBEGIN\n" +
+                    "                    AND P.BACKOUTTIME < :DATEEND) T1\n" +
+                    "        UNION ALL\n" +
+                    "        -- 40\n" +
+                    "        SELECT '40' AS DATACODE,\n" +
+                    "                SUM(T1.CC) AS Businessoutput\n" +
+                    "          FROM (SELECT 1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (4,22,45)\n" +
+                    "                    AND P.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND P.CREATETIME < :DATEEND\n" +
+                    "                 UNION ALL\n" +
+                    "                 SELECT -1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (4,22,45)\n" +
+                    "                    AND P.VALUEFLAG = '0'\n" +
+                    "                    AND P.BACKOUTTIME >= :DATEBEGIN\n" +
+                    "                    AND P.BACKOUTTIME < :DATEEND) T1\n" +
+                    "        UNION ALL\n" +
+                    "        -- 50\n" +
+                    "        SELECT '50' AS DATACODE,\n" +
+                    "                SUM(T1.CC) AS Businessoutput\n" +
+                    "          FROM (SELECT 1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (9)\n" +
+                    "                    AND P.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND P.CREATETIME < :DATEEND\n" +
+                    "                 UNION ALL\n" +
+                    "                 SELECT -1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (9)\n" +
+                    "                    AND P.VALUEFLAG = '0'\n" +
+                    "                    AND P.BACKOUTTIME >= :DATEBEGIN\n" +
+                    "                    AND P.BACKOUTTIME < :DATEEND) T1\n" +
+                    "        UNION ALL\n" +
+                    "        -- 60\n" +
+                    "        SELECT '60' AS DATACODE,\n" +
+                    "                COUNT(1) AS Businessoutput\n" +
+                    "          FROM TP_PM_FINISHEDPRODUCT GH\n" +
+                    "         WHERE GH.FHTIME >= :DATEBEGIN\n" +
+                    "           AND GH.FHTIME < :DATEEND) T1\n" +
+                    "  LEFT JOIN (\n" +
+                    "             -- 当日推送日志数据汇总\n" +
+                    "             SELECT DATACODE AS DATACODETD,\n" +
+                    "                     SUM(TO_NUMBER(OUTPUTNUM)) AS output,\n" +
+                    "                     SUM(TO_NUMBER(SCRAPNUM)) AS scrapnum,\n" +
+                    "                     SUM(TO_NUMBER(CLEANUPNUM)) AS cleannupnum,\n" +
+                    "                     SUM(TO_NUMBER(RECOVERYNUM)) AS recoverynum,\n" +
+                    "                     SUM(TO_NUMBER(REPAIRNUM)) AS repairnum\n" +
+                    "               FROM TSAP_HEGII_WORKDATA_BG\n" +
+                    "              WHERE LOGID IN (SELECT LOGID\n" +
+                    "                                FROM TSAP_HEGII_DATALOG_BG T\n" +
+                    "                               WHERE DATASTUTS = 'F'\n" +
+                    "                                 AND EXECUTEDATEBEGIN >= :DATEBEGIN\n" +
+                    "                                 AND EXECUTEDATEEND <= :DATEEND)\n" +
+                    "              GROUP BY DATACODE\n" +
+                    "              ORDER BY DATACODE) T2\n" +
+                    "    ON T2.DATACODETD = T1.DATACODE\n" +
+                     "  where (-1=:DATACODE OR T1.DATACODE= :DATACODE)\n" +
+                    " ORDER BY T1.DATACODE";
+                }
+                //二厂 add xiacm 2022-10-17
+                else if ("5320".Equals(SAP_NEW_INFO))
+				{
+
+                     sqlString = "\n" +
+                    "SELECT T1.DATACODE,\n" +
+                    "       T1.Actualoutput,\n" +
+                    "       T2.*\n" +
+                    "  FROM (\n" +
+                    "        -- 业务数据汇总\n" +
+                    "        -- 10\n" +
+                    "        SELECT '10' AS DATACODE,\n" +
+                    "                SUM(DECODE(MHH.OPERATIONTYPE, 1, M.STANDARDGROUTINGSUM, 0)) AS Actualoutput\n" +
+                    "          FROM (SELECT MH.GOODSID,\n" +
+                    "                        MH.MOULDID,\n" +
+                    "                        MH.OPERATIONTYPE,\n" +
+                    "                        MH.GROUTINGNUM\n" +
+                    "                   FROM TP_PC_MOULDCHANGEHISTORY MH\n" +
+                    "                  WHERE MH.OPERATIONTYPE IN (1, 2, 3, 9, 11, -1)\n" +
+                    "                    AND MH.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND MH.CREATETIME < :DATEEND\n" +
+                    "                 UNION ALL\n" +
+                    "                 SELECT MH.GOODSIDAFTER,\n" +
+                    "                        MH.MOULDID,\n" +
+                    "                        0,\n" +
+                    "                        MH.GROUTINGNUM\n" +
+                    "                   FROM TP_PC_MOULDCHANGEHISTORY MH\n" +
+                    "                  WHERE MH.OPERATIONTYPE = -1\n" +
+                    "                    AND MH.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND MH.CREATETIME < :DATEEND) MHH\n" +
+                    "         INNER JOIN TP_PC_MOULD M\n" +
+                    "            ON M.MOULDID = MHH.MOULDID\n" +
+                    "        UNION ALL\n" +
+                    "        -- 20\n" +
+                    "        SELECT '20' AS DATACODE,\n" +
+                    "                COUNT(1) AS Businessoutput\n" +
+                    "          FROM TP_PM_GROUTINGDAILYDETAIL GDD\n" +
+                    "          LEFT JOIN TP_MST_GOODS G\n" +
+                    "            ON GDD.GOODSID = G.GOODSID\n" +
+                    "         WHERE GDD.CREATETIME >= :DATEBEGIN\n" +
+                    "           AND GDD.CREATETIME < :DATEEND\n" +
+                    "           AND GDD.GROUTINGFLAG = '1'\n" +
+                    "           AND G.SCRAPSUMFLAG = '1'\n" +
+                    "        UNION ALL\n" +
+                    "        -- 30\n" +
+                    "        SELECT '30' AS DATACODE,\n" +
+                    "                SUM(T1.CC) AS Businessoutput\n" +
+                    "          FROM (SELECT 1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (34)\n" +
+                    "                    AND P.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND P.CREATETIME < :DATEEND\n" +
+                    "                 UNION ALL\n" +
+                    "                 SELECT -1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (34)\n" +
+                    "                    AND P.VALUEFLAG = '0'\n" +
+                    "                    AND P.BACKOUTTIME >= :DATEBEGIN\n" +
+                    "                    AND P.BACKOUTTIME < :DATEEND) T1\n" +
+                    "        UNION ALL\n" +
+                    "        -- 40\n" +
+                    "        SELECT '40' AS DATACODE,\n" +
+                    "                SUM(T1.CC) AS Businessoutput\n" +
+                    "          FROM (SELECT 1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (34)\n" +
+                    "                    AND P.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND P.CREATETIME < :DATEEND\n" +
+                    "                 UNION ALL\n" +
+                    "                 SELECT -1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (34)\n" +
+                    "                    AND P.VALUEFLAG = '0'\n" +
+                    "                    AND P.BACKOUTTIME >= :DATEBEGIN\n" +
+                    "                    AND P.BACKOUTTIME < :DATEEND) T1\n" +
+                    "        UNION ALL\n" +
+                    "        -- 50\n" +
+                    "        SELECT '50' AS DATACODE,\n" +
+                    "                SUM(T1.CC) AS Businessoutput\n" +
+                    "          FROM (SELECT 1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (12)\n" +
+                    "                    AND P.CREATETIME >= :DATEBEGIN\n" +
+                    "                    AND P.CREATETIME < :DATEEND\n" +
+                    "                 UNION ALL\n" +
+                    "                 SELECT -1 AS CC\n" +
+                    "                   FROM TP_PM_PRODUCTIONDATA P\n" +
+                    "                  WHERE P.PROCEDUREID IN (12)\n" +
+                    "                    AND P.VALUEFLAG = '0'\n" +
+                    "                    AND P.BACKOUTTIME >= :DATEBEGIN\n" +
+                    "                    AND P.BACKOUTTIME < :DATEEND) T1\n" +
+                    "        UNION ALL\n" +
+                    "        -- 60\n" +
+                    "        SELECT '60' AS DATACODE,\n" +
+                    "                COUNT(1) AS Businessoutput\n" +
+                    "          FROM TP_PM_FINISHEDPRODUCT GH\n" +
+                    "         WHERE GH.FHTIME >= :DATEBEGIN\n" +
+                    "           AND GH.FHTIME < :DATEEND) T1\n" +
+                    "  LEFT JOIN (\n" +
+                    "             -- 当日推送日志数据汇总\n" +
+                    "             SELECT DATACODE AS DATACODETD,\n" +
+                    "                     SUM(TO_NUMBER(OUTPUTNUM)) AS output,\n" +
+                    "                     SUM(TO_NUMBER(SCRAPNUM)) AS scrapnum,\n" +
+                    "                     SUM(TO_NUMBER(CLEANUPNUM)) AS cleannupnum,\n" +
+                    "                     SUM(TO_NUMBER(RECOVERYNUM)) AS recoverynum,\n" +
+                    "                     SUM(TO_NUMBER(REPAIRNUM)) AS repairnum\n" +
+                    "               FROM TSAP_HEGII_WORKDATA_BG\n" +
+                    "              WHERE LOGID IN (SELECT LOGID\n" +
+                    "                                FROM TSAP_HEGII_DATALOG_BG T\n" +
+                    "                               WHERE DATASTUTS = 'F'\n" +
+                    "                                 AND EXECUTEDATEBEGIN >= :DATEBEGIN\n" +
+                    "                                 AND EXECUTEDATEEND <= :DATEEND)\n" +
+                    "              GROUP BY DATACODE\n" +
+                    "              ORDER BY DATACODE) T2\n" +
+                    "    ON T2.DATACODETD = T1.DATACODE\n" +
+                    "  where (-1=:DATACODE OR T1.DATACODE= :DATACODE)\n" +
+                    " ORDER BY T1.DATACODE";
+
+                }
+                OracleParameter[] oracleParameter = new OracleParameter[]
+               {
+                    new OracleParameter(":DATEBEGIN",OracleDbType.Date, cre.Properties["datebegin"], ParameterDirection.Input),
+                    new OracleParameter(":DATEEND",OracleDbType.Date, cre.Properties["dateend"], ParameterDirection.Input),
+                    new OracleParameter(":DATACODE",OracleDbType.Varchar2, cre.Properties["datacode"], ParameterDirection.Input),
+               };
+
+                sre.Data = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
+                return sre;
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
     }
 }

+ 4 - 0
IBOSS.PRD/F_SYS_0202.cs

@@ -1162,6 +1162,10 @@ namespace Dongke.IBOSS.PRD.Client
 								case "SAP0104":
 									this.ShowInDockPanel(F_SAP_HEGII_0104.Instance);
 									break;
+								// add xiacm 2022-10-17
+								case "SAP0107":
+									this.ShowInDockPanel(F_SAP_HEGII_0107.Instance);
+									break;
 								#endregion
 
 								#region 生产计划 xuwei 20190827 add

+ 5 - 5
WCF.Service/WCF.Hosting/Config.ini

@@ -3,12 +3,12 @@ ServiceName=
 Description=
 
 [DBSetting]
-DBIP=172.18.32.35
+DBIP=172.19.22.61
 DBPort=1521
 #SID=ibossmes
 #DBUser=devhgcz
-SID=hgtest
-DBUser=hgtest
+SID=hgcz1
+DBUser=hgcz1
 DBPassword=etLHPkLTOLw=
 
 [WCFSetting]
@@ -18,8 +18,8 @@ ServerName=Debug
 
 [VersionSetting]
 PublicClientVersion=1.0.0.6
-AndroidVersion=1.1.21.0406
-ClientVersion=1.1.21.0406
+AndroidVersion=1.1.21.0623
+ClientVersion=1.1.21.0623
 
 [PathSetting]
 ;客户端升级,下载文件路径

+ 22 - 0
WCF.Service/WCF.Services/SAPDataService.cs

@@ -143,6 +143,28 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                             () => WMSDataLogic.SyncWMSDataLog(cre, SUserInfo));
                         return result;
                     }
+                    // 查询报工日志 add xiacm 2022-10-17
+                    if ("GetDataLog_BG" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                            () => WMSDataLogic.GetDataLog_BG(cre));
+                        return result;
+                    }
+                    // 查询报工日志明细 add xiacm 2022-10-17
+                    if ("GetWorkData_BG" == cre.Name)
+                    {
+						int logid = Convert.ToInt32(cre.Request);
+						ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+							() => WMSDataLogic.GetWorkData_BG(cre));
+						return result;
+                    }
+                    // 查询报工汇总 add xiacm 2022-10-17
+                    if ("GetDataLogTotal_BG" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                           () => WMSDataLogic.GetDataLogTotal_BG(cre));
+                        return result;
+                    }
                     return null;
                 }
                 #endregion