小件包材

wwwroot/api/plc/plc_led_goodslogo.ashx

@@ -54,15 +54,13 @@ public class plc_led_goodslogo : IHttpHandler
 	                            TMD.DICTIONARYVALUE
                             FROM
 	                            TP_PM_GROUTINGDAILYDETAIL TPGL
-	                            LEFT JOIN TP_MST_GOODSLOGOSAP TMGL ON TPGL.GOODSID = TMGL.GOODSID
-	                            LEFT JOIN TP_MST_ACCESSORIES TMA ON TMGL.LOGOID = TMA.LOGOID 
-	                            AND TMA.GOODSID = TMGL.GOODSID
-	                            LEFT JOIN TP_MST_DATADICTIONARY TMD ON TMA.ACCESSORIESTYPEID = TMD.DICTIONARYID
-                            WHERE
-	                            TPGL.VALUEFLAG = 1 
-	                            AND TMA.VALUEFLAG = 1
-	                            AND TMD.VALUEFLAG = 1
-                                AND TPGL.BARCODE = @barcode@
+	                            LEFT JOIN TP_MST_ACCESSORIES TMA ON TPGL.LOGOID = TMA.LOGOID 
+                                AND TMA.GOODSID = TPGL.GOODSID
+                                LEFT JOIN TP_MST_DATADICTIONARY TMD ON TMA.ACCESSORIESTYPEID = TMD.DICTIONARYID
+                            WHERE  TMA.VALUEFLAG = 1
+                                AND TMD.VALUEFLAG = 1 
+                                AND TMD.DICTIONARYVALUE = '包材'
+                                AND TPGL.OUTLABELCODE = @barcode@
                             ",
                         new CDAParameter("barcode", context.Request["barcode"])
                     );
@@ -92,8 +90,8 @@ public class plc_led_goodslogo : IHttpHandler
                         //写标识位-扫描结果
                         SiemensS7.Write<short>("100.0", Convert.ToInt16(1));
                     }
-                    Logger.Info("写入数据完成！barcode：" + context.Request["barcode"].ToString() + "三位数据位：" + SiemensS7.Read<short>("100.0") + "," + SiemensS7.Read<short>("100.2")
-                        + "," + SiemensS7.Read<short>("100.6") + "," + SiemensS7.Read<string>("100.6",11)+ "," + SiemensS7.Read<string>("100.20",11)  + ";数据：" + new JsonResult(infoDt).ToJson());
+                    Logger.Info("写入数据完成！barcode：" + context.Request["barcode"].ToString() + "4位数据位：" + SiemensS7.Read<short>("100.0") + ",辅件编码：" + SiemensS7.Read<short>("100.2")
+                        + ",条码：" + SiemensS7.Read<string>("100.6",11)+ ",产品编码：" + SiemensS7.Read<string>("100.20",11)  + ";数据：" + new JsonResult(infoDt).ToJson());
                 }
             }
             else