@ -337,15 +337,17 @@ namespace PaintingPC
string colorNo = "" ;
string colorNo = "" ;
string colorQQNo = "" ;
string colorQQNo = "" ;
string colorPRNo = "" ;
string colorPRNo = "" ;
string side1BarCode = "" ;
string sqlConnString = ConfigurationManager . ConnectionStrings [ "SqlConnStringForeign" ] . ToString ( ) ;
string sqlConnString = ConfigurationManager . ConnectionStrings [ "SqlConnStringForeign" ] . ToString ( ) ;
string sql = " select top 1 Setvalue_BC_Color_No, Setvalue_CC_Color_No, Setvalue_PR_Color_No from Paintline_Proddata where LTrim(RTrim(Skid_No)) = '" + skidNo + @"' order by TimeStamp desc " ;
string sql = " select top 1 Setvalue_BC_Color_No, Setvalue_CC_Color_No, Setvalue_PR_Color_No,Side_1_BC01 from Paintline_Proddata where LTrim(RTrim(Skid_No)) = '" + skidNo + @"' order by TimeStamp desc " ;
DataTable dtC = SqlHelper . GetDataDateTable ( sqlConnString , CommandType . Text , sql , null ) ;
DataTable dtC = SqlHelper . GetDataDateTable ( sqlConnString , CommandType . Text , sql , null ) ;
if ( dtC ! = null & & dtC . Rows . Count > 0 )
if ( dtC ! = null & & dtC . Rows . Count > 0 )
{
{
colorNo = dtC . Rows [ 0 ] [ "Setvalue_BC_Color_No" ] . ToString ( ) ;
colorNo = dtC . Rows [ 0 ] [ "Setvalue_BC_Color_No" ] . ToString ( ) ;
colorQQNo = dtC . Rows [ 0 ] [ "Setvalue_CC_Color_No" ] . ToString ( ) ;
colorQQNo = dtC . Rows [ 0 ] [ "Setvalue_CC_Color_No" ] . ToString ( ) ;
colorPRNo = dtC . Rows [ 0 ] [ "Setvalue_PR_Color_No" ] . ToString ( ) ;
colorPRNo = dtC . Rows [ 0 ] [ "Setvalue_PR_Color_No" ] . ToString ( ) ;
side1BarCode = dtC . Rows [ 0 ] [ "Side_1_BC01" ] . ToString ( ) ;
}
}
#region 注销-不要
#region 注销-不要
@ -377,6 +379,29 @@ namespace PaintingPC
#endregion
#endregion
}
}
else
else
{
string sjBarCode1 = side1BarCode ? . Trim ( ) ;
if ( ! string . IsNullOrEmpty ( sjBarCode1 ) & & sjBarCode1 . Length = = 2 0 )
{
string sql_Extend = "" ;
string stockNo = side1BarCode . Substring ( 0 , 1 0 ) ;
if ( ! string . IsNullOrWhiteSpace ( colorQQNo ) & & ! string . IsNullOrWhiteSpace ( colorPRNo ) )
{
sql_Extend = @" select * from tb_ColorExtend where ColorCode = '" + colorNo + "' and ColorQQCode = '" + colorQQNo + "' and ColorDQCode = '" + colorPRNo + "' and StockNo = '" + stockNo + "' " ;
}
else
{
sql_Extend = @" select * from tb_ColorExtend where ColorCode = '" + colorNo + "' and StockNo = '" + stockNo + "' " ;
}
dt = SqlHelper . GetDataDateTable ( SqlHelper . SqlConnString , CommandType . Text , sql_Extend , null ) ;
if ( dt ! = null & & dt . Rows . Count > 0 )
{
res = dt . Rows [ 0 ] [ "Des" ] . ToString ( ) ;
colorInfo = dt . Rows [ 0 ] [ "Des" ] . ToString ( ) . Trim ( ) + "," + dt . Rows [ 0 ] [ "ColorCode" ] . ToString ( ) . Trim ( ) + "," + dt . Rows [ 0 ] [ "ColorNo" ] . ToString ( ) . Trim ( ) ;
}
}
if ( string . IsNullOrEmpty ( res ) )
{
{
string sql_c = "" ;
string sql_c = "" ;
if ( ! string . IsNullOrWhiteSpace ( colorQQNo ) & & ! string . IsNullOrWhiteSpace ( colorPRNo ) )
if ( ! string . IsNullOrWhiteSpace ( colorQQNo ) & & ! string . IsNullOrWhiteSpace ( colorPRNo ) )
@ -396,6 +421,10 @@ namespace PaintingPC
}
}
}
}
}
}
}
LogHelper . WriteSysLogBase ( "[入参:]skidNo=" + skidNo + ";[出参:]colorInfo=" + colorInfo , MethodBase . GetCurrentMethod ( ) . Name ) ;
LogHelper . WriteSysLogBase ( "[入参:]skidNo=" + skidNo + ";[出参:]colorInfo=" + colorInfo , MethodBase . GetCurrentMethod ( ) . Name ) ;