防伪码对接

HG5020.3/PLC_S/ServerModel/Glazing_After.cs

@@ -244,6 +244,8 @@ namespace PLC_S.ServerModel
                 string roomcode = null;
                 string p_id = "";
                 string se_flag = null;
+                string goodstypecode = "";
+                string se_flag_code = null;
                 using (IDataAccess dataAccess = PLC_S_DataAccess.GetDataAccess())
                 {
                     DataRow codeRow = GetGoodsCode(dataAccess, barcode, e, logKeyE);
@@ -261,6 +263,7 @@ namespace PLC_S.ServerModel
                     string code = codeRow["goodscode"].ToString();
                     string intcode = codeRow["seatcovercode"].ToString();
                     p_id = codeRow["flowprocedureid"].ToString();
+                    goodstypecode = codeRow["goodstypecode"].ToString();
 
                     outputMessage = $"[{e.Content}]产品型号={code}[{intcode}]";
                     Logger.Trace(outputMessage, logKeyT, logger_t);
@@ -401,12 +404,16 @@ update tp_pm_groutingdailydetail set
                     Logger.Trace(outputMessage, logKeyT, logger_t);
                     FormLogShow?.ShowLog(outputMessage);
 
-                    // 是否启用防伪码 TODO
-                    se_flag = dataAccess.ExecuteScalar("select t.settingvalue from tp_mst_systemsetting t where t.settingcode = ''") + "";
+                    // 是否启用防伪码 S_PM_030 这个是绑定的
+                    se_flag = "," + dataAccess.ExecuteScalar("select t.settingvalue from tp_mst_systemsetting t where t.settingcode = 'S_PM_030'") + ",";
+                    se_flag_code = dataAccess.ExecuteScalar("select t.settingvalue from tp_mst_systemsetting t where t.settingcode = 'S_PM_032'") + "";
                 }
 
                 #region 防伪码
-                if ("1" == se_flag && !string.IsNullOrWhiteSpace(plc_s.Add_SE_Code1))
+                if (!string.IsNullOrWhiteSpace(plc_s.Add_SE_Code1) &&
+                    se_flag.Contains($",{plc_s.P_ID},") &&
+                    goodstypecode.StartsWith(se_flag_code)
+                    )
                 {
                     // 读取防伪码
                     //outputMessage = $"[{e.Content}]GET_SE_Code1=[ ]{plc_s.Add_SE_Code1 + plc_s.Add_SE_Code1Num}";
@@ -588,12 +595,14 @@ update tp_pm_groutingdailydetail set
             {
                 //dataAccess = PLC_S_DataAccess.GetDataAccess(e);
 
-                string sqlString = "select g.goodscode, g.seatcovercode, gdd.groutingdailydetailid, inp.flowprocedureid\n" +
+                string sqlString = "select g.goodscode, g.seatcovercode, gdd.groutingdailydetailid, inp.flowprocedureid,gt.goodstypecode\n" +
                 //string sqlString = "select gdd.groutingdailydetailid\n" +
                 "  from tp_pm_groutingdailydetail gdd\n" +
                 "  LEFT JOIN tp_pm_inproduction inp on inp.groutingdailydetailid = gdd.groutingdailydetailid\n" +
                 " inner join tp_mst_goods g\n" +
                 "    on g.goodsid = gdd.goodsid\n" +
+                " inner join tp_mst_goodsType gt\n" +
+                "    on g.goodstypeid = gt.goodstypeid\n" +
                 " where gdd.barcode = :barcode";
                 DataTable dataTable = dataAccess.ExecuteDatatable(sqlString, new CDAParameter(":barcode", barcode));
                 if (dataTable.HasData())

HG5020.3/PLC_S/ServerModel/GoodsLevel_QR2.cs

@@ -246,12 +246,15 @@ namespace PLC_S.ServerModel
                 string usercode = "";
                 string p_id = "";
                 string se_flag = null;
+                string goodstypecode = "";
+                string se_flag_code = null;
                 using (IDataAccess dataAccess = PLC_S_DataAccess.GetDataAccess())
                 {
-                    string sqlString = "select gdd.GOODSLEVELTYPEID,g.goodstypeid, inp.flowprocedureid\n" +
+                    string sqlString = "select gdd.GOODSLEVELTYPEID,g.goodstypeid, inp.flowprocedureid,gt.goodstypecode\n" +
                     "  from tp_pm_groutingdailydetail gdd\n" +
                     "  LEFT JOIN tp_pm_inproduction inp on inp.groutingdailydetailid = gdd.groutingdailydetailid\n" +
                     "  inner join tp_mst_goods g on g.goodsid = gdd.goodsid\n" +
+                    " inner join tp_mst_goodsType gt on g.goodstypeid = gt.goodstypeid\n" +
                     " where gdd.barcode = :barcode";
                     DataTable dataTable = dataAccess.ExecuteDatatable(sqlString, new CDAParameter(":barcode", barcode));
                     DataRow codeRow = null;
@@ -271,6 +274,7 @@ namespace PLC_S.ServerModel
                     }
 
                     p_id = codeRow["flowprocedureid"].ToString();
+                    goodstypecode = codeRow["goodstypecode"].ToString();
 
                     // 刮边工号
                     sqlString = @"
@@ -296,12 +300,16 @@ namespace PLC_S.ServerModel
                     Logger.Trace(outputMessage, logKeyT, logger_t);
                     FormLogShow?.ShowLog(outputMessage);
 
-                    // 是否启用防伪码 TODO
-                    se_flag = dataAccess.ExecuteScalar("select t.settingvalue from tp_mst_systemsetting t where t.settingcode = ''") + "";
+                    // 是否启用防伪码 S_PM_031 这个是验证的
+                    se_flag = "," + dataAccess.ExecuteScalar("select t.settingvalue from tp_mst_systemsetting t where t.settingcode = 'S_PM_031'") + ",";
+                    se_flag_code = dataAccess.ExecuteScalar("select t.settingvalue from tp_mst_systemsetting t where t.settingcode = 'S_PM_032'") + "";
                 }
 
                 #region 防伪码
-                if ("1" == se_flag && !string.IsNullOrWhiteSpace(plc_s.Add_SE_Code1))
+                if (!string.IsNullOrWhiteSpace(plc_s.Add_SE_Code1) &&
+                    se_flag.Contains($",{plc_s.P_ID},") &&
+                    goodstypecode.StartsWith(se_flag_code)
+                    )
                 {
                     // 读取防伪码
                     //outputMessage = $"[{e.Content}]GET_SE_Code1=[ ]{plc_s.Add_SE_Code1 + plc_s.Add_SE_Code1Num}";