Procházet zdrojové kódy

包装板码更新

fubin před 2 roky
rodič
revize
cbb9779039

+ 1 - 1
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0112.Designer.cs

@@ -398,7 +398,7 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.Controls.Add(this.grpCollapsible1);
             this.Controls.Add(this.grpCollapsible1);
             this.Controls.Add(this.tsrToolStrip1);
             this.Controls.Add(this.tsrToolStrip1);
             this.Name = "F_SAP_HEGII_0112";
             this.Name = "F_SAP_HEGII_0112";
-            this.Text = "成品WMS同步日志";
+            this.Text = "中台同步日志";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_SAP_HEGII_0112_FormClosed);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_SAP_HEGII_0112_FormClosed);
             this.Load += new System.EventHandler(this.F_SAP_HEGII_0112_Load);
             this.Load += new System.EventHandler(this.F_SAP_HEGII_0112_Load);
             this.grpCollapsible1.ResumeLayout(false);
             this.grpCollapsible1.ResumeLayout(false);

+ 470 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0113.Designer.cs

@@ -0,0 +1,470 @@
+
+namespace Dongke.IBOSS.PRD.Client.SAPDataModule
+{
+    partial class F_SAP_HEGII_0113
+    {
+        /// <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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
+            this.txtZhongTaiMsg = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblZhongTaiMsg = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblToZhongTaiFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.cmbToZhongTaiFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.lblFhtimeEnd = new Dongke.WinForm.Controls.LblLabel();
+            this.lblFhtimeBegin = new Dongke.WinForm.Controls.LblLabel();
+            this.dtpFhtimeEnd = new Dongke.WinForm.Controls.DtpDate();
+            this.dtpFhtimeBegin = new Dongke.WinForm.Controls.DtpDate();
+            this.tsrToolStrip1 = new Dongke.WinForm.Controls.TsrToolStrip();
+            this.tsbtnSearch = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnSynLog = 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.dgvBarcode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.YYYYMMDD = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BARCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SAPCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OUTCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BANMA = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ORDERCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ORDERITEM = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SECURITYCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.TOKUNCHUANTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.TOKUNCHUANFLAG = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.KUNCHUANMSG = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.grpCollapsible1.SuspendLayout();
+            this.tsrToolStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvBarcode)).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.txtZhongTaiMsg);
+            this.grpCollapsible1.Controls.Add(this.lblZhongTaiMsg);
+            this.grpCollapsible1.Controls.Add(this.lblToZhongTaiFlag);
+            this.grpCollapsible1.Controls.Add(this.cmbToZhongTaiFlag);
+            this.grpCollapsible1.Controls.Add(this.lblFhtimeEnd);
+            this.grpCollapsible1.Controls.Add(this.lblFhtimeBegin);
+            this.grpCollapsible1.Controls.Add(this.dtpFhtimeEnd);
+            this.grpCollapsible1.Controls.Add(this.dtpFhtimeBegin);
+            this.grpCollapsible1.Location = new System.Drawing.Point(0, 38);
+            this.grpCollapsible1.Name = "grpCollapsible1";
+            this.grpCollapsible1.Size = new System.Drawing.Size(1154, 52);
+            this.grpCollapsible1.TabIndex = 1;
+            this.grpCollapsible1.TabStop = false;
+            this.grpCollapsible1.Text = "查询条件";
+            // 
+            // txtZhongTaiMsg
+            // 
+            this.txtZhongTaiMsg.BackColor = System.Drawing.SystemColors.Window;
+            this.txtZhongTaiMsg.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtZhongTaiMsg.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtZhongTaiMsg.ErrorMessage = "";
+            this.txtZhongTaiMsg.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtZhongTaiMsg.Location = new System.Drawing.Point(530, 20);
+            this.txtZhongTaiMsg.MaxLength = 20;
+            this.txtZhongTaiMsg.Name = "txtZhongTaiMsg";
+            this.txtZhongTaiMsg.Size = new System.Drawing.Size(120, 21);
+            this.txtZhongTaiMsg.TabIndex = 28;
+            // 
+            // lblZhongTaiMsg
+            // 
+            this.lblZhongTaiMsg.AutoSize = true;
+            this.lblZhongTaiMsg.BackColor = System.Drawing.Color.Transparent;
+            this.lblZhongTaiMsg.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblZhongTaiMsg.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblZhongTaiMsg.Location = new System.Drawing.Point(471, 24);
+            this.lblZhongTaiMsg.Name = "lblZhongTaiMsg";
+            this.lblZhongTaiMsg.Size = new System.Drawing.Size(53, 12);
+            this.lblZhongTaiMsg.TabIndex = 25;
+            this.lblZhongTaiMsg.Text = "同步结果";
+            // 
+            // lblToZhongTaiFlag
+            // 
+            this.lblToZhongTaiFlag.AutoSize = true;
+            this.lblToZhongTaiFlag.BackColor = System.Drawing.Color.Transparent;
+            this.lblToZhongTaiFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblToZhongTaiFlag.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblToZhongTaiFlag.Location = new System.Drawing.Point(306, 24);
+            this.lblToZhongTaiFlag.Name = "lblToZhongTaiFlag";
+            this.lblToZhongTaiFlag.Size = new System.Drawing.Size(53, 12);
+            this.lblToZhongTaiFlag.TabIndex = 24;
+            this.lblToZhongTaiFlag.Text = "同步状态";
+            // 
+            // cmbToZhongTaiFlag
+            // 
+            this.cmbToZhongTaiFlag.BackColor = System.Drawing.SystemColors.Window;
+            this.cmbToZhongTaiFlag.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.cmbToZhongTaiFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmbToZhongTaiFlag.FormattingEnabled = true;
+            this.cmbToZhongTaiFlag.Location = new System.Drawing.Point(365, 20);
+            this.cmbToZhongTaiFlag.Name = "cmbToZhongTaiFlag";
+            this.cmbToZhongTaiFlag.Size = new System.Drawing.Size(100, 20);
+            this.cmbToZhongTaiFlag.TabIndex = 23;
+            // 
+            // lblFhtimeEnd
+            // 
+            this.lblFhtimeEnd.Location = new System.Drawing.Point(177, 24);
+            this.lblFhtimeEnd.Name = "lblFhtimeEnd";
+            this.lblFhtimeEnd.Size = new System.Drawing.Size(17, 12);
+            this.lblFhtimeEnd.TabIndex = 2;
+            this.lblFhtimeEnd.Text = "至";
+            // 
+            // lblFhtimeBegin
+            // 
+            this.lblFhtimeBegin.Location = new System.Drawing.Point(12, 24);
+            this.lblFhtimeBegin.Name = "lblFhtimeBegin";
+            this.lblFhtimeBegin.Size = new System.Drawing.Size(53, 12);
+            this.lblFhtimeBegin.TabIndex = 0;
+            this.lblFhtimeBegin.Text = "交接日期";
+            // 
+            // dtpFhtimeEnd
+            // 
+            this.dtpFhtimeEnd.AllowNull = false;
+            this.dtpFhtimeEnd.Location = new System.Drawing.Point(200, 20);
+            this.dtpFhtimeEnd.Name = "dtpFhtimeEnd";
+            this.dtpFhtimeEnd.Size = new System.Drawing.Size(100, 21);
+            this.dtpFhtimeEnd.TabIndex = 3;
+            this.dtpFhtimeEnd.Value = new System.DateTime(2017, 12, 1, 0, 0, 0, 0);
+            // 
+            // dtpFhtimeBegin
+            // 
+            this.dtpFhtimeBegin.AllowNull = false;
+            this.dtpFhtimeBegin.Location = new System.Drawing.Point(71, 20);
+            this.dtpFhtimeBegin.Name = "dtpFhtimeBegin";
+            this.dtpFhtimeBegin.Size = new System.Drawing.Size(100, 21);
+            this.dtpFhtimeBegin.TabIndex = 1;
+            this.dtpFhtimeBegin.Value = new System.DateTime(2017, 12, 1, 0, 0, 0, 0);
+            // 
+            // 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.tsbtnSynLog,
+            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(1166, 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);
+            // 
+            // tsbtnSynLog
+            // 
+            this.tsbtnSynLog.AutoSize = false;
+            this.tsbtnSynLog.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnSynLog.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnSynLog.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnSynLog.Name = "tsbtnSynLog";
+            this.tsbtnSynLog.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnSynLog.Text = "同步(&L)";
+            this.tsbtnSynLog.Click += new System.EventHandler(this.tsbtnSynLog_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);
+            // 
+            // dgvBarcode
+            // 
+            this.dgvBarcode.AllowUserToAddRows = false;
+            this.dgvBarcode.AllowUserToDeleteRows = false;
+            this.dgvBarcode.AllowUserToModifyRows = true;
+            this.dgvBarcode.AllowUserToOrderColumns = true;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvBarcode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvBarcode.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.dgvBarcode.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvBarcode.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvBarcode.CellHeight = 23;
+            this.dgvBarcode.ChildNodeColumnName = null;
+            this.dgvBarcode.ChildNodeColumnText = null;
+            this.dgvBarcode.ColumnDeep = 1;
+            this.dgvBarcode.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvBarcode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvBarcode.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvBarcode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.YYYYMMDD,
+            this.BARCODE,
+            this.SAPCODE,
+            this.OUTCODE,
+            this.BANMA,
+            this.CREATETIME,
+            this.ORDERCODE,
+            this.ORDERITEM,
+            this.SECURITYCODE,
+            this.TOKUNCHUANTIME,
+            this.TOKUNCHUANFLAG,
+            this.KUNCHUANMSG});
+            this.dgvBarcode.ColumnTreeView = new System.Windows.Forms.TreeView[0];
+            this.dgvBarcode.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.dgvBarcode.DynamicColumnName = "";
+            this.dgvBarcode.EnableHeadersVisualStyles = false;
+            this.dgvBarcode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvBarcode.FormatQuantityColumns = null;
+            this.dgvBarcode.HasNode = false;
+            this.dgvBarcode.HorizontalMergeColumn = null;
+            this.dgvBarcode.IsAutoCountSum = true;
+            this.dgvBarcode.IsAutoResizeColumns = false;
+            this.dgvBarcode.IsClickF12 = false;
+            this.dgvBarcode.IsOpenMergeCellFlag = false;
+            this.dgvBarcode.IsSubTotalFlag = false;
+            this.dgvBarcode.IsTopDeep = false;
+            this.dgvBarcode.Location = new System.Drawing.Point(12, 96);
+            this.dgvBarcode.MergeColumnNames = null;
+            this.dgvBarcode.MergeDetailColumnNames = null;
+            this.dgvBarcode.MergeDetailOnlyColumn = null;
+            this.dgvBarcode.MergeOnlyColumn = null;
+            this.dgvBarcode.MultiSelect = false;
+            this.dgvBarcode.Name = "dgvBarcode";
+            this.dgvBarcode.ReadOnly = true;
+            this.dgvBarcode.RefreshAtHscroll = false;
+            this.dgvBarcode.RowHeadersWidth = 50;
+            this.dgvBarcode.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvBarcode.RowsDefaultCellStyle = dataGridViewCellStyle6;
+            this.dgvBarcode.RowTemplate.Height = 21;
+            this.dgvBarcode.Size = new System.Drawing.Size(1142, 514);
+            this.dgvBarcode.SortOrderColumnName = null;
+            this.dgvBarcode.TabIndex = 2;
+            this.dgvBarcode.Tag = "";
+            this.dgvBarcode.TotalSumColumns = null;
+            this.dgvBarcode.ViewRowFilter = "";
+            this.dgvBarcode.VirtualNodes = false;
+            // 
+            // YYYYMMDD
+            // 
+            this.YYYYMMDD.DataPropertyName = "YYYYMMDD";
+            this.YYYYMMDD.HeaderText = "日期";
+            this.YYYYMMDD.Name = "YYYYMMDD";
+            this.YYYYMMDD.ReadOnly = true;
+            // 
+            // BARCODE
+            // 
+            this.BARCODE.DataPropertyName = "BARCODE";
+            this.BARCODE.HeaderText = "产品条码";
+            this.BARCODE.Name = "BARCODE";
+            this.BARCODE.ReadOnly = true;
+            // 
+            // SAPCODE
+            // 
+            this.SAPCODE.DataPropertyName = "SAPCODE";
+            this.SAPCODE.HeaderText = "物料编码";
+            this.SAPCODE.Name = "SAPCODE";
+            this.SAPCODE.ReadOnly = true;
+            // 
+            // OUTCODE
+            // 
+            this.OUTCODE.DataPropertyName = "OUTCODE";
+            this.OUTCODE.HeaderText = "外箱码";
+            this.OUTCODE.Name = "OUTCODE";
+            this.OUTCODE.ReadOnly = true;
+            // 
+            // BANMA
+            // 
+            this.BANMA.DataPropertyName = "BANMA";
+            this.BANMA.HeaderText = "板码";
+            this.BANMA.Name = "BANMA";
+            this.BANMA.ReadOnly = true;
+            // 
+            // CREATETIME
+            // 
+            this.CREATETIME.DataPropertyName = "CREATETIME";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.CREATETIME.DefaultCellStyle = dataGridViewCellStyle3;
+            this.CREATETIME.HeaderText = "交接时间";
+            this.CREATETIME.Name = "CREATETIME";
+            this.CREATETIME.ReadOnly = true;
+            // 
+            // ORDERCODE
+            // 
+            this.ORDERCODE.DataPropertyName = "ORDERCODE";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.ORDERCODE.DefaultCellStyle = dataGridViewCellStyle4;
+            this.ORDERCODE.HeaderText = "SAP销售单号";
+            this.ORDERCODE.Name = "ORDERCODE";
+            this.ORDERCODE.ReadOnly = true;
+            // 
+            // ORDERITEM
+            // 
+            this.ORDERITEM.HeaderText = "SAP销售单行号";
+            this.ORDERITEM.Name = "ORDERITEM";
+            this.ORDERITEM.ReadOnly = true;
+            // 
+            // SECURITYCODE
+            // 
+            this.SECURITYCODE.HeaderText = "防伪码";
+            this.SECURITYCODE.Name = "SECURITYCODE";
+            this.SECURITYCODE.ReadOnly = true;
+            // 
+            // TOKUNCHUANTIME
+            // 
+            this.TOKUNCHUANTIME.DataPropertyName = "TOKUNCHUANTIME";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
+            this.TOKUNCHUANTIME.DefaultCellStyle = dataGridViewCellStyle5;
+            this.TOKUNCHUANTIME.HeaderText = "同步时间";
+            this.TOKUNCHUANTIME.Name = "TOKUNCHUANTIME";
+            this.TOKUNCHUANTIME.ReadOnly = true;
+            // 
+            // TOKUNCHUANFLAG
+            // 
+            this.TOKUNCHUANFLAG.DataPropertyName = "TOKUNCHUANFLAG";
+            this.TOKUNCHUANFLAG.FalseValue = "0";
+            this.TOKUNCHUANFLAG.HeaderText = "同步标识";
+            this.TOKUNCHUANFLAG.IndeterminateValue = "0";
+            this.TOKUNCHUANFLAG.Name = "TOKUNCHUANFLAG";
+            this.TOKUNCHUANFLAG.ReadOnly = true;
+            this.TOKUNCHUANFLAG.TrueValue = "1";
+            // 
+            // KUNCHUANMSG
+            // 
+            this.KUNCHUANMSG.DataPropertyName = "KUNCHUANMSG";
+            this.KUNCHUANMSG.HeaderText = "同步结果";
+            this.KUNCHUANMSG.Name = "KUNCHUANMSG";
+            this.KUNCHUANMSG.ReadOnly = true;
+            // 
+            // F_SAP_HEGII_0113
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1166, 622);
+            this.Controls.Add(this.dgvBarcode);
+            this.Controls.Add(this.grpCollapsible1);
+            this.Controls.Add(this.tsrToolStrip1);
+            this.Name = "F_SAP_HEGII_0113";
+            this.Text = "昆船WMS系统同步日志";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_SAP_HEGII_0113_FormClosed);
+            this.Load += new System.EventHandler(this.F_SAP_HEGII_0113_Load);
+            this.grpCollapsible1.ResumeLayout(false);
+            this.grpCollapsible1.PerformLayout();
+            this.tsrToolStrip1.ResumeLayout(false);
+            this.tsrToolStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvBarcode)).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 lblFhtimeBegin;
+        private WinForm.Controls.DtpDate dtpFhtimeBegin;
+        private System.Windows.Forms.ToolStripButton tsbtnClearCondition;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private WinForm.Controls.LblLabel lblFhtimeEnd;
+        private WinForm.Controls.DtpDate dtpFhtimeEnd;
+        private System.Windows.Forms.ToolStripButton tsbtnSynLog;
+        private Basics.BaseControls.C_Label lblToZhongTaiFlag;
+        private Basics.BaseControls.C_ComboBox cmbToZhongTaiFlag;
+        private Basics.BaseControls.C_Label lblZhongTaiMsg;
+        private Basics.BaseControls.C_TextBox txtZhongTaiMsg;
+        private Basics.BaseControls.C_DataGridView dgvBarcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn YYYYMMDD;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BARCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SAPCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn OUTCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BANMA;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CREATETIME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ORDERCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ORDERITEM;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SECURITYCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn TOKUNCHUANTIME;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn TOKUNCHUANFLAG;
+        private System.Windows.Forms.DataGridViewTextBoxColumn KUNCHUANMSG;
+    }
+}

