|
|
@@ -288,6 +288,7 @@ namespace PLC_S.ServerModel
|
|
|
string level = codeRow["GOODSLEVELTYPEID"].ToString();
|
|
|
string gtid = codeRow["goodstypeid"].ToString();
|
|
|
string p_id = codeRow["flowprocedureid"].ToString();
|
|
|
+ int goodslinetype = Convert.ToInt32(codeRow["goodslinetype"]);
|
|
|
// 1不合格,2智能,3连体
|
|
|
short code = 1;
|
|
|
string codeName = "不合格";
|
|
|
@@ -369,6 +370,9 @@ namespace PLC_S.ServerModel
|
|
|
|
|
|
//1. 产品分级(int)【1不合格,2智能,3连体】
|
|
|
SendCode(plc_s, e, logKeyT, logKeyE, plc, code);
|
|
|
+
|
|
|
+ //2.高压标识(int)【1:高压,0:其他】
|
|
|
+ SET_GoodsLineType(e, plc_s, logKeyT, plc, goodslinetype);
|
|
|
}
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
@@ -424,6 +428,21 @@ namespace PLC_S.ServerModel
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ //qq add 2025-05-27 增加高压标识
|
|
|
+ private void SET_GoodsLineType(ReceiveSession e, PLC_S_GL_QR plc_s, string logKeyT, SocketClient<SiemensS7_1200Model> plc, int code)
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrEmpty(plc_s.Add_GoodsLineType) && !string.IsNullOrEmpty(plc_s.Add_GoodsLineTypeNum))
|
|
|
+ {
|
|
|
+ string outputMessage = $"[{e.Content}]SET_GoodsLineType=[{code}]{plc_s.Add_GoodsLineType + plc_s.Add_GoodsLineTypeNum}";
|
|
|
+ Logger.Trace(outputMessage, logKeyT, logger_t);
|
|
|
+ FormLogShow?.ShowLog(outputMessage);
|
|
|
+ PLCResult p_r = plc.Write<short>(plc_s.Add_GoodsLineType, plc_s.Add_GoodsLineTypeNum, (short)(code));
|
|
|
+ outputMessage = $"[{e.Content}]END_GoodsLineType=[{p_r}]{plc_s.Add_GoodsLineType + plc_s.Add_GoodsLineTypeNum}";
|
|
|
+ Logger.Trace(outputMessage, logKeyT, logger_t);
|
|
|
+ FormLogShow?.ShowLog(outputMessage);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private DataRow GetGoodsLevel(string barcode, ReceiveSession e, string loggerName)
|
|
|
{
|
|
|
IDataAccess dataAccess = null;
|
|
|
@@ -431,7 +450,7 @@ namespace PLC_S.ServerModel
|
|
|
{
|
|
|
dataAccess = PLC_S_DataAccess.GetDataAccess(e);
|
|
|
|
|
|
- string sqlString = "select gdd.GOODSLEVELTYPEID,g.goodstypeid, inp.flowprocedureid\n" +
|
|
|
+ string sqlString = "select gdd.GOODSLEVELTYPEID,g.goodstypeid, inp.flowprocedureid,g.GOODS_LINE_TYPE goodslinetype \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" +
|
|
|
@@ -513,6 +532,10 @@ namespace PLC_S.ServerModel
|
|
|
//plc_s.Add_Error = ini.Read(flag, "Add_Error");
|
|
|
//plc_s.Add_ErrorNum = ini.Read(flag, "Add_ErrorNum");
|
|
|
|
|
|
+ //qq add 2025-05-27 增加高压标识
|
|
|
+ plc_s.Add_GoodsLineType = ini.Read(flag, "Add_GoodsLineType");
|
|
|
+ plc_s.Add_GoodsLineTypeNum = ini.Read(flag, "Add_GoodsLineTypeNum");
|
|
|
+
|
|
|
PLC_FLAGS.Add(flag, plc_s);
|
|
|
return plc_s;
|
|
|
}
|