InOutPut
/
Put_MES
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整缺陷信息表

master
songnan.zhang 3 years ago
parent
cad1c8c205
commit
1d07fbacf0
9 changed files with 40 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      APP/QMAPP.Web/App_Data/PCPower.xml
  2. 4
      APP/QMAPP.Web/Web.config
  3. 8
      APPMD/QMAPP.MD.DAL/DefectDictDAL.cs
  4. 16
      APPMD/QMAPP.MD.Web/Models/DefectDictModel.cs
  5. 8
      APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictEdit.aspx
  6. 6
      APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictList.aspx
  7. 4
      APPQ5/QMAPP.FJC.Web/Web.config
  8. 6
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs
  9. 3
      APPQ5/QMAPP.WinForm/Menu.xml

1
APP/QMAPP.Web/App_Data/PCPower.xml
View File

@ -28,6 +28,7 @@
<PowerInfo PowerID="CD82010500" PowerDes="重打总成码" PowerType="button" ActionList="" Visible="true" Seq="6" SuperID="CD82010000"></PowerInfo>
<PowerInfo PowerID="CD82010600" PowerDes="ANDON呼叫" PowerType="button" ActionList="" Visible="true" Seq="7" SuperID="CD82010000"></PowerInfo>
<PowerInfo PowerID="CD82010700" PowerDes="工位调整" PowerType="button" ActionList="" Visible="true" Seq="8" SuperID="CD82010000"></PowerInfo>
<PowerInfo PowerID="CD82010800" PowerDes="产品返修" PowerType="button" ActionList="" Visible="true" Seq="9" SuperID="CD82010000"></PowerInfo>
<PowerInfo PowerID="CD82020000" PowerDes="仪表板总成码补打" PowerType="item" ActionList="" Visible="true" Seq="1" SuperID="CD82000000"></PowerInfo>
<PowerInfo PowerID="CD82020100" PowerDes="正常补打" PowerType="item" ActionList="" Visible="true" Seq="1" SuperID="CD82020000"></PowerInfo>
<PowerInfo PowerID="CD82020200" PowerDes="强制补打" PowerType="item" ActionList="" Visible="true" Seq="2" SuperID="CD82020000"></PowerInfo>

4
APP/QMAPP.Web/Web.config
View File

@ -45,14 +45,14 @@
<!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
</connectionStrings>
<!--日志组件配置开始-->

8
APPMD/QMAPP.MD.DAL/DefectDictDAL.cs
View File

@ -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)"); //逻辑删除字段
//查询条件
@ -120,6 +120,12 @@ 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)

16
APPMD/QMAPP.MD.Web/Models/DefectDictModel.cs
View File

@ -42,16 +42,14 @@ namespace QMAPP.MD.Web.Models
[DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
public string MFGNAME { get; set; }
/// <summary>
/// 备用字段
/// 类型
/// </summary>
[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; }
/// <summary>
/// 备用字段
@ -61,7 +59,7 @@ 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; }
/// <summary>
/// 备用字段

8
APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictEdit.aspx
View File

@ -10,6 +10,14 @@
<tr>
<td>
<table>
<tr>
<th align="right">
<%=Html.QV(p=>p.TYPE_CODE) %>
</th>
<td>
<%=Html.QC(p => p.TYPE_CODE)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p=>p.MFGCODE) %>

6
APPMD/QMAPP.MD.Web/Views/DefectDict/DefectDictList.aspx
View File

@ -14,6 +14,12 @@
<td>
<%=Html.QC(p => p.MFGCODE)%>
</td>
<th align="right">
<%=Html.QV(p=>p.TYPE_CODE) %>
</th>
<td>
<%=Html.QC(p => p.TYPE_CODE)%>
</td>
</tr>
</table>
<div style="left: 1px; position: relative;"></div>

4
APPQ5/QMAPP.FJC.Web/Web.config
View File

@ -36,14 +36,14 @@
<!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
</connectionStrings>
<!--日志组件配置开始-->

6
APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs
View File

@ -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

3
APPQ5/QMAPP.WinForm/Menu.xml
View File

@ -26,9 +26,12 @@
<PowerInfo PowerID="CD82010404" PowerDes="找回工单" FormName="OperationForm" ButtonName="tsmiTakebackOrder"/>
<PowerInfo PowerID="CD82010405" PowerDes="删除工单" FormName="OperationForm" ButtonName="tsmiDeleteOrder"/>
<PowerInfo PowerID="CD82010406" PowerDes="忽略FIS断号" FormName="OperationForm" ButtonName="tsmiIgnoreFISBreak"/>
<PowerInfo PowerID="CD82010500" PowerDes="总成打印" FormName="OperationForm" ButtonName="tsbPrint"/>
<PowerInfo PowerID="CD82010600" PowerDes="ANDON呼叫" FormName="OperationForm" ButtonName="tsbAndon"/>
<PowerInfo PowerID="CD82010700" PowerDes="工位调整" FormName="OperationForm" ButtonName="lblLock"/>
<PowerInfo PowerID="CD82010800" PowerDes="产品返修" FormName="OperationForm" ButtonName="btnEditProduct"/>
<PowerInfo PowerID="CD82020100" PowerDes="仪表板总成码补打" ButtonName="PrintCodeToolStripMenuItem"/>
<PowerInfo PowerID="CD82020200" PowerDes="强制补打" FormName="PrintForm" ButtonName="cbForce"/>
<PowerInfo PowerID="CD82030100" PowerDes="门板计划标签打印" ButtonName="tsmiPrintPlanlabel"/>

Write Preview
Loading…
Cancel
Save