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

完善

master
songnan.zhang 3 years ago
parent
dca7235053
commit
b51a97d008
7 changed files with 76 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      APP/QMAPP.Web/App_Data/MainPower.xml
  2. 4
      APP/QMAPP.Web/Web.config
  3. 14
      APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplacementDAL.cs
  4. 15
      APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplacement.cs
  5. 27
      APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplacementModel.cs
  6. 4
      APPQ5/QMAPP.FJC.Web/Web.config
  7. 4
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

20
APP/QMAPP.Web/App_Data/MainPower.xml
View File

@ -159,6 +159,26 @@
<PowerInfo PowerID="CD03860003" PowerDes="启用" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD03860000"/> <PowerInfo PowerID="CD03860003" PowerDes="启用" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD03860000"/>
<PowerInfo PowerID="CD03860004" PowerDes="禁用" PowerType="button" ActionList="" Visible="true" Seq="4" SuperID="CD03860000"/> <PowerInfo PowerID="CD03860004" PowerDes="禁用" PowerType="button" ActionList="" Visible="true" Seq="4" SuperID="CD03860000"/>
<PowerInfo PowerID="CD03870000" PowerDes="BZD绑定配置" PowerType="" ActionList="" Visible="true" Seq="3" SuperID="CD03000000"/>
<PowerInfo PowerID="CD03870001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD03870000"/>
<PowerInfo PowerID="CD03870002" PowerDes="新建" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD03870000"/>
<PowerInfo PowerID="CD03870003" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD03870000"/>
<PowerInfo PowerID="CD03870004" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="4" SuperID="CD03870000"/>
<PowerInfo PowerID="CD03880000" PowerDes="BZD记录" PowerType="" ActionList="" Visible="true" Seq="3" SuperID="CD03000000"/>
<PowerInfo PowerID="CD03880001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD03880000"/>
<PowerInfo PowerID="CD03890000" PowerDes="时间验证" PowerType="" ActionList="" Visible="true" Seq="3" SuperID="CD03000000"/>
<PowerInfo PowerID="CD03890001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD03890000"/>
<PowerInfo PowerID="CD03890003" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD03890000"/>
<PowerInfo PowerID="CD03891000" PowerDes="补打记录" PowerType="" ActionList="" Visible="true" Seq="3" SuperID="CD03000000"/>
<PowerInfo PowerID="CD03891001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD03891000"/>
<PowerInfo PowerID="CD03892000" PowerDes="生产配置" PowerType="" ActionList="" Visible="true" Seq="3" SuperID="CD03000000"/>
<PowerInfo PowerID="CD03892001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD03892000"/>
<PowerInfo PowerID="CD03892003" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD03892000"/>
<PowerInfo PowerID="CD02000000" PowerDes="计划管理" PowerType="" ActionList="" Visible="true" Seq="1" SuperID=""/> <PowerInfo PowerID="CD02000000" PowerDes="计划管理" PowerType="" ActionList="" Visible="true" Seq="1" SuperID=""/>
<PowerInfo PowerID="CD02010000" PowerDes="FIS计划管理" PowerType="" ActionList="" Visible="true" Seq="1" SuperID="CD02000000"/> <PowerInfo PowerID="CD02010000" PowerDes="FIS计划管理" PowerType="" ActionList="" Visible="true" Seq="1" SuperID="CD02000000"/>

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

@ -45,9 +45,9 @@
<!--<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=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=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>

14
APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplacementDAL.cs
View File

