Просмотр исходного кода

成检缺陷明细查询修改。当没有财年查询条件时,则不select财年

liushiqi 4 лет назад
Родитель
Сommit
5efd260eca
1 измененных файлов с 7 добавлено и 3 удалено
  1. 7 3
      DK.Service/ReportModuleLogic/ReportModuleLogic.cs

+ 7 - 3
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -9892,9 +9892,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "           0\n" +
                 "           0\n" +
                 "        END reworkflag" +
                 "        END reworkflag" +
                 "     ,gdd.glazingroom" +
                 "     ,gdd.glazingroom" +
-                "     ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 3 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) -1 ) AS Kcode" +
-                "     ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) -1 ) AS Fyear" +
-                "  FROM tp_pm_defect pmd\n" +
+                "     ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 3 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) -1 ) AS Kcode\n";
+
+                if (!string.IsNullOrEmpty(se.Fyear))
+                {
+                    selSql += " ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) -1 ) AS Fyear\n";
+                }
+                selSql += "  FROM tp_pm_defect pmd\n" +
                 "  LEFT JOIN TP_MST_Goods g\n" +
                 "  LEFT JOIN TP_MST_Goods g\n" +
                 "    ON pmd.Goodsid = g.Goodsid\n" +
                 "    ON pmd.Goodsid = g.Goodsid\n" +
                 "  LEFT JOIN TP_MST_GoodsType gt\n" +
                 "  LEFT JOIN TP_MST_GoodsType gt\n" +