Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/collectdata/src/main/java/com/management/collectdata/controller/DataCollectController.java

@@ -168,7 +168,7 @@ public class DataCollectController {
 
     @RequestMapping("/getSqlServerProjectTypeDataSum")
     public String getSqlServerProjectTypeDataSum() {
-        String sqlCount = "select count(distinct citemccode) from fitemss97  where bclose = 0";
+        String sqlCount = "select count(distinct left(citemccode,5) ) from fitemss97  where bclose = 0";
         int totalCount = 0;
         try (Connection connection = sqlServerDataSource.getConnection()) {
             PreparedStatement countStmt = connection.prepareStatement(sqlCount);
@@ -185,7 +185,7 @@ public class DataCollectController {
 
     @RequestMapping("/getSqlServerProjectTypeDataList")
     public List<String> getSqlServerProjectTypeDataList(@RequestBody PageBO pageBO) {
-        String sqlQuery = " select distinct citemccode " +
+        String sqlQuery = " select distinct left(citemccode,5)  " +
                 " from fitemss97  where bclose = 0 ORDER BY citemccode OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ";
         List<String> resList = new ArrayList<>();
         try (Connection connection = sqlServerDataSource.getConnection()) {
@@ -258,10 +258,11 @@ public class DataCollectController {
 //        String sqlCount = "select count(*) from mom_orderdetail where status in (3,4) ";
         String sqlCount = "select count(*) " +
                 "from ( " +
-                "    select mo.cbSysBarCode,SUBSTRING(mo.cbSysBarCode, 8, 15) as orderId,mo.Define24,mo.Define25 " +
+                "    select mo.cbSysBarCode,SUBSTRING(mo.cbSysBarCode, 8, 14) as orderId,mo.Define24,mo.Define25 " +
                 "     ,RIGHT(mo.cbSysBarCode,1) as line,mo.Status,cb.cDeptID,cb.cDepName,mo.MoDId " +
-                " from mom_orderdetail mo " +
-                " left join ca_batchmap cb on SUBSTRING(mo.cbSysBarCode, 8, 15) = cb.cMOCode and RIGHT(mo.cbSysBarCode,1) = cb.iMOSubSN " +
+                " " +
+                "from mom_orderdetail mo " +
+                " left join ca_batchmap cb on SUBSTRING(mo.cbSysBarCode, 8, 14) = cb.cMOCode and RIGHT(mo.cbSysBarCode,1) = cb.iMOSubSN " +
                 " where mo.Status = 3 " +
                 "         )tmp ";
         int totalCount = 0;
@@ -284,10 +285,10 @@ public class DataCollectController {
 //                " from mom_orderdetail " +
 //                " where status in (3,4) "
 //                +" ORDER BY MoDId OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ";
-        String sqlQuery = "select mo.MoDId,SUBSTRING(mo.cbSysBarCode, 8, 15) as orderId,mo.Define24  as projectId,mo.Define25  as projectName,mo.relsdate" +
+        String sqlQuery = "select mo.MoDId,SUBSTRING(mo.cbSysBarCode, 8, 14) as orderId,mo.Define24  as projectId,mo.Define25  as projectName,mo.relsdate" +
                 "     ,RIGHT(mo.cbSysBarCode,1) as line,mo.Status,cb.cDeptID,cb.cDepName " +
                 " from mom_orderdetail mo " +
-                " left join ca_batchmap cb on SUBSTRING(mo.cbSysBarCode, 8, 15) = cb.cMOCode and RIGHT(mo.cbSysBarCode,1) = cb.iMOSubSN " +
+                " left join ca_batchmap cb on SUBSTRING(mo.cbSysBarCode, 8, 14) = cb.cMOCode and RIGHT(mo.cbSysBarCode,1) = cb.iMOSubSN " +
                 " where mo.Status = 3 " +
                 " ORDER BY mo.MoDId OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ";
         List<ErpOrderInfo> resList = new ArrayList<>();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/QRCodeController.java

@@ -61,7 +61,7 @@ public class QRCodeController {
             String footerLine2 = String.format("行号: %s",null == erpOrderInfo.getLine()?"":erpOrderInfo.getLine());
 
             String s = null != erpOrderInfo.getMoDId() ? erpOrderInfo.getMoDId() : "";
-            String fileName = "项目二维码_"+s+System.currentTimeMillis()+".png";
+            String fileName = erpOrderInfo.getProjectName()+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
 
             try {
                 BufferedImage qrImage = QRCodeUtil.generateQRCodeImage(data, width, height);
@@ -132,7 +132,7 @@ public class QRCodeController {
 
         int width = 300; // 二维码宽度
         int height = 300; // 二维码高度
-        String fileName = "项目二维码_"+System.currentTimeMillis()+".png";
+        String fileName = erpOrderInfo.getProjectName()+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
         try {
             BufferedImage qrImage = QRCodeUtil.generateQRCodeImage(data, width, height);
             // 创建带标题和两行底部文字的完整图片

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java

@@ -194,11 +194,11 @@ public class DataCollectTask {
 
 
 
-//    @Scheduled(cron = "0 51 11 * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
 //    @Scheduled(cron = "0 05 16 * * ?")
     @Async
     public void sqlServerTask() {
-        if(isDev){return;}
+//        if(isDev){return;}
         RestTemplate restTemplate = new RestTemplate();
         String sumUrl = PREFIX_URL+"/dataCollect/getSqlServerDataSum";
         String listUrl = PREFIX_URL+"/dataCollect/getSqlServerDataList";