From a8f37beb25f97f9286d8877175afedf1138453b1 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Thu, 8 May 2025 10:30:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E6=B1=BD=E6=A8=A1=E5=A1=91=E4=BA=8C?= =?UTF-8?q?=E5=8E=82=E5=B0=8F=E7=B1=B3M2=E5=92=8C=E5=A5=94=E9=A9=B0?= =?UTF-8?q?=E5=96=B7=E6=B6=82,=E4=B8=89=E6=BC=86=E4=B8=80=E8=87=B4,?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=8F=B7=E4=B8=8D=E5=90=8C=E7=9A=84=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86.=20=E5=A2=9E=E5=8A=A0=E8=A1=A8tb=5F?= =?UTF-8?q?ColorExtend=E8=BF=9B=E8=A1=8C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PaintingPC/Function.cs | 55 ++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 13 deletions(-) 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(); + } } + + + } }