qinqi 5 часов назад
Родитель
Сommit
9311128db5
2 измененных файлов с 4 добавлено и 2 удалено
  1. 2 1
      wwwroot/api/plc/plc_led_data.ashx
  2. 2 1
      wwwroot/api/plc/plc_led_data_print3124.ashx

+ 2 - 1
wwwroot/api/plc/plc_led_data.ashx

@@ -83,6 +83,7 @@ public class plc_led_data : 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
@@ -135,7 +136,7 @@ public class plc_led_data : IHttpHandler
                         + "," + SiemensS7.Read<short>("400.4") + "," + SiemensS7.Read<short>("400.6") + "," + SiemensS7.Read<short>("400.10") + "," + SiemensS7.Read<string>("400.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() == "分体")
                     {

+ 2 - 1
wwwroot/api/plc/plc_led_data_print3124.ashx

@@ -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() == "分体")
                     {