+ 232 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0113.cs

@@ -0,0 +1,232 @@
+/*******************************************************************************
+ * Copyright(c) 2016 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:F_SAP_HEGII_0113.cs
+ *      2.功能描述:中台同步日志
+ * 编辑履历:
+ *      作者            日期                版本            修改内容
+ *      付斌            2022/09/02         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.Client.DataModels;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+
+namespace Dongke.IBOSS.PRD.Client.SAPDataModule
+{
+    /// <summary>
+    /// 中台同步日志
+    /// </summary>
+    public partial class F_SAP_HEGII_0113 : DKDockPanelBase
+    {
+        #region 成员变量
+        private static F_SAP_HEGII_0113 _instance = null;
+        #endregion
+
+        #region 单例模式
+
+        /// <summary>
+        /// 单例模式,防止重复创建窗体
+        /// </summary>
+        public static F_SAP_HEGII_0113 Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new F_SAP_HEGII_0113();
+                }
+                return _instance;
+            }
+        }
+
+        #endregion
+
+        #region 构造函数
+        /// <summary>
+        /// 成品SAP日志
+        /// </summary>
+        public F_SAP_HEGII_0113()
+        {
+            InitializeComponent();
+
+            tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
+            tsbtnClose.Text = ButtonText.TSBTN_CLOSE;
+        }
+        #endregion
+
+        #region 控件事件
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void F_SAP_HEGII_0113_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            _instance = null;
+        }
+
+        /// <summary>
+        /// 画面加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void F_SAP_HEGII_0113_Load(object sender, System.EventArgs e)
+        {
+            try
+            {
+                // 加载权限
+                FormPermissionManager.FormPermissionControl(Name, this,
+                    LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
+                    LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
+
+                dgvBarcode.AutoGenerateColumns = false;
+
+                dtpFhtimeBegin.Value = DateTime.Now.Date;
+                dtpFhtimeEnd.Value = DateTime.Now.Date;
+
+                DataTable dtToZhongTaiFlag = new DataTable();
+                dtToZhongTaiFlag.Columns.Add("Flag", typeof(string));
+                dtToZhongTaiFlag.Columns.Add("FlagName", typeof(string));
+
+                DataRow newRow = dtToZhongTaiFlag.NewRow();
+                dtToZhongTaiFlag.Rows.Add(newRow);
+                newRow = dtToZhongTaiFlag.NewRow();
+                newRow["Flag"] = "1";
+                newRow["FlagName"] = "已同步";
+                dtToZhongTaiFlag.Rows.Add(newRow);
+                newRow = dtToZhongTaiFlag.NewRow();
+                newRow["Flag"] = "0";
+                newRow["FlagName"] = "未同步";
+                dtToZhongTaiFlag.Rows.Add(newRow);
+
+                this.cmbToZhongTaiFlag.DisplayMember = "FlagName";
+                this.cmbToZhongTaiFlag.ValueMember = "Flag";
+                this.cmbToZhongTaiFlag.DataSource = dtToZhongTaiFlag;
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(ToString(),
+                    MethodBase.GetCurrentMethod().Name, Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnSearch_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                tsrToolStrip1.Focus();
+                dgvBarcode.DataSource = null;
+                if (dtpFhtimeBegin.Value == null || dtpFhtimeEnd.Value == null)
+                {
+                    return;
+                }
+
+                ClientRequestEntity cre = new ClientRequestEntity();
+                cre.NameSpace = "Hegii";
+                cre.Name = "GetKunChuanDataLog";
+                cre.Properties["FhtimeBegin"] = dtpFhtimeBegin.Value.Value;
+                cre.Properties["FhtimeEnd"] = dtpFhtimeEnd.Value.Value.AddDays(1);
+                cre.Properties["ToKunChuanFlag"] = cmbToZhongTaiFlag.SelectedValue;
+                cre.Properties["KunChuanMsg"] = txtZhongTaiMsg.Text;
+
+                ServiceResultEntity sre = DoAsync(() =>
+                {
+                    return SAPDataModuleProxy.Service.DoRequest(cre);
+                });
+
+                if (sre.Status == Constant.ServiceResultStatus.Success)
+                {
+                    if (sre.Data.Tables[0].Rows.Count == 0)
+                    {
+                        DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_001);
+                        return;
+                    }
+
+                    // 查询成功
+                    dgvBarcode.DataSource = sre.Data.Tables[0];
+                    dgvBarcode.AutoResizeColumns();
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(ToString(),
+                    MethodBase.GetCurrentMethod().Name, Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 同步操作
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnSynLog_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                F_SAP_HEGII_011301 f = new F_SAP_HEGII_011301();
+                DialogResult dialogResult = f.ShowDialog();
+
+                if (dialogResult == DialogResult.OK)
+                {
+                    this.tsbtnSearch_Click(null, null);
+                }
+            }
+            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)
+        {
+            dtpFhtimeBegin.Value = DateTime.Now.Date;
+            dtpFhtimeEnd.Value = DateTime.Now.Date;
+            this.cmbToZhongTaiFlag.SelectedIndex = 0;
+            txtZhongTaiMsg.Text = string.Empty;
+        }
+
+        /// <summary>
+        /// 自适应列宽
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnAdaptive_Click(object sender, EventArgs e)
+        {
+            dgvBarcode.AutoResizeColumns();
+        }
+
+        /// <summary>
+        /// 关闭画面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbtnClose_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+        #endregion
+    }
+}

+ 162 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0113.resx

@@ -0,0 +1,162 @@
+<?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="YYYYMMDD.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="BARCODE.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="OUTCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="BANMA.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CREATETIME.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="SECURITYCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="TOKUNCHUANTIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="TOKUNCHUANFLAG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="KUNCHUANMSG.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>

+ 121 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_011301.Designer.cs

@@ -0,0 +1,121 @@
+namespace Dongke.IBOSS.PRD.Client.SAPDataModule
+{
+    partial class F_SAP_HEGII_011301
+    {
+        /// <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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_SAP_HEGII_011301));
+            this.lblSyncDate = new Dongke.WinForm.Controls.LblLabel();
+            this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.dtpSyncDate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.SuspendLayout();
+            // 
+            // lblSyncDate
+            // 
+            this.lblSyncDate.Location = new System.Drawing.Point(12, 16);
+            this.lblSyncDate.Name = "lblSyncDate";
+            this.lblSyncDate.Size = new System.Drawing.Size(53, 12);
+            this.lblSyncDate.TabIndex = 0;
+            this.lblSyncDate.Text = "同步日期";
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.BackColor = System.Drawing.Color.Transparent;
+            this.btnCancel.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnCancel.BackgroundImage")));
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnCancel.ForeColor = System.Drawing.Color.White;
+            this.btnCancel.Location = new System.Drawing.Point(147, 52);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(85, 30);
+            this.btnCancel.TabIndex = 5;
+            this.btnCancel.Text = "关闭";
+            this.btnCancel.UseVisualStyleBackColor = false;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnSave
+            // 
+            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSave.BackColor = System.Drawing.Color.Transparent;
+            this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
+            this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSave.ForeColor = System.Drawing.Color.White;
+            this.btnSave.Location = new System.Drawing.Point(56, 52);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(85, 30);
+            this.btnSave.TabIndex = 4;
+            this.btnSave.Text = "确定(&S)";
+            this.btnSave.UseVisualStyleBackColor = false;
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // dtpSyncDate
+            // 
+            this.dtpSyncDate.CustomFormat = "yyyy-MM-dd";
+            this.dtpSyncDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpSyncDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpSyncDate.Location = new System.Drawing.Point(71, 12);
+            this.dtpSyncDate.Name = "dtpSyncDate";
+            this.dtpSyncDate.Size = new System.Drawing.Size(161, 21);
+            this.dtpSyncDate.TabIndex = 6;
+            // 
+            // F_SAP_HEGII_011301
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(244, 107);
+            this.Controls.Add(this.dtpSyncDate);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnSave);
+            this.Controls.Add(this.lblSyncDate);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.IsSaveFormSize = false;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "F_SAP_HEGII_011301";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.StatusSizingGrip = false;
+            this.Text = "手动同步";
+            this.Controls.SetChildIndex(this.lblSyncDate, 0);
+            this.Controls.SetChildIndex(this.btnSave, 0);
+            this.Controls.SetChildIndex(this.btnCancel, 0);
+            this.Controls.SetChildIndex(this.dtpSyncDate, 0);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private WinForm.Controls.LblLabel lblSyncDate;
+        private Basics.BaseControls.C_Button btnCancel;
+        private Basics.BaseControls.C_Button btnSave;
+		private Basics.BaseControls.C_DateTimePicker dtpSyncDate;
+	}
+}

+ 86 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_011301.cs

@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright(c) 2016 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:F_SAP_HEGII_011301.cs
+ *      2.功能描述:手动同步
+ * 编辑履历:
+ *      作者            日期                版本            修改内容
+ *      陈晓野          2018/11/16          1.00            新建
+ *******************************************************************************/
+using System;
+using System.Reflection;
+using System.Windows.Forms;
+using Dongke.IBOSS.PRD.Basics.BaseControls;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+
+namespace Dongke.IBOSS.PRD.Client.SAPDataModule
+{
+    public partial class F_SAP_HEGII_011301 : FormBase
+    {
+        public F_SAP_HEGII_011301()
+        {
+            InitializeComponent();
+            this.dtpSyncDate.Value = DateTime.Now.Date;
+        }
+
+        /// <summary>
+        /// 同步
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                string syncDate = this.dtpSyncDate.Value.ToString("yyyy-MM-dd");
+                DialogResult dr = MessageBox.Show("是否同步【" + syncDate + "】的数据。",
+                    this.Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
+
+                if (dr != DialogResult.Yes)
+                {
+                    return;
+                }
+
+                ClientRequestEntity cre = new ClientRequestEntity();
+                cre.NameSpace = "Hegii";
+                cre.Name = "SyncKunChuanData";
+                cre.Properties["SyncDate"] = syncDate;
+
+                ServiceResultEntity sre = (ServiceResultEntity)DoAsync(() =>
+                {
+                    return SAPDataModuleProxy.Service.DoRequest(cre);
+                });
+
+                if (sre.OtherStatus > 0)
+                {
+                    DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_002);
+                    this.DialogResult = DialogResult.OK;
+                    Close();
+                }
+                else
+                {
+                    DKMessageBox.ShowDialog(this, DKMessageCode.W_CMN_S_004, sre.Message);
+                }
+            }
+            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 btnCancel_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+    }
+}

