wms3

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

@@ -43,12 +43,12 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.dtpDatebegin = 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.tsbtnSynLog = new System.Windows.Forms.ToolStripButton();
             this.SEL = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DGV_Column_CheckBox();
             this.LOGTYPENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.CODEI = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -59,6 +59,10 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.LPN = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.RETURNDESC = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lblLogType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.cmbLogType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.lblReturnDesc = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtReturnDesc = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.grpCollapsible1.SuspendLayout();
             this.tsrToolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvBarcode)).BeginInit();
@@ -68,6 +72,10 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             // 
             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.txtReturnDesc);
+            this.grpCollapsible1.Controls.Add(this.lblReturnDesc);
+            this.grpCollapsible1.Controls.Add(this.lblLogType);
+            this.grpCollapsible1.Controls.Add(this.cmbLogType);
             this.grpCollapsible1.Controls.Add(this.lblLabel2);
             this.grpCollapsible1.Controls.Add(this.lblLabel1);
             this.grpCollapsible1.Controls.Add(this.dtpDateend);
@@ -139,6 +147,17 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             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;
@@ -249,17 +268,6 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.dgvBarcode.TotalSumColumns = null;
             this.dgvBarcode.ViewRowFilter = "";
             // 
-            // 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);
-            // 
             // SEL
             // 
             this.SEL.DataPropertyName = "SEL";
@@ -269,6 +277,7 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.SEL.Name = "SEL";
             this.SEL.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.SEL.TrueValue = "1";
+            this.SEL.Width = 65;
             // 
             // LOGTYPENAME
             // 
@@ -342,6 +351,54 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
             this.CREATETIME.Name = "CREATETIME";
             this.CREATETIME.ReadOnly = true;
             // 
+            // lblLogType
+            // 
+            this.lblLogType.AutoSize = true;
+            this.lblLogType.BackColor = System.Drawing.Color.Transparent;
+            this.lblLogType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLogType.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblLogType.Location = new System.Drawing.Point(306, 24);
+            this.lblLogType.Name = "lblLogType";
+            this.lblLogType.Size = new System.Drawing.Size(53, 12);
+            this.lblLogType.TabIndex = 24;
+            this.lblLogType.Text = "同步类型";
+            // 
+            // cmbLogType
+            // 
+            this.cmbLogType.BackColor = System.Drawing.SystemColors.Window;
+            this.cmbLogType.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.cmbLogType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmbLogType.FormattingEnabled = true;
+            this.cmbLogType.Location = new System.Drawing.Point(365, 20);
+            this.cmbLogType.Name = "cmbLogType";
+            this.cmbLogType.Size = new System.Drawing.Size(100, 20);
+            this.cmbLogType.TabIndex = 23;
+            // 
+            // lblReturnDesc
+            // 
+            this.lblReturnDesc.AutoSize = true;
+            this.lblReturnDesc.BackColor = System.Drawing.Color.Transparent;
+            this.lblReturnDesc.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblReturnDesc.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblReturnDesc.Location = new System.Drawing.Point(471, 24);
+            this.lblReturnDesc.Name = "lblReturnDesc";
+            this.lblReturnDesc.Size = new System.Drawing.Size(53, 12);
+            this.lblReturnDesc.TabIndex = 25;
+            this.lblReturnDesc.Text = "同步结果";
+            // 
+            // txtReturnDesc
+            // 
+            this.txtReturnDesc.BackColor = System.Drawing.SystemColors.Window;
+            this.txtReturnDesc.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtReturnDesc.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtReturnDesc.ErrorMessage = "";
+            this.txtReturnDesc.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtReturnDesc.Location = new System.Drawing.Point(530, 20);
+            this.txtReturnDesc.MaxLength = 20;
+            this.txtReturnDesc.Name = "txtReturnDesc";
+            this.txtReturnDesc.Size = new System.Drawing.Size(120, 21);
+            this.txtReturnDesc.TabIndex = 28;
+            // 
             // F_SAP_HEGII_0104
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -388,5 +445,9 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
         private System.Windows.Forms.DataGridViewTextBoxColumn LPN;
         private System.Windows.Forms.DataGridViewTextBoxColumn RETURNDESC;
         private System.Windows.Forms.DataGridViewTextBoxColumn CREATETIME;
