diff --git a/APP/QMAPP.Web/App_Data/PCPower.xml b/APP/QMAPP.Web/App_Data/PCPower.xml index 5c13bdd..2339765 100644 --- a/APP/QMAPP.Web/App_Data/PCPower.xml +++ b/APP/QMAPP.Web/App_Data/PCPower.xml @@ -28,6 +28,7 @@ + diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 7da4d20..58b78b0 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -45,14 +45,14 @@ - + - + diff --git a/APPMD/QMAPP.MD.DAL/DefectDictDAL.cs b/APPMD/QMAPP.MD.DAL/DefectDictDAL.cs index e4d954e..29a9cbf 100644 --- a/APPMD/QMAPP.MD.DAL/DefectDictDAL.cs +++ b/APPMD/QMAPP.MD.DAL/DefectDictDAL.cs @@ -110,7 +110,7 @@ namespace QMAPP.MD.DAL { //构成查询语句 sqlBuilder.Append("SELECT PID,MFGCODETYPE,MFGCODETYPENAME,MFGCODE,MFGNAME,TYPE_CODE "); - sqlBuilder.Append("FROM T_AW_MENDRECORDERERP where MFGCODETYPE = 'DEFECTCODE'and TYPE_CODE = 'N/a' "); + sqlBuilder.Append("FROM T_AW_MENDRECORDERERP where MFGCODETYPE = 'DEFECTCODE' "); //whereBuilder.Append(" AND ( FLGDEL<> '1' or FLGDEL is null)"); //逻辑删除字段 //查询条件 @@ -119,7 +119,13 @@ namespace QMAPP.MD.DAL { sqlBuilder.Append($" AND MFGCODE like '%{condition.MFGCODE}%' "); } - + + //查询条件 + if (string.IsNullOrEmpty(condition.TYPE_CODE) == false) + { + sqlBuilder.Append($" AND TYPE_CODE like '%{condition.TYPE_CODE}%' "); + } + return sqlBuilder.ToString(); } catch (Exception ex) diff --git a/APPMD/QMAPP.MD.Web/Models/DefectDictModel.cs b/APPMD/QMAPP.MD.Web/Models/DefectDictModel.cs index 089e3ea..9b598a1 100644 --- a/APPMD/QMAPP.MD.Web/Models/DefectDictModel.cs +++ b/APPMD/QMAPP.MD.Web/Models/DefectDictModel.cs @@ -41,17 +41,15 @@ namespace QMAPP.MD.Web.Models [InputType(inputType.text)] [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center)] public string MFGNAME { get; set; } - /// - /// 备用字段 + /// 类型 /// - [Description("")] - [HTMLInput(UpdateRead = true, required = true, MaxLength = 20)] - //[InputType(inputType.text)] - [DGColumn(Hidden = true, frozenColumns = false, Sortable = true, Width = 140, DataAlign = DataAlign.left)] - [InputType(inputType.hidden)] - public string MFGCODETYPE { get; set; } + [Description("类型")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 20)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center)] + public string TYPE_CODE { get; set; } /// /// 备用字段 @@ -61,8 +59,8 @@ namespace QMAPP.MD.Web.Models //[InputType(inputType.text)] [DGColumn(Hidden = true, frozenColumns = false, Sortable = true, Width = 140, DataAlign = DataAlign.left)] [InputType(inputType.hidden)] - public string TYPE_CODE { get; set; } - + public string MFGCODETYPE { get; set; } + /// /// 备用字段 /// diff --git a/APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictEdit.aspx b/APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictEdit.aspx index 533b11e..281de30 100644 --- a/APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictEdit.aspx +++ b/APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictEdit.aspx @@ -10,6 +10,14 @@ + + + + + +
+ <%=Html.QV(p=>p.TYPE_CODE) %> + + <%=Html.QC(p => p.TYPE_CODE)%> +
<%=Html.QV(p=>p.MFGCODE) %> diff --git a/APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictList.aspx b/APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictList.aspx index 148c130..536e4ac 100644 --- a/APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictList.aspx +++ b/APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictList.aspx @@ -14,6 +14,12 @@ <%=Html.QC(p => p.MFGCODE)%> + <%=Html.QV(p=>p.TYPE_CODE) %> + + <%=Html.QC(p => p.TYPE_CODE)%> +
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index 4531abf..9fb9983 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -36,14 +36,14 @@ - + - + diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs index a9ce91f..54903c5 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs @@ -770,14 +770,13 @@ // // btnEditProduct // - this.btnEditProduct.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnEditProduct.Font = new System.Drawing.Font("微软雅黑", 12F); this.btnEditProduct.Image = global::QMAPP.WinForm.Resource1.edit; this.btnEditProduct.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btnEditProduct.ImageTransparentColor = System.Drawing.Color.White; this.btnEditProduct.Name = "btnEditProduct"; this.btnEditProduct.Size = new System.Drawing.Size(126, 67); this.btnEditProduct.Text = "产品返修"; - this.btnEditProduct.Visible = false; this.btnEditProduct.Click += new System.EventHandler(this.btnEditProduct_Click); // // btnRefresh @@ -1463,14 +1462,13 @@ // // btnSignInfo // - this.btnSignInfo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSignInfo.Font = new System.Drawing.Font("微软雅黑", 12F); this.btnSignInfo.Image = global::QMAPP.WinForm.Resource1.edit; this.btnSignInfo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btnSignInfo.ImageTransparentColor = System.Drawing.Color.White; this.btnSignInfo.Name = "btnSignInfo"; this.btnSignInfo.Size = new System.Drawing.Size(126, 67); this.btnSignInfo.Text = "标记信息"; - this.btnSignInfo.Visible = false; this.btnSignInfo.Click += new System.EventHandler(this.btnSignInfo_Click); // // OperationForm diff --git a/APPQ5/QMAPP.WinForm/Menu.xml b/APPQ5/QMAPP.WinForm/Menu.xml index caf7182..2a37464 100644 --- a/APPQ5/QMAPP.WinForm/Menu.xml +++ b/APPQ5/QMAPP.WinForm/Menu.xml @@ -26,9 +26,12 @@ + + +