Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/IMEX.mes.wcf

DK.Client/SystemModule/F_MST_0208.cs

@@ -40,7 +40,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
             /// <summary>
             /// pc登录
             /// </summary>
-            pc登录 = 0,
+            PC登录 = 0,
             /// <summary>
             /// PC登出
             /// </summary>
@@ -108,6 +108,10 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
                 dt.Rows.Add(dr);
                 d++;
             }
+            dr = dt.NewRow();
+            dr[0] =  6;
+            dr[1] = "web质量登记";
+            dt.Rows.Add(dr); 
             cbActionType.DisplayMember = "actiontype";
             cbActionType.DataSource = dt;
             cbActionType.Text = "";
@@ -134,6 +138,9 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
                 this.dgvUserLogin.AutoGenerateColumns = false;
                 this.SetToolStripButtonEnable();
                 this.scbOrganization.EditReadOnly = true;
+
+                this.opentime.Value = DateTime.Now.AddHours(-1);
+                this.closetime.Value = DateTime.Now;
             }
             catch (Exception ex)
             {
@@ -165,6 +172,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
                     if (this.DataSource != null && this.DataSource.Tables.Count > Constant.INT_IS_ZERO)
                     {
                         this.dgvUserLogin.DataSource = this.DataSource.Tables[0];
+                        #region
                         //foreach (DataGridViewRow gvrFor in this.dgvUser.Rows)
                         //{
                         //    string ValueStr = "";
@@ -191,6 +199,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
                         //        gvrFor.Cells["IsLocked"].Value = "正常";
                         //    }
                         //}
+                        #endregion
                         if (this.DataSource.Tables[0].Rows.Count <= Constant.INT_IS_ZERO)
                         {
                             // 提示未查找到数据
@@ -222,6 +231,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
             this.txtUserName.Clear();
             this.scbOrganization.ClearValue();
             this.cbActionType.Text = "";
+            this.opentime.Value = DateTime.Now.AddHours(-1);
+            this.closetime.Value = DateTime.Now;
         }
 
 
@@ -334,6 +345,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
                 cre.Properties["UserName"] = this.txtUserName.Text.Trim();
                 cre.Properties["Organization"] = this.scbOrganization.CheckedValue + "";
                 cre.Properties["ActionType"] = cbActionType.Text;
+                cre.Properties["opentime"] =this.opentime.Value;
+                cre.Properties["closetime"] = this.closetime.Value;
                 ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
                 if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
                 {

DK.Client/SystemModule/F_MST_0208.designer.cs

@@ -37,9 +37,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.txtUserCode = new System.Windows.Forms.TextBox();
             this.txtUserName = new System.Windows.Forms.TextBox();
             this.lblMAC = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -52,6 +49,10 @@
             this.cbActionType = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
             this.scbOrganization = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbOrganization();
             this.dgvUserLogin = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.opentime = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.closetime = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
             this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OrganizationName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -63,39 +64,11 @@
             this.IMEI = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.PostName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tsrOperate.SuspendLayout();
+            this.ACTIONTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvUserLogin)).BeginInit();
             this.SuspendLayout();
             // 
-            // tsrOperate
-            // 
-            this.tsrOperate.AutoSize = false;
-            this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
-            this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.SystemModule.Resource1.functionbackground;
-            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator3,
-            this.toolStripSeparator1});
-            this.tsrOperate.Location = new System.Drawing.Point(0, 0);
-            this.tsrOperate.Name = "tsrOperate";
-            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(1031, 35);
-            this.tsrOperate.TabIndex = 0;
-            // 
-            // toolStripSeparator3
-            // 
-            this.toolStripSeparator3.AutoSize = false;
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.AutoSize = false;
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
-            // 
             // txtUserCode
             // 
             this.txtUserCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
@@ -110,7 +83,7 @@
             // txtUserName
             // 
             this.txtUserName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtUserName.Location = new System.Drawing.Point(238, 20);
