|
|
@@ -82,6 +82,7 @@ public class plc_led_data_print3124 : IHttpHandler
|
|
|
when g.goodsid in(146,147) and gdd.logoid in (1) THEN '分体'
|
|
|
ELSE '大件' END AS pritetype
|
|
|
,gdd.barcode
|
|
|
+ ,CASE WHEN gdd.luociflag = 1 THEN '1' ELSE '0' END AS luociflag
|
|
|
,g.goodscode
|
|
|
FROM tp_pm_groutingdailydetail gdd
|
|
|
LEFT JOIN tp_mst_goods g
|
|
|
@@ -134,7 +135,7 @@ public class plc_led_data_print3124 : IHttpHandler
|
|
|
+ "," + SiemensS7.Read<short>("31.4") + "," + SiemensS7.Read<short>("31.6") + "," + SiemensS7.Read<short>("31.10") + "," + SiemensS7.Read<string>("31.24", 11) + ";数据:" + new JsonResult(infoDt).ToJson());
|
|
|
}
|
|
|
//调用标准计件方法===============================
|
|
|
- if (infoDt != null && infoDt.Rows.Count > 0 && infoDt.Rows[0] != null)
|
|
|
+ if (infoDt != null && infoDt.Rows.Count > 0 && infoDt.Rows[0] != null && infoDt.Rows[0]["luociflag"].ToString() =="0")
|
|
|
{
|
|
|
if (infoDt.Rows[0]["pritetype"].ToString() == "分体")
|
|
|
{
|