郭齐峰 2 лет назад
Родитель
Сommit
d6037a8f2e

+ 6 - 1
src/custom/restcontroller/system/report/report.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import common.Controller;
 import common.YosException;
 import common.annotation.API;
+import common.annotation.CACHEING_CLEAN;
 import common.data.Rows;
 import common.data.SQLFactory;
 import restcontroller.R;
@@ -26,14 +27,18 @@ public class report extends Controller {
     }
 
     @API(title = "应用报表、打印请求预览页面", apiversion = R.ID20221213094501.v1.class)
+    @CACHEING_CLEAN(apiversions =  R.ID20221114135403.v1.class)
     public String viewReport() throws YosException {
         long sys_reportid = content.getLongValue("sys_reportid");
         long dataid = content.getLongValue("dataid");
-        Rows rows = dbConnect.runSqlQuery("select *from sys_report where sys_reportid=" + sys_reportid);
+        Rows rows = dbConnect.runSqlQuery("select t1.*,t2.systemapp from sys_report t1 left join sys_systemapp t2 on t1.systemappid=t2.systemappid where sys_reportid=" + sys_reportid);
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("找不到报表信息").toString();
         }
         String jimu_report_id = rows.get(0).getString("jimu_report_id");
+        if (rows.get(0).getString("systemapp").equals("dispatch")) {
+            dbConnect.runSqlUpdate("update sa_dispatch set isreport=1 where siteid='" + siteid + "' and sa_dispatchid=" + dataid);
+        }
         return getSucReturnObject().setData("/yosreport/jmreport/view/" + jimu_report_id + "?token=" + getReportToken(sys_reportid, dataid)).toString();
     }
 }

+ 1 - 1
src/custom/restcontroller/webmanage/sale/dispatch/SQL/发货单列表查询.sql

@@ -28,7 +28,7 @@ SELECT t1.billno,
        t1.billdate,
        t7.agentnum,
        t8.erpbillno,
-       case when t3.type='项目订单' then t9.projectname else t3.projectnote end projectname
+       case when t3.type='项目订单' then t9.projectname else t3.projectnote end projectname,t1.isreport
 FROM sa_dispatch t1
          LEFT JOIN sys_enterprise t2 ON t1.sys_enterpriseid = t2.sys_enterpriseid
     AND t1.siteid = t2.siteid