@ -123,30 +123,32 @@ namespace QMAPP.MD.DAL
try try
{ {
if (condition.BeginTime == Convert.ToDateTime("0001/1/1 00:00:00")) if (condition.BeginTime == Convert.ToDateTime("0001/1/1 00:00:00"))
condition.BeginTime = DateTime.Now.AddDays(-5); condition.BeginTime = DateTime.Now.AddDays(-1);
if (condition.EndTime == Convert.ToDateTime("0001/1/1 00:00:00")) if (condition.EndTime == Convert.ToDateTime("0001/1/1 00:00:00"))
condition.EndTime = DateTime.Now; condition.EndTime = DateTime.Now;
//构成查询语句 //构成查询语句
sqlBuilder.Append("select PID,Type,ProductCode,CreateTime,CreateUser "); sqlBuilder.Append("select b.PID,b.Type,b.ProductCode,m.MAINCODE as 'BZDBarcode',m.MATERIAL_CODE as 'BZDMaterial_Code',t.MATERIAL_NAME as 'BZDMaterial_CodeName',b.CreateTime,b.CreateUser ");
sqlBuilder.Append("FROM T_AW_BarCode_Replacement "); sqlBuilder.Append("from T_AW_BarCode_Replacement as b left join T_AW_MAIN as m on b.ProductCode = m.EPIDERMISCODE LEFT JOIN T_MD_MATERIAL as t on m.MATERIAL_CODE = t.MATERIAL_CODE ");
//查询条件 //查询条件
//查询条件 //查询条件
if (string.IsNullOrEmpty(condition.ProductCode) == false) if (string.IsNullOrEmpty(condition.ProductCode) == false)
{ {
whereBuilder.Append(" AND ProductCode like @ProductCode "); whereBuilder.Append(" AND b.ProductCode like @ProductCode ");
parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = "%" + condition.ProductCode + "%" }); parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = "%" + condition.ProductCode + "%" });
} }
//查询条件 //查询条件
if (string.IsNullOrEmpty(condition.Type) == false) if (string.IsNullOrEmpty(condition.Type) == false)
{ {
whereBuilder.Append(" AND Type like @Type "); whereBuilder.Append(" AND b.Type like @Type ");
parameters.Add(new DataParameter { ParameterName = "Type", DataType = DbType.String, Value = "%" + condition.Type + "%" }); parameters.Add(new DataParameter { ParameterName = "Type", DataType = DbType.String, Value = "%" + condition.Type + "%" });
} }
whereBuilder.Append($" AND CreateTime >= '{condition.BeginTime}' and CreateTime <= '{condition.EndTime}' "); whereBuilder.Append($" AND b.CreateTime >= '{condition.BeginTime}' and b.CreateTime <= '{condition.EndTime}' ");
if (whereBuilder.Length > 0) if (whereBuilder.Length > 0)
{ {

15
APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplacement.cs
View File

@ -35,6 +35,21 @@ namespace QMAPP.FJC.Entity.BZD
[DBColumn(ColumnName = "ProductCode", DataType = DbType.String)] [DBColumn(ColumnName = "ProductCode", DataType = DbType.String)]
public string ProductCode { get; set; } public string ProductCode { get; set; }
/// <summary>
/// BZD条码
/// </summary>
public string BZDBarcode { get; set; }
/// <summary>
/// 总成零件号
/// </summary>
public string BZDMaterial_Code { get; set; }
/// <summary>
/// 总成零件名称
/// </summary>
public string BZDMaterial_CodeName { get; set; }
/// <summary> /// <summary>
/// 新增时间 /// 新增时间
/// </summary> /// </summary>

27
APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplacementModel.cs
View File

@ -40,6 +40,33 @@ namespace QMAPP.FJC.Web.Models.BZD
[DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)] [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
public string ProductCode { get; set; } public string ProductCode { get; set; }
/// <summary>
/// BZD条码
/// </summary>
[Description("BZD条码")]
[HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
[InputType(inputType.text)]
[DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
public string BZDBarcode { get; set; }
/// <summary>
/// 总成零件号
/// </summary>
[Description("总成零件号")]
[HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
[InputType(inputType.text)]
[DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
public string BZDMaterial_Code { get; set; }
/// <summary>
/// 总成零件名称
/// </summary>
[Description("总成零件名称")]
[HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
[InputType(inputType.text)]
[DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
public string BZDMaterial_CodeName { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>

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

@ -36,9 +36,9 @@
<!--<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=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=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<!--日志组件配置开始--> <!--日志组件配置开始-->

4
ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
View File

@ -75,8 +75,8 @@
<add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>--> <add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=.;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/> <!--<add name="maindb" connectionString="Data Source=.;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=.;Initial Catalog=BZD;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/> <add name="maindbBZD" connectionString="Data Source=.;Initial Catalog=BZD;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>-->

Write Preview
Loading…
Cancel
Save