+ 137 - 0
DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_011301.resx

@@ -0,0 +1,137 @@
+<?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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnSave.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+</root>

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

@@ -74,6 +74,18 @@
     </Reference>
     </Reference>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
+    <Compile Include="Hegii\F_SAP_HEGII_0113.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Hegii\F_SAP_HEGII_0113.Designer.cs">
+      <DependentUpon>F_SAP_HEGII_0113.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Hegii\F_SAP_HEGII_011301.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Hegii\F_SAP_HEGII_011301.Designer.cs">
+      <DependentUpon>F_SAP_HEGII_011301.cs</DependentUpon>
+    </Compile>
     <Compile Include="Hegii\F_SAP_HEGII_011201.cs">
     <Compile Include="Hegii\F_SAP_HEGII_011201.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
     </Compile>
     </Compile>
@@ -208,6 +220,12 @@
     </ProjectReference>
     </ProjectReference>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Hegii\F_SAP_HEGII_0113.resx">
+      <DependentUpon>F_SAP_HEGII_0113.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Hegii\F_SAP_HEGII_011301.resx">
+      <DependentUpon>F_SAP_HEGII_011301.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Hegii\F_SAP_HEGII_011201.resx">
     <EmbeddedResource Include="Hegii\F_SAP_HEGII_011201.resx">
       <DependentUpon>F_SAP_HEGII_011201.cs</DependentUpon>
       <DependentUpon>F_SAP_HEGII_011201.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>

