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

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ErpOrderInfo.java
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java
#	fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ErpOrderInfoMapper.xml

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

@@ -259,10 +259,10 @@ public class DataCollectController {
         String sqlCount = "select count(*) " +
                 "from ( " +
                 "    select mo.cbSysBarCode,substring(cbSysBarCode,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)+1,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1) + 1)-CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)-1) as orderId,mo.Define24,mo.Define25 " +
-                "     ,RIGHT(mo.cbSysBarCode,1) as line,mo.Status,cb.cDeptID,cb.cDepName,mo.MoDId " +
+                "     ,RIGHT(mo.cbSysBarCode,1) as line,mo.Status,mo.MDeptCode,mo.MoDId " +
                 " " +
                 "from mom_orderdetail mo " +
-                " left join ca_batchmap cb on substring(cbSysBarCode,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)+1,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1) + 1)-CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)-1)= cb.cMOCode and RIGHT(mo.cbSysBarCode,1) = cb.iMOSubSN " +
+//                " left join ca_batchmap cb on substring(cbSysBarCode,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)+1,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1) + 1)-CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)-1)= cb.cMOCode and RIGHT(mo.cbSysBarCode,1) = cb.iMOSubSN " +
                 " where mo.Status = 3 " +
                 "         )tmp ";
         int totalCount = 0;
@@ -286,9 +286,9 @@ public class DataCollectController {
 //                " where status in (3,4) "
 //                +" ORDER BY MoDId OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ";
         String sqlQuery = "select mo.MoDId,substring(cbSysBarCode,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)+1,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1) + 1)-CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)-1) as orderId,mo.Define24  as projectId,mo.Define25  as projectName,mo.relsdate" +
-                "     ,RIGHT(mo.cbSysBarCode,1) as line,mo.Status,cb.cDeptID,cb.cDepName " +
+                "     ,RIGHT(mo.cbSysBarCode,1) as line,mo.Status,mo.MDeptCode " +
                 " from mom_orderdetail mo " +
-                " left join ca_batchmap cb on substring(cbSysBarCode,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)+1,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1) + 1)-CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)-1) = cb.cMOCode and RIGHT(mo.cbSysBarCode,1) = cb.iMOSubSN " +
+//                " left join ca_batchmap cb on substring(cbSysBarCode,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)+1,CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1) + 1)-CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode, CHARINDEX('|', cbSysBarCode) + 1) + 1)-1) = 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<>();
@@ -309,8 +309,8 @@ public class DataCollectController {
                     erpOrderInfo.setLine(resultSet.getInt("line"));
                     erpOrderInfo.setStatus(resultSet.getInt("Status"));
                     erpOrderInfo.setRelsDate(resultSet.getDate("relsdate"));
-                    erpOrderInfo.setDeptId(resultSet.getString("cDeptID"));
-                    erpOrderInfo.setDeptName(resultSet.getString("cDepName"));
+                    erpOrderInfo.setDeptId(resultSet.getString("MDeptCode"));
+//                    erpOrderInfo.setDeptName(resultSet.getString("cDepName"));
                     resList.add(erpOrderInfo);
                 }
             }

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

@@ -52,13 +52,13 @@ public class QRCodeController {
     }
 
     private String replaceChar(String str){
-        String res = "";
-        if(StringUtils.isBlank(str)){
-            return res;
+        String res = str;
+        if(StringUtils.isBlank(res)){
+            return "";
         }
         for (String specialChar : SPECIAL_CHARS) {
-            if(str.contains(specialChar)){
-                res = str.replace(specialChar,"-");
+            if(res.contains(specialChar)){
+                res = res.replace(specialChar,"-");
             }
         }
         return res;
@@ -89,8 +89,12 @@ public class QRCodeController {
             String footerLine2 = String.format("行号: %s",null == erpOrderInfo.getLine()?"":erpOrderInfo.getLine());
 
 //            String s = null != erpOrderInfo.getMoDId() ? erpOrderInfo.getMoDId() : "";
+
             String fileName = erpOrderInfo.getProjectName()+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
             fileName = replaceChar(fileName);
+            if(StringUtils.isBlank(fileName)){
+                System.out.println("here=== "+fileName);
+            }
 
             try {
                 BufferedImage qrImage = QRCodeUtil.generateQRCodeImage(data, width, height);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ErpOrderInfo.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 工时申请单
+ * 工时申请单
  * </p>
  *
  * @author Seyason
@@ -31,49 +31,49 @@ public class ErpOrderInfo extends Model<ErpOrderInfo> {
     private Integer id;
 
     /**
-     * 宸ュ崟缂栧彿
+     * 工单编号
      */
     @TableField("order_id")
     private String orderId;
 
     /**
-     * 椤圭洰缂栧彿
+     * 项目编号
      */
     @TableField("project_id")
     private String projectId;
 
     /**
-     * 椤圭洰鍚嶇О
+     * 项目名称
      */
     @TableField("project_name")
     private String projectName;
 
     /**
-     * 琛屽彿
+     * 行号
      */
     @TableField("line")
     private Integer line;
 
     /**
-     * 工单状态 NA-开立/FM-锁定/OP-审核/CL-关闭
+     * 工单状态 NA-开立/FM-锁定/OP-审核/CL-关闭
      */
     @TableField("status")
     private Integer status;
 
     /**
-     * 鍚屾�涓婚敭id
+     * 同步主键id
      */
     @TableField("moDId")
     private String moDId;
 
     /**
-     * 鐢熶骇宸ュ崟鏃ユ湡
+     * 生产工单日期
      */
     @TableField("rels_date")
     private LocalDateTime relsDate;
 
     /**
-     * 澶栭儴绯荤粺閮ㄩ棬id锛屼篃鏄痗ode
+     * 外部系统部门id，也是code
      */
     @TableField("dept_id")
     private String deptId;
@@ -91,5 +91,4 @@ public class ErpOrderInfo extends Model<ErpOrderInfo> {
     protected Serializable pkVal() {
         return this.id;
     }
-
 }

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

@@ -1,6 +1,5 @@
 package com.management.platform.task;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.*;
@@ -195,7 +194,6 @@ public class DataCollectTask {
 
 
     @Scheduled(cron = "0 0 1 * * ?")
-//    @Scheduled(cron = "0 21 10 * * ?")
     @Async
     public void sqlServerTask() {
         if(isDev){return;}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ErpOrderInfoMapper.xml

@@ -2,7 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.management.platform.mapper.ErpOrderInfoMapper">
 
-    <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.ErpOrderInfo">
         <id column="id" property="id" />
         <result column="order_id" property="orderId" />
@@ -15,16 +14,16 @@
         <result column="dept_id" property="deptId" />
     </resultMap>
 
-    <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, order_id, project_id, project_name, line, status, moDId, rels_date, dept_id
     </sql>
     <insert id="batchInsert">
         insert into erp_order_info(order_id, project_id, project_name, line, status,rels_date,moDId,dept_id)
         VALUES
-        <foreach collection="resList" separator="," item="res">
-            (#{res.orderId},#{res.projectId},#{res.projectName},#{res.line},#{res.status},#{res.relsDate},#{res.moDId},#{res.deptId})
-        </foreach>
+            
+            <foreach collection="resList" separator="," item="res">
+                (#{res.orderId},#{res.projectId},#{res.projectName},#{res.line},#{res.status},#{res.relsDate},#{res.moDId},#{res.deptId})
+            </foreach>
     </insert>
     <select id="getExistIds" resultType="java.lang.String">
         select moDId