+            this.txtUserName.Location = new System.Drawing.Point(220, 21);
             this.txtUserName.MaxLength = 20;
             this.txtUserName.Name = "txtUserName";
             this.txtUserName.Size = new System.Drawing.Size(97, 21);
@@ -122,7 +95,7 @@
             this.lblMAC.BackColor = System.Drawing.Color.Transparent;
             this.lblMAC.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblMAC.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblMAC.Location = new System.Drawing.Point(578, 24);
+            this.lblMAC.Location = new System.Drawing.Point(509, 24);
             this.lblMAC.Name = "lblMAC";
             this.lblMAC.Size = new System.Drawing.Size(53, 12);
             this.lblMAC.TabIndex = 17;
@@ -146,7 +119,7 @@
             this.lblUserName.BackColor = System.Drawing.Color.Transparent;
             this.lblUserName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblUserName.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblUserName.Location = new System.Drawing.Point(189, 24);
+            this.lblUserName.Location = new System.Drawing.Point(173, 24);
             this.lblUserName.Name = "lblUserName";
             this.lblUserName.Size = new System.Drawing.Size(41, 12);
             this.lblUserName.TabIndex = 3;
@@ -159,7 +132,7 @@
             this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
             this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-            this.btnClearCondition.Location = new System.Drawing.Point(916, 21);
+            this.btnClearCondition.Location = new System.Drawing.Point(856, 20);
             this.btnClearCondition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnClearCondition.Name = "btnClearCondition";
             this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
@@ -175,7 +148,7 @@
             this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
             this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSearch.ForeColor = System.Drawing.Color.White;
-            this.btnSearch.Location = new System.Drawing.Point(825, 20);
+            this.btnSearch.Location = new System.Drawing.Point(732, 20);
             this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(85, 30);
@@ -190,6 +163,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
             this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+            this.gbxCondition.Controls.Add(this.closetime);
+            this.gbxCondition.Controls.Add(this.c_Label3);
+            this.gbxCondition.Controls.Add(this.opentime);
+            this.gbxCondition.Controls.Add(this.c_Label2);
             this.gbxCondition.Controls.Add(this.c_Label1);
             this.gbxCondition.Controls.Add(this.cbActionType);
             this.gbxCondition.Controls.Add(this.scbOrganization);
@@ -203,7 +180,7 @@
             this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
             this.gbxCondition.IsMustInput = false;
-            this.gbxCondition.Location = new System.Drawing.Point(12, 36);
+            this.gbxCondition.Location = new System.Drawing.Point(12, 12);
             this.gbxCondition.Name = "gbxCondition";
             this.gbxCondition.OriginalHeight = -1;
             this.gbxCondition.Size = new System.Drawing.Size(1007, 78);
@@ -217,7 +194,7 @@
             this.c_Label1.BackColor = System.Drawing.Color.Transparent;
             this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label1.Location = new System.Drawing.Point(353, 24);
+            this.c_Label1.Location = new System.Drawing.Point(323, 24);
             this.c_Label1.Name = "c_Label1";
             this.c_Label1.Size = new System.Drawing.Size(29, 12);
             this.c_Label1.TabIndex = 111;
@@ -239,7 +216,7 @@
             this.cbActionType.ListBox.Name = "";
             this.cbActionType.ListBox.Size = new System.Drawing.Size(132, 136);
             this.cbActionType.ListBox.TabIndex = 0;
-            this.cbActionType.Location = new System.Drawing.Point(655, 21);
+            this.cbActionType.Location = new System.Drawing.Point(568, 21);
             this.cbActionType.Name = "cbActionType";
             this.cbActionType.Size = new System.Drawing.Size(134, 20);
             this.cbActionType.TabIndex = 110;
@@ -248,7 +225,7 @@
             // 
             this.scbOrganization.CheckedData = null;
             this.scbOrganization.IsOnlyDisplayEnd = false;
-            this.scbOrganization.Location = new System.Drawing.Point(404, 21);
+            this.scbOrganization.Location = new System.Drawing.Point(358, 21);
             this.scbOrganization.Name = "scbOrganization";
             this.scbOrganization.Size = new System.Drawing.Size(145, 21);
             this.scbOrganization.TabIndex = 29;