+ 89 - 2
DK.Service/BPMDataService/BPMDataLogic.cs

@@ -1213,8 +1213,9 @@ namespace Dongke.IBOSS.PRD.Service.BPMDataService
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
-
-                throw ex;
+                sre.OtherStatus = -1;
+                sre.Message = ex.Message;
+                return sre;
             }
             }
         }
         }
 
 
@@ -1248,6 +1249,92 @@ namespace Dongke.IBOSS.PRD.Service.BPMDataService
             }
             }
         }
         }
 
 
+        /// <summary>
+        /// 查询昆船WMS日志
+        /// </summary>
+        /// <param name="cre"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetKunChuanDataLog(ClientRequestEntity cre, SUserInfo userInfo)
+        {
+            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+            ServiceResultEntity sre = new ServiceResultEntity();
+            List<OracleParameter> paras = new List<OracleParameter>();
+            try
+            {
+                string sqlString = @"
+                SELECT FP.YYYYMMDD,
+                       FP.BARCODE,
+                       FP.SAPCODE,
+                       FP.OUTCODE,
+                       FP.CREATETIME,
+                       NVL(FP.BANMA, FP.SAPFLBATCHNO) AS BANMA,
+                       FP.ORDERCODE,
+                       FP.ORDERITEM,
+                       FP.SECURITYCODE,
+                       FP.TOKUNCHUANFLAG,
+                       FP.KUNCHUANMSG,
+                       FP.TOKUNCHUANTIME
+                  FROM TSAP_HEGII_FINISHEDPRODUCT FP
+                 WHERE FP.ZTYPE = 'S'
+                   AND FP.CREATETIME >= :FHTIMEBEGIN
+                   AND FP.CREATETIME < :FHTIMEEND ";
+
+                paras.Add(new OracleParameter(":FHTIMEBEGIN", OracleDbType.Date, cre.Properties["FhtimeBegin"], ParameterDirection.Input));
+                paras.Add(new OracleParameter(":FHTIMEEND", OracleDbType.Date, cre.Properties["FhtimeEnd"], ParameterDirection.Input));
+
+                if (!string.IsNullOrEmpty(cre.Properties["ToKunChuanFlag"] + ""))
+                {
+                    sqlString += " AND FP.TOKUNCHUANFLAG = :TOKUNCHUANFLAG ";
+                    paras.Add(new OracleParameter(":TOKUNCHUANFLAG", OracleDbType.Varchar2, cre.Properties["ToKunChuanFlag"], ParameterDirection.Input));
+                }
+                if (!string.IsNullOrEmpty(cre.Properties["KunChuanMsg"] + ""))
+                {
+                    sqlString += " AND FP.KUNCHUANMSG LIKE :KUNCHUANMSG ";
+                    paras.Add(new OracleParameter(":KUNCHUANMSG", OracleDbType.NVarchar2, "%" + cre.Properties["KunChuanMsg"] + "%", ParameterDirection.Input));
+                }
+
+                sqlString += " ORDER BY FP.SAPFLBATCHNO, FP.OUTCODE ";
+                sre.Data = oracleConn.GetSqlResultToDs(sqlString, paras.ToArray());
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                sre.OtherStatus = -1;
+                sre.Message = ex.Message;
+                return sre;
+            }
+        }
+
+        /// <summary>
+        /// 同步昆船WMS日志
+        /// </summary>
+        /// <param name="cre"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity SyncKunChuanData(ClientRequestEntity cre)
+        {
+            ServiceResultEntity sre = new ServiceResultEntity();
+            try
+            {
+                INIUtility ini = INIUtility.Instance(INIUtility.IniFile.Config);
+                string urlKunChuan = ini.ReadIniData("KunChuan", "urlKunChuan");
+                //string urlKunChuan = "http://localhost:62172/api/KunChuan/ashxSyncKunChuan.ashx";
+
+                string syncDate = cre.Properties["SyncDate"].ToString();
+                string result = PostData(urlKunChuan, "{\"SyncDate\": \"" + syncDate + "\"}", "POST");
+
+                JObject obj = JObject.Parse(result);
+                sre.OtherStatus = 1;
+                sre.Message = "同步结果," + obj["message"].ToString();
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                sre.Result = -2;
+                sre.Message = "同步失败," + ex.Message;
+                return sre;
+            }
+        }
+
         #region 私有方法
         #region 私有方法
         /// <summary>
         /// <summary>
         /// 同步BPM系统条码
         /// 同步BPM系统条码