+        private Basics.BaseControls.C_Label lblLogType;
+        private Basics.BaseControls.C_ComboBox cmbLogType;
+        private Basics.BaseControls.C_Label lblReturnDesc;
+        private Basics.BaseControls.C_TextBox txtReturnDesc;
     }
 }

DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0104.cs

@@ -90,6 +90,26 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
 
                 dtpDatebegin.Value = DateTime.Now.Date;
                 dtpDateend.Value = DateTime.Now.Date;
+
+                DataTable dtLogType = new DataTable();
+                dtLogType.Columns.Add("LogType", typeof(string));
+                dtLogType.Columns.Add("LogTypeName", typeof(string));
+                DataRow newRow = dtLogType.NewRow();
+                dtLogType.Rows.Add(newRow);
+
+                newRow = dtLogType.NewRow();
+                newRow["LogType"] = "1";
+                newRow["LogTypeName"] = "交接";
+                dtLogType.Rows.Add(newRow);
+
+                newRow = dtLogType.NewRow();
+                newRow["LogType"] = "2";
+                newRow["LogTypeName"] = "撤销";
+                dtLogType.Rows.Add(newRow);
+
+                this.cmbLogType.DisplayMember = "LogTypeName";
+                this.cmbLogType.ValueMember = "LogType";
+                this.cmbLogType.DataSource = dtLogType;
             }
             catch (Exception ex)
             {
@@ -120,6 +140,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
                 cre.Name = "GetWMSDataLog";
                 cre.Properties["datebegin"] = dtpDatebegin.Value.Value;
                 cre.Properties["dateend"] = dtpDateend.Value.Value.AddDays(1);
+                cre.Properties["LogType"] = cmbLogType.SelectedValue;
+                cre.Properties["ReturnDesc"] = txtReturnDesc.Text;
 
                 ServiceResultEntity sre = DoAsync(() =>
                 {
@@ -154,6 +176,8 @@ namespace Dongke.IBOSS.PRD.Client.SAPDataModule
         {
             dtpDatebegin.Value = DateTime.Now.Date;
             dtpDateend.Value = DateTime.Now.Date;
+            this.cmbLogType.SelectedIndex = 0;
+            txtReturnDesc.Text = string.Empty;
         }
 
         /// <summary>

IBOSS.PRD.Service/WMSDataService/WMSDataLogic.cs

@@ -485,11 +485,17 @@ namespace Dongke.IBOSS.PRD.Service.WMSDataService
                 paras.Add(new OracleParameter(":CREATETIMEBEGIN", OracleDbType.Date, cre.Properties["datebegin"], ParameterDirection.Input));
                 paras.Add(new OracleParameter(":CREATETIMEEND", OracleDbType.Date, cre.Properties["dateend"], ParameterDirection.Input));
 
-                //if (!string.IsNullOrEmpty(cre.Properties["RETURNDESC"] + ""))
-                //{
-                //    sqlString += " AND WL.RETURNDESC LIKE :RETURNDESC\n";
-                //    paras.Add(new OracleParameter(":RETURNDESC", OracleDbType.NVarchar2, "%" + cre.Properties["RETURNDESC"] + "%", ParameterDirection.Input));
-                //}
+                if (!string.IsNullOrEmpty(cre.Properties["LogType"] + ""))
+                {
+                    sqlString += " AND WL.LOGTYPE = :LOGTYPE\n";
+                    paras.Add(new OracleParameter(":LOGTYPE", OracleDbType.NVarchar2, cre.Properties["LogType"], ParameterDirection.Input));
+                }
+
+                if (!string.IsNullOrEmpty(cre.Properties["ReturnDesc"] + ""))
+                {
+                    sqlString += " AND WL.RETURNDESC LIKE :RETURNDESC\n";
+                    paras.Add(new OracleParameter(":RETURNDESC", OracleDbType.NVarchar2, "%" + cre.Properties["ReturnDesc"] + "%", ParameterDirection.Input));
+                }
 
                 sqlString += " order by WL.CREATETIME";