@@ -293,7 +270,8 @@
             this.IP地址,
             this.IMEI,
             this.PostName,
-            this.UserID});
+            this.UserID,
+            this.ACTIONTIME});
             this.dgvUserLogin.ColumnTreeView = null;
             this.dgvUserLogin.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.dgvUserLogin.DynamicColumnName = "";
@@ -307,7 +285,7 @@
             this.dgvUserLogin.IsOpenMergeCellFlag = false;
             this.dgvUserLogin.IsSubTotalFlag = false;
             this.dgvUserLogin.IsTopDeep = false;
-            this.dgvUserLogin.Location = new System.Drawing.Point(12, 119);
+            this.dgvUserLogin.Location = new System.Drawing.Point(12, 95);
             this.dgvUserLogin.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.dgvUserLogin.MergeColumnNames = null;
             this.dgvUserLogin.MergeDetailColumnNames = null;
@@ -324,13 +302,57 @@
             this.dgvUserLogin.RowsDefaultCellStyle = dataGridViewCellStyle8;
             this.dgvUserLogin.RowTemplate.Height = 21;
             this.dgvUserLogin.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvUserLogin.Size = new System.Drawing.Size(1007, 286);
+            this.dgvUserLogin.Size = new System.Drawing.Size(1007, 310);
             this.dgvUserLogin.SortOrderColumnName = null;
             this.dgvUserLogin.TabIndex = 21;
             this.dgvUserLogin.Tag = true;
             this.dgvUserLogin.TotalSumColumns = null;
             this.dgvUserLogin.ViewRowFilter = "";
             // 
+            // c_Label2
+            // 
+            this.c_Label2.AutoSize = true;
+            this.c_Label2.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label2.Location = new System.Drawing.Point(11, 56);
+            this.c_Label2.Name = "c_Label2";
+            this.c_Label2.Size = new System.Drawing.Size(53, 12);
+            this.c_Label2.TabIndex = 112;
+            this.c_Label2.Text = "操作时间";
+            // 
+            // opentime
+            // 
+            this.opentime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+            this.opentime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.opentime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.opentime.Location = new System.Drawing.Point(70, 52);
+            this.opentime.Name = "opentime";
+            this.opentime.Size = new System.Drawing.Size(154, 21);
+            this.opentime.TabIndex = 113;
+            // 
+            // c_Label3
+            // 
+            this.c_Label3.AutoSize = true;
+            this.c_Label3.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label3.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label3.Location = new System.Drawing.Point(230, 56);
+            this.c_Label3.Name = "c_Label3";
+            this.c_Label3.Size = new System.Drawing.Size(11, 12);
+            this.c_Label3.TabIndex = 114;
+            this.c_Label3.Text = "-";
+            // 
+            // closetime
+            // 
+            this.closetime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+            this.closetime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.closetime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.closetime.Location = new System.Drawing.Point(247, 52);
+            this.closetime.Name = "closetime";
+            this.closetime.Size = new System.Drawing.Size(153, 21);
+            this.closetime.TabIndex = 115;
+            // 
             // UserCode
             // 
             this.UserCode.DataPropertyName = "UserCode";
@@ -433,6 +455,13 @@
             this.UserID.ReadOnly = true;
             this.UserID.Visible = false;
             // 
+            // ACTIONTIME
+            // 
+            this.ACTIONTIME.DataPropertyName = "ACTIONTIME";
+            this.ACTIONTIME.HeaderText = "操作时间";
+            this.ACTIONTIME.Name = "ACTIONTIME";
+            this.ACTIONTIME.ReadOnly = true;
+            // 
             // F_MST_0208
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -441,15 +470,12 @@
             this.ClientSize = new System.Drawing.Size(1031, 416);
             this.Controls.Add(this.dgvUserLogin);
             this.Controls.Add(this.gbxCondition);