+ 8 - 5
DK.Service/PMModuleService/PMModuleLogic.cs

@@ -5627,14 +5627,15 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 if(string.IsNullOrEmpty(cre.Properties["logoID"] + ""))
                 if(string.IsNullOrEmpty(cre.Properties["logoID"] + ""))
                 {
                 {
                     //兼容原方法,只从产品档案取值
                     //兼容原方法,只从产品档案取值
-                    sqlString = "SELECT G.PLATELIMITNUM FROM TP_MST_GOODS G WHERE G.GOODSID = " + cre.Properties["GoodsID"];
+                    sqlString = "SELECT G.PLATELIMITNUM,G.PLATELIMITNUMNEW FROM TP_MST_GOODS G WHERE G.GOODSID = " + cre.Properties["GoodsID"];
                 }
                 }
                 else
                 else
                 {
                 {
                     //新方法,从产品档案和SAP配置表取值
                     //新方法,从产品档案和SAP配置表取值
                     sqlString = @"
                     sqlString = @"
                         SELECT
                         SELECT
-	                        PLATELIMITNUM 
+	                        PLATELIMITNUM,
+                            PLATELIMITNUMNEW
                         FROM
                         FROM
 	                        (
 	                        (
 	                        SELECT
 	                        SELECT
@@ -5642,7 +5643,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
 		                        G.LOGOID,
 		                        G.LOGOID,
 		                        G.GOODSCODE,
 		                        G.GOODSCODE,
 		                        G.MATERIALCODE,
 		                        G.MATERIALCODE,
-		                        G.PLATELIMITNUM 
+		                        G.PLATELIMITNUM,
+                                G.PLATELIMITNUMNEW
 	                        FROM
 	                        FROM
 		                        TP_MST_GOODS G 
 		                        TP_MST_GOODS G 
 	                        WHERE
 	                        WHERE
@@ -5654,7 +5656,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
 		                        SAP.LOGOID,
 		                        SAP.LOGOID,
 		                        SAP.GOODSCODE,
 		                        SAP.GOODSCODE,
 		                        SAP.MATERIALCODE,
 		                        SAP.MATERIALCODE,
-		                        SAP.PLATELIMITNUM 
+		                        SAP.PLATELIMITNUM,
+                                SAP.PLATELIMITNUMNEW
 	                        FROM
 	                        FROM
 		                        TP_MST_GOODSLOGOSAP SAP 
 		                        TP_MST_GOODSLOGOSAP SAP 
 	                        WHERE
 	                        WHERE
@@ -5680,7 +5683,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 sre.Data = new DataSet();
                 sre.Data = new DataSet();
                 sre.Data.Tables.Add(data);
                 sre.Data.Tables.Add(data);
                 //sre.Result = cre.Properties["PLATELIMITNUM"];
                 //sre.Result = cre.Properties["PLATELIMITNUM"];
-                sre.Result = conn.GetSqlResultToObj(sqlString);
+                sre.Result = conn.GetSqlResultToDt(sqlString);
                 return sre;
                 return sre;
             }
             }
             catch (Exception ex)
             catch (Exception ex)

+ 3 - 0
IBOSS.PRD/F_SYS_0202.cs

@@ -1212,6 +1212,9 @@ namespace Dongke.IBOSS.PRD.Client
 								case "SAP0111":
 								case "SAP0111":
 									this.ShowInDockPanel(F_SAP_HEGII_0112.Instance);
 									this.ShowInDockPanel(F_SAP_HEGII_0112.Instance);
 									break;
 									break;
+								case "SAP0112":
+									this.ShowInDockPanel(F_SAP_HEGII_0113.Instance);
+									break;
 								#endregion
 								#endregion
 
 
 								#region 生产计划 xuwei 20190827 add
 								#region 生产计划 xuwei 20190827 add

+ 2 - 2
IBOSS.PRD/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
 // 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
 // 方法是按如下所示使用“*”: 
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.23.0504")]
-[assembly: AssemblyFileVersion("1.2.23.0504")]
+[assembly: AssemblyVersion("1.2.23.0510")]
+[assembly: AssemblyFileVersion("1.2.23.0510")]

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

@@ -47,11 +47,11 @@ ServerName=Debug
 [VersionSetting]
 [VersionSetting]
 PublicClientVersion=1.0.0.7
 PublicClientVersion=1.0.0.7
 AndroidVersion=1.2.21.1215
 AndroidVersion=1.2.21.1215
-ClientVersion=1.2.23.0504
+ClientVersion=1.2.23.0510
 
 
 [PathSetting]
 [PathSetting]
 ;客户端升级,下载文件路径
 ;客户端升级,下载文件路径
-UpgradeDownLoadPath=Upgrade\20230504-1.2.23.0504
+UpgradeDownLoadPath=Upgrade\20230510-1.2.23.0510
 ;APK下载路径
 ;APK下载路径
 UpgradeAPKPath=APK/iBOSSPRDPDASS1215.apk
 UpgradeAPKPath=APK/iBOSSPRDPDASS1215.apk
 ;客户端升级,下载文件路径
 ;客户端升级,下载文件路径

+ 4 - 1
WCF.Service/WCF.Services/PDAModuleService.cs

@@ -10188,7 +10188,10 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                                     cre.Properties["S_PM_013"] = item["settingvalue"];
                                     cre.Properties["S_PM_013"] = item["settingvalue"];
                                 }
                                 }
                             }
                             }
