瀏覽代碼

校验水效标识

qinqi 1 年之前
父節點
當前提交
761d6640e3
共有 1 個文件被更改,包括 7 次插入3 次删除
  1. 7 3
      wwwroot/main/PreProductCheck/api/GetWaterLabelCode.ashx

+ 7 - 3
wwwroot/main/PreProductCheck/api/GetWaterLabelCode.ashx

@@ -21,10 +21,14 @@ public class GetGoodsRepair : IHttpHandler, IRequiresSessionState
         {
             DataTable dt = conn.ExecuteDatatable(@"
                    SELECT
-	                    TMG.WaterLabelCode 
+                     NVL(GLS.waterlabelcode, G.WaterLabelCode) WaterLabelCode 
                     FROM
-	                    TP_PM_GROUTINGDAILYDETAIL TPGL
-	                    LEFT JOIN TP_MST_GOODS TMG ON TPGL.GOODSID = TMG.GOODSID 
+                      TP_PM_GROUTINGDAILYDETAIL TPGL
+                       INNER JOIN TP_MST_GOODS G
+                                   ON G.GOODSID = TPGL.GOODSID
+                                   LEFT JOIN TP_MST_GOODSLOGOSAP GLS
+                                   ON G.GOODSID = GLS.GOODSID
+                                  AND GLS.LOGOID = TPGL.LOGOID
                     WHERE
 	                    TPGL.BARCODE = @BARCODE@
                 ",