diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs
index f37cda5..b1956e4 100644
--- a/PaintingPC/Function.cs
+++ b/PaintingPC/Function.cs
@@ -337,15 +337,17 @@ namespace PaintingPC
                 string colorNo = "";
                 string colorQQNo = "";
                 string colorPRNo = "";
+                string side1BarCode = "";
                 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);
                 if (dtC != null && dtC.Rows.Count > 0)
                 {
                     colorNo = dtC.Rows[0]["Setvalue_BC_Color_No"].ToString();
                     colorQQNo = dtC.Rows[0]["Setvalue_CC_Color_No"].ToString();
                     colorPRNo = dtC.Rows[0]["Setvalue_PR_Color_No"].ToString();
+                    side1BarCode = dtC.Rows[0]["Side_1_BC01"].ToString();
                 }
 
                 #region 注销-不要
@@ -378,22 +380,49 @@ namespace PaintingPC
                     }
                     else
                     {
-                        string sql_c = "";
-                        if (!string.IsNullOrWhiteSpace(colorQQNo) && !string.IsNullOrWhiteSpace(colorPRNo))
+                        string sjBarCode1 = side1BarCode?.Trim();
+                        if (!string.IsNullOrEmpty(sjBarCode1) && sjBarCode1.Length ==20)
                         {
-                            sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "' and ColorQQCode = '" + colorQQNo + "' and ColorDQCode = '" + colorPRNo + "' ";
-                        }
-                        else
-                        {
-                            sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "'";
+                            string sql_Extend = "";
+                            string stockNo = side1BarCode.Substring(0, 10);
+                            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();
+                            }
                         }
-                        //string sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "'";
-                        dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_c, null);
-                        if (dt != null && dt.Rows.Count > 0)
+
+                        if(string.IsNullOrEmpty(res))
                         {
-                            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();
+                            string sql_c = "";
+                            if (!string.IsNullOrWhiteSpace(colorQQNo) && !string.IsNullOrWhiteSpace(colorPRNo))
+                            {
+                                sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "' and ColorQQCode = '" + colorQQNo + "' and ColorDQCode = '" + colorPRNo + "' ";
+                            }
+                            else
+                            {
+                                sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "'";
+                            }
+                            //string sql_c = @" select * from tb_Color where ColorCode = '" + colorNo + "'";
+                            dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_c, 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();
+                            }
                         }
+
+
+                       
                     }
 
                 }