-                            cre.Properties["PlatelitNum"] = sre.Result;
+
+                            DataTable dt = sre.Result as DataTable;
+                            cre.Properties["PlatelitNum"] = dt.Rows[0]["PLATELIMITNUM"];
+                            cre.Properties["PlatelitNumNew"] = dt.Rows[0]["PLATELIMITNUMNEW"];
 
 
                             actionResult.Result = JsonHelper.ToJson(cre.Properties);
                             actionResult.Result = JsonHelper.ToJson(cre.Properties);
                         }
                         }

+ 19 - 2
WCF.Service/WCF.Services/SAPDataService.cs

@@ -313,14 +313,14 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                     #endregion
                     #endregion
 
 
                     #region 中台相关
                     #region 中台相关
-                    // 查询WMS同步日志
+                    // 查询中台同步日志
                     else if ("GetZhongTaiDataLog" == cre.Name)
                     else if ("GetZhongTaiDataLog" == cre.Name)
                     {
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                            () => BPMDataLogic.GetZhongTaiDataLog(cre, SUserInfo));
                            () => BPMDataLogic.GetZhongTaiDataLog(cre, SUserInfo));
                         return result;
                         return result;
                     }
                     }
-                    // 同步WMS同步日志
+                    // 同步中台同步日志
                     else if ("SyncZhongTaiData" == cre.Name)
                     else if ("SyncZhongTaiData" == cre.Name)
                     {
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
@@ -329,6 +329,23 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                     }
                     }
                     #endregion
                     #endregion
 
 