-            this.Controls.Add(this.tsrOperate);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "F_MST_0208";
             this.Text = " 登录记录";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_MST_0203_FormClosed);
             this.Load += new System.EventHandler(this.FrmUser_Load);
-            this.tsrOperate.ResumeLayout(false);
-            this.tsrOperate.PerformLayout();
             this.gbxCondition.ResumeLayout(false);
             this.gbxCondition.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvUserLogin)).EndInit();
@@ -458,8 +484,6 @@
         }
 
         #endregion
-
-        private Basics.BaseControls.C_ToolStrip tsrOperate;
         private Dongke.IBOSS.PRD.Basics.BaseControls.C_Button btnSearch;
         private System.Windows.Forms.TextBox txtUserCode;
         private System.Windows.Forms.TextBox txtUserName;
@@ -467,13 +491,15 @@
         private Dongke.IBOSS.PRD.Basics.BaseControls.C_Label lblUserName;
         private Dongke.IBOSS.PRD.Basics.BaseControls.C_Label lblMAC;
         private Dongke.IBOSS.PRD.Basics.BaseControls.C_Button btnClearCondition;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         private Basics.BaseControls.C_GroupBox gbxCondition;
         private Basics.BaseControls.C_DataGridView dgvUserLogin;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private Controls.SearchBox.ScbOrganization scbOrganization;
         private Basics.BaseControls.C_Label c_Label1;
         private Basics.BaseControls.DKListBoxComboBox cbActionType;
+        private Basics.BaseControls.C_Label c_Label2;
+        private Basics.BaseControls.C_DateTimePicker opentime;
+        private Basics.BaseControls.C_DateTimePicker closetime;
+        private Basics.BaseControls.C_Label c_Label3;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserName;
         private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationName;
@@ -485,5 +511,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn IMEI;
         private System.Windows.Forms.DataGridViewTextBoxColumn PostName;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ACTIONTIME;
     }
 }

DK.Client/SystemModule/F_MST_0208.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>147, 17</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -209,6 +206,9 @@
   <metadata name="PostName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="ACTIONTIME.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>45</value>
   </metadata>

DK.Service/DKIBOSSPRDLogic/DKIBOSSPRDLogic.cs

@@ -62,6 +62,7 @@ namespace Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic
                     new OracleParameter("in_SessionKey",requestEntity.SessionKey),
                     new OracleParameter("in_ComputerName",requestEntity.ComputerName),
                     new OracleParameter("in_IP",requestEntity.IPAddress),
+                    new OracleParameter("in_IMEI",requestEntity.IMEI),
                     new OracleParameter("in_LoginType",actionType),
                     new OracleParameter("out_LoginStatus",OracleDbType.Int16, ParameterDirection.Output),
                     new OracleParameter("out_UserOrganization",OracleDbType.RefCursor, ParameterDirection.Output),
@@ -108,9 +109,9 @@ namespace Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic
                     resultEntity.CurrentUserEntity.FunctionData = returnDataSet.Tables[4];      //系统功能菜单
                     #endregion
                 }
-                else if (paras[8] != null)
+                else if (paras[9] != null)
                 {
-                    loginStatus = Convert.ToInt32(paras[8].Value.ToString());
+                    loginStatus = Convert.ToInt32(paras[9].Value.ToString());
                 }
                 else
                 {
@@ -247,9 +248,9 @@ namespace Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic
                     resultEntity.CurrentUserEntity.FunctionData = returnDataSet.Tables[4];      //系统功能菜单
                     #endregion
                 }