+                    #region 昆船WMS
+                    // 查询昆船WMS同步日志
+                    else if ("GetKunChuanDataLog" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                           () => BPMDataLogic.GetKunChuanDataLog(cre, SUserInfo));
+                        return result;
+                    }
+                    // 同步昆船WMS同步日志
+                    else if ("SyncKunChuanData" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                            () => BPMDataLogic.SyncKunChuanData(cre));
+                        return result;
+                    }
+                    #endregion
+
                     return null;
                     return null;
                 }
                 }
                 #endregion
                 #endregion

+ 2 - 2
WCF.Service/WCF.WebHosting/Config.ini

@@ -28,11 +28,11 @@ GOURL=http://172.18.32.35:9000/mes/mesgo.ashx
 [VersionSetting]
 [VersionSetting]
 PublicClientVersion=1.0.0.6
 PublicClientVersion=1.0.0.6
 AndroidVersion=1.0.20.1130
 AndroidVersion=1.0.20.1130
-ClientVersion=1.2.23.0504
+ClientVersion=1.2.23.0510
 
 
 [PathSetting]
 [PathSetting]
 ;客户端升级,下载文件路径
 ;客户端升级,下载文件路径
-UpgradeDownLoadPath=Upgrade\20230504-1.2.23.0504
+UpgradeDownLoadPath=Upgrade\20230510-1.2.23.0510
 ;APK下载路径
 ;APK下载路径
 UpgradeAPKPath=APK/20161122-1.0.0.69/iBOSSPRDPDA69.apk
 UpgradeAPKPath=APK/20161122-1.0.0.69/iBOSSPRDPDA69.apk
 ;客户端升级,下载文件路径
 ;客户端升级,下载文件路径