-                else if (paras[8] != null)
+                else if (paras[9] != null)
                 {
-                    loginStatus = Convert.ToInt32(paras[8].Value.ToString());
+                    loginStatus = Convert.ToInt32(paras[9].Value.ToString());
                 }
                 else
                 {

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -9333,12 +9333,16 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     if (productionData.OrgGoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode()
                         || 
                         productionData.OrgGoodsLevelTypeID == Constant.GoodsLevelType.Waste.GetHashCode()
+                        ||
+                        productionData.OrgGoodsLevelTypeID == 20 // 中陶特加 废品（废品就是报费，直接扔的那种） 2024-07-09
                         )
                     {
                         //改为 次品 废品 xuwei modify 2019-12-13 加入废品识别
                         if (productionData.GoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode()
                             ||
                             productionData.GoodsLevelTypeID == Constant.GoodsLevelType.Waste.GetHashCode()
+                            ||
+                            productionData.GoodsLevelTypeID == 20 // 中陶特加 废品（废品就是报费，直接扔的那种） 2024-07-09
                             )
                         {
                             // 删除生产数据及相关表与报损表
@@ -9350,8 +9354,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                             RejectToReject = true;
                         } //改为不是 次品 废品 xuwei modify 2019-12-13 加入废品识别
                         else if (productionData.GoodsLevelTypeID != Constant.GoodsLevelType.Reject.GetHashCode()
-                            ||
+                            &&
                             productionData.GoodsLevelTypeID != Constant.GoodsLevelType.Waste.GetHashCode()
+                            &&
+                            productionData.GoodsLevelTypeID != 20 // 中陶特加 废品（废品就是报费，直接扔的那种） 2024-07-09
                             )
                         {
                             // 删除生产数据及相关表与报损表
@@ -9452,6 +9458,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 else if (productionData.GoodsLevelTypeID == (int)Constant.GoodsLevelType.Reject
                         ||
                         productionData.GoodsLevelTypeID == (int)Constant.GoodsLevelType.Waste
+                        ||
+                        productionData.GoodsLevelTypeID == 20 // 中陶特加 废品（废品就是报费，直接扔的那种） 2024-07-09
                     )
                 {
                     //productionData.GoodsLevelID = null;

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -2241,6 +2241,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					"  left join TP_MST_Goods Goods  on TP_PM_InProduction.GoodsID=Goods.GoodsID " +
 					"  left join tp_mst_goodstype gt on gt.goodstypeid = Goods.goodstypeid " +
 					"  Where TP_PM_InProduction.ValueFlag = 1 " +
+					"  and (TP_PM_InProduction.GoodsLevelTypeID is null or TP_PM_InProduction.GoodsLevelTypeID <> 20) " +
 					"  and TP_PM_InProduction.AccountID=:AccountID ";
 
 			return selSql;

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -55,6 +55,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					new OracleParameter("in_SessionKey",requestEntity.SessionKey),
 					new OracleParameter("in_ComputerName",requestEntity.ComputerName),
 					new OracleParameter("in_IP",requestEntity.IPAddress),
+					new OracleParameter("in_IMEI",requestEntity.IMEI),
 					new OracleParameter("in_LoginType",actionType),
 					new OracleParameter("out_LoginStatus",OracleDbType.Int16, ParameterDirection.Output),
 					new OracleParameter("out_UserOrganization",OracleDbType.RefCursor, ParameterDirection.Output),

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -1777,27 +1777,34 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                         	TP_MST_USERLOGINLOG.MAC,
                                         	COMPUTERNAME,
                                             ORGANIZATIONCODE,
-                                        CASE
-                                        		ACTIONTYPE 
-                                        		WHEN '0' THEN
-                                        		'pc登录' 
-                                        		WHEN '1' THEN
-                                        		'PC登出' 
-                                        		WHEN '2' THEN
-                                        		'移动设备登录' 
-                                        		WHEN '3' THEN
-                                        		'移动设备登出' 
-                                        		WHEN '4' THEN
-                                        		'PC登录MBC' ELSE 'PC登出MBC' 
-                                        	END ACTIONTYPE,
-                                        	IP ,IMEI,ACTIONTIME
+                                            CASE MAC
+	                                        WHEN 'xx:xx:xx:xx:xx:xx' THEN
+		                                    'web质量登记'
+	                                        ELSE
+	                                        CASE
+		                                    ACTIONTYPE 
+		                                    WHEN '0' THEN
+		                                    'pc登录' 
+		                                    WHEN '1' THEN
+		                                    'PC登出' 
+		                                    WHEN '2' THEN
+		                                    '移动设备登录' 
+		                                    WHEN '3' THEN
+		                                    '移动设备登出' 
+		                                    WHEN '4' THEN
+		                                    'PC登录MBC' ELSE 'PC登出MBC' 
+	                                        END 
+                                            END  as  ACTIONTYPE,
+                                        	IP ,
+                                            IMEI,
+                                            ACTIONTIME
                                         FROM
                                         	TP_MST_USERLOGINLOG
                                         	LEFT JOIN TP_MST_User U ON u.USERID = TP_MST_USERLOGINLOG.USERID
                                         	LEFT JOIN TP_MST_Organization O ON U.Organizationid = O.Organizationid
                                         	LEFT JOIN TP_MST_POST POST ON POST.POSTID = U.POST 
                                         WHERE
-                                        	U.AccountID = 1) where 1=1  ";
+                                        	U.AccountID = 1) where 1=1  AND ACTIONTIME>=to_date(:opentime,'yyyy-mm-dd hh24:mi:ss')AND ACTIONTIME<=to_date(:closetime,'yyyy-mm-dd hh24:mi:ss')";
                 if (!string.IsNullOrEmpty(cre.Properties["UserCode"].ToString()))
                 {
                     sqlString += "AND UserCode  like :UserCode";
@@ -1812,15 +1819,21 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 }
                 if (!string.IsNullOrEmpty(cre.Properties["ActionType"].ToString()))
                 {
-                    sqlString += " AND  ActionType like :ActionType";
+                    if (cre.Properties["ActionType"].ToString()== "6")
+                    {
+                        sqlString += " AND  MAC = 'xx:xx:xx:xx:xx:xx'";
+                    }
+                    else { sqlString += " AND  ActionType like :ActionType"; }  
                 }
                 sqlString += @" ORDER BY
-                                        	ACTIONTIME DESC ";
+                                        	ACTIONTIME DESC";
                 paras = new OracleParameter[]{
                     new OracleParameter(":UserCode",'%'+cre.Properties["UserCode"].ToString()+'%'),
                     new OracleParameter(":UserName",'%'+cre.Properties["UserName"].ToString()+'%'),
                     new OracleParameter(":Organization",cre.Properties["Organization"].ToString()),
                     new OracleParameter(":ActionType",'%'+cre.Properties["ActionType"].ToString()+'%'),
+                     new OracleParameter(":opentime",cre.Properties["opentime"].ToString()),
+                     new OracleParameter(":closetime",cre.Properties["closetime"].ToString()),
                 };
                 ServiceResultEntity sre = new ServiceResultEntity();
                 sre.Data = conn.GetSqlResultToDs(sqlString, paras);

WCF.Service/WCF.Hosting/Config.ini

@@ -3,12 +3,12 @@ ServiceName=
 Description=
 
 [DBSetting]
-DBIP=10.0.8.2
+DBIP=10.0.8.4
 DBPort=1521
 #SID=ibossmes
 #DBUser=devhgcz
-SID=dkmes
-DBUser=mes
+SID=mestest
+DBUser=mestest
 DBPassword=etLHPkLTOLw=
 
 [WCFSetting]

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -486,13 +486,13 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 				// 验证请求头信息
 				actionResult = this.DoPDACheck(accountCode, userCode, userPassword, sessionKey);
 
-				// 验证失败
-				if (actionResult.Status != (int)Constant.PDAResult.Success)
-				{
-					return actionResult;
-				}
+                // 验证失败
+                if (actionResult.Status != (int)Constant.PDAResult.Success)
+                {
+                    return actionResult;
+                }
 
-				DataSet barcodeDataSet = ServiceInvoker.Invoke<DataSet>(this,
+                DataSet barcodeDataSet = ServiceInvoker.Invoke<DataSet>(this,
 				   () => PMModuleLogic.CheckBarcodePDA(procedureID, barcode, sUserInfo));
 
 				if (barcodeDataSet != null && barcodeDataSet.Tables.Count > Constant.INT_IS_ZERO)