billion-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@
        druid:
            # ä¸»åº“数据源
            master:
                url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=billion-db-bq
                url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=billion-db-064
                username: sa
                password: admin@123
                password: 123456
#    datasource:
#        type: com.alibaba.druid.pool.DruidDataSource
#        driverClassName: com.mysql.cj.jdbc.Driver

 billion-admin/src/main/resources/application.yml

@@ -141,9 +141,9 @@
      capitalMode: false
      logicDeleteField: del_flag
      # é€»è¾‘已删除值
      logicDeleteValue: "1"
      logicDeleteValue: '1'
      # é€»è¾‘未删除值
      logicNotDeleteValue: "0"
      logicNotDeleteValue: '0'
      insertStrategy: NOT_NULL
      updateStrategy: NOT_NULL

@@ -171,6 +171,11 @@
  # åŒ¹é…é“¾æŽ¥
  urlPatterns: /system/*,/monitor/*,/tool/*

tcp:
  server:
    ip: 127.0.0.1
    port: 1000

kangaroohy:
  milo:
      config:

 billion-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.billion.generator.mapper.GenTableColumnMapper">

    <resultMap type="GenTableColumn" id="GenTableColumnResult">
@@ -29,7 +29,7 @@
        <result property="updateTime"     column="update_time"    />
    </resultMap>

    <sql id="selectGenTableColumnVo">
    <sql id="selectGenTableColumnVo">
        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
    </sql>

@@ -40,72 +40,98 @@
    </select>

    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
        select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
        from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
        order by ordinal_position
    </select>
        SELECT a.name                                                                       AS column_name,
               (CASE WHEN a.isnullable = 1 THEN 0 ELSE 1 END)                               AS is_required,
               (CASE WHEN (
                              SELECT COUNT(*) FROM sysobjects
                              WHERE (name IN (
                                  SELECT name FROM sysindexes
                                  WHERE (id = a.id)
                                    AND (indid IN (
                                      SELECT indid FROM sysindexkeys
                                      WHERE (id = a.id)
                                        AND (colid IN (SELECT colid FROM syscolumns WHERE (id = a.id) AND (name = a.name)))
                                  ))))
                                AND (xtype = 'PK')
                          ) > 0 THEN 1
                     ELSE 0 END)                                                             AS is_pk,
               a.colorder                                                                   AS sort,
               isnull(g.[value], ' ')                                                       AS column_comment,
               (CASE WHEN COLUMNPROPERTY(a.id, a.name, 'IsIdentity') = 1 THEN 1 ELSE 0 END) AS is_increment,
               b.name                                                                       AS column_type
        FROM syscolumns as a
                 LEFT JOIN systypes b ON a.xtype = b.xusertype
                 INNER JOIN sysobjects d ON a.id = d.id AND d.xtype = 'U' AND d.name <![CDATA[<>]]> 'dtproperties'
                 LEFT JOIN syscomments e ON a.cdefault = e.id
                 LEFT JOIN sys.extended_properties g ON a.id = g.major_id AND a.colid = g.minor_id
                 LEFT JOIN sys.extended_properties f ON d.id = f.class AND f.minor_id = 0
                 LEFT JOIN sys.objects h ON a.id = h.object_id
                 LEFT JOIN sys.schemas i ON h.schema_id = i.schema_id
        WHERE d.name = #{tableName}
        ORDER BY a.colorder
    </select>

    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
        insert into gen_table_column (
            <if test="tableId != null and tableId != ''">table_id,</if>
            <if test="columnName != null and columnName != ''">column_name,</if>
            <if test="columnComment != null and columnComment != ''">column_comment,</if>
            <if test="columnType != null and columnType != ''">column_type,</if>
            <if test="javaType != null and javaType != ''">java_type,</if>
            <if test="javaField != null  and javaField != ''">java_field,</if>
            <if test="isPk != null and isPk != ''">is_pk,</if>
            <if test="isIncrement != null and isIncrement != ''">is_increment,</if>
            <if test="isRequired != null and isRequired != ''">is_required,</if>
            <if test="isInsert != null and isInsert != ''">is_insert,</if>
            <if test="isEdit != null and isEdit != ''">is_edit,</if>
            <if test="isList != null and isList != ''">is_list,</if>
            <if test="isQuery != null and isQuery != ''">is_query,</if>
            <if test="queryType != null and queryType != ''">query_type,</if>
            <if test="htmlType != null and htmlType != ''">html_type,</if>
            <if test="dictType != null and dictType != ''">dict_type,</if>
            <if test="sort != null">sort,</if>
            <if test="createBy != null and createBy != ''">create_by,</if>
            create_time
         )values(
            <if test="tableId != null and tableId != ''">#{tableId},</if>
            <if test="columnName != null and columnName != ''">#{columnName},</if>
            <if test="columnComment != null and columnComment != ''">#{columnComment},</if>
            <if test="columnType != null and columnType != ''">#{columnType},</if>
            <if test="javaType != null and javaType != ''">#{javaType},</if>
            <if test="javaField != null and javaField != ''">#{javaField},</if>
            <if test="isPk != null and isPk != ''">#{isPk},</if>
            <if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
            <if test="isRequired != null and isRequired != ''">#{isRequired},</if>
            <if test="isInsert != null and isInsert != ''">#{isInsert},</if>
            <if test="isEdit != null and isEdit != ''">#{isEdit},</if>
            <if test="isList != null and isList != ''">#{isList},</if>
            <if test="isQuery != null and isQuery != ''">#{isQuery},</if>
            <if test="queryType != null and queryType != ''">#{queryType},</if>
            <if test="htmlType != null and htmlType != ''">#{htmlType},</if>
            <if test="dictType != null and dictType != ''">#{dictType},</if>
            <if test="sort != null">#{sort},</if>
            <if test="createBy != null and createBy != ''">#{createBy},</if>
            sysdate()
         )
        <if test="tableId != null and tableId != ''">table_id,</if>
        <if test="columnName != null and columnName != ''">column_name,</if>
        <if test="columnComment != null and columnComment != ''">column_comment,</if>
        <if test="columnType != null and columnType != ''">column_type,</if>
        <if test="javaType != null and javaType != ''">java_type,</if>
        <if test="javaField != null  and javaField != ''">java_field,</if>
        <if test="isPk != null and isPk != ''">is_pk,</if>
        <if test="isIncrement != null and isIncrement != ''">is_increment,</if>
        <if test="isRequired != null and isRequired != ''">is_required,</if>
        <if test="isInsert != null and isInsert != ''">is_insert,</if>
        <if test="isEdit != null and isEdit != ''">is_edit,</if>
        <if test="isList != null and isList != ''">is_list,</if>
        <if test="isQuery != null and isQuery != ''">is_query,</if>
        <if test="queryType != null and queryType != ''">query_type,</if>
        <if test="htmlType != null and htmlType != ''">html_type,</if>
        <if test="dictType != null and dictType != ''">dict_type,</if>
        <if test="sort != null">sort,</if>
        <if test="createBy != null and createBy != ''">create_by,</if>
        create_time
        )values(
        <if test="tableId != null and tableId != ''">#{tableId},</if>
        <if test="columnName != null and columnName != ''">#{columnName},</if>
        <if test="columnComment != null and columnComment != ''">#{columnComment},</if>
        <if test="columnType != null and columnType != ''">#{columnType},</if>
        <if test="javaType != null and javaType != ''">#{javaType},</if>
        <if test="javaField != null and javaField != ''">#{javaField},</if>
        <if test="isPk != null and isPk != ''">#{isPk},</if>
        <if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
        <if test="isRequired != null and isRequired != ''">#{isRequired},</if>
        <if test="isInsert != null and isInsert != ''">#{isInsert},</if>
        <if test="isEdit != null and isEdit != ''">#{isEdit},</if>
        <if test="isList != null and isList != ''">#{isList},</if>
        <if test="isQuery != null and isQuery != ''">#{isQuery},</if>
        <if test="queryType != null and queryType != ''">#{queryType},</if>
        <if test="htmlType != null and htmlType != ''">#{htmlType},</if>
        <if test="dictType != null and dictType != ''">#{dictType},</if>
        <if test="sort != null">#{sort},</if>
        <if test="createBy != null and createBy != ''">#{createBy},</if>
        getdate()
        )
    </insert>

    <update id="updateGenTableColumn" parameterType="GenTableColumn">
        update gen_table_column
        <set>
            is_insert = #{isInsert},
            is_edit = #{isEdit},
            is_list = #{isList},
            is_query = #{isQuery},
            is_required = #{isRequired},
            <if test="columnComment != null">column_comment = #{columnComment},</if>
            <if test="javaType != null">java_type = #{javaType},</if>
            <if test="javaField != null">java_field = #{javaField},</if>
            <if test="isInsert != null">is_insert = #{isInsert},</if>
            <if test="isEdit != null">is_edit = #{isEdit},</if>
            <if test="isList != null">is_list = #{isList},</if>
            <if test="isQuery != null">is_query = #{isQuery},</if>
            <if test="isRequired != null">is_required = #{isRequired},</if>
            <if test="queryType != null">query_type = #{queryType},</if>
            <if test="htmlType != null">html_type = #{htmlType},</if>
            <if test="dictType != null">dict_type = #{dictType},</if>
            <if test="sort != null">sort = #{sort},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            update_time = sysdate()
            update_time = getdate()
        </set>
        where column_id = #{columnId}
    </update>

 billion-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.billion.generator.mapper.GenTableMapper">

    <resultMap type="GenTable" id="GenTableResult">
        <id     property="tableId"        column="table_id"          />
        <id     property="tableId"        column="table_id"          />
        <result property="tableName"      column="table_name"        />
        <result property="tableComment"   column="table_comment"     />
        <result property="subTableName"   column="sub_table_name"    />
        <result property="subTableFkName" column="sub_table_fk_name" />
        <result property="className"      column="class_name"        />
        <result property="tplCategory"    column="tpl_category"      />
        <result property="tplWebType"     column="tpl_web_type"      />
        <result property="packageName"    column="package_name"      />
        <result property="moduleName"     column="module_name"       />
        <result property="businessName"   column="business_name"     />
@@ -26,39 +25,39 @@
        <result property="updateBy"       column="update_by"         />
        <result property="updateTime"     column="update_time"       />
        <result property="remark"         column="remark"            />
        <collection  property="columns"   javaType="java.util.List"  resultMap="GenTableColumnResult" />
        <collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
    </resultMap>
	

    <resultMap type="GenTableColumn" id="GenTableColumnResult">
        <id     property="columnId"       column="column_id"      />
        <result property="tableId"        column="table_id"       />
        <result property="columnName"     column="column_name"    />
        <result property="columnComment"  column="column_comment" />
        <result property="columnType"     column="column_type"    />
        <result property="javaType"       column="java_type"      />
        <result property="javaField"      column="java_field"     />
        <result property="isPk"           column="is_pk"          />
        <result property="isIncrement"    column="is_increment"   />
        <result property="isRequired"     column="is_required"    />
        <result property="isInsert"       column="is_insert"      />
        <result property="isEdit"         column="is_edit"        />
        <result property="isList"         column="is_list"        />
        <result property="isQuery"        column="is_query"       />
        <result property="queryType"      column="query_type"     />
        <result property="htmlType"       column="html_type"      />
        <result property="dictType"       column="dict_type"      />
        <result property="sort"           column="sort"           />
        <result property="createBy"       column="create_by"      />
        <result property="createTime"     column="create_time"    />
        <result property="updateBy"       column="update_by"      />
        <result property="updateTime"     column="update_time"    />
    </resultMap>
	
        <id     property="columnId"       column="column_id"      />
        <result property="tableId"        column="table_id"       />
        <result property="columnName"     column="column_name"    />
        <result property="columnComment"  column="column_comment" />
        <result property="columnType"     column="column_type"    />
        <result property="javaType"       column="java_type"      />
        <result property="javaField"      column="java_field"     />
        <result property="isPk"           column="is_pk"          />
        <result property="isIncrement"    column="is_increment"   />
        <result property="isRequired"     column="is_required"    />
        <result property="isInsert"       column="is_insert"      />
        <result property="isEdit"         column="is_edit"        />
        <result property="isList"         column="is_list"        />
        <result property="isQuery"        column="is_query"       />
        <result property="queryType"      column="query_type"     />
        <result property="htmlType"       column="html_type"      />
        <result property="dictType"       column="dict_type"      />
        <result property="sort"           column="sort"           />
        <result property="createBy"       column="create_by"      />
        <result property="createTime"     column="create_time"    />
        <result property="updateBy"       column="update_by"      />
        <result property="updateTime"     column="update_time"    />
    </resultMap>

    <sql id="selectGenTableVo">
        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
    </sql>
    
    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
    </sql>

    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
        <include refid="selectGenTableVo"/>
        <where>
            <if test="tableName != null and tableName != ''">
@@ -68,143 +67,161 @@
                AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
            </if>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- å¼€å§‹æ—¶é—´æ£€ç´¢ -->
                AND date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
                <!--                and <![CDATA[ create_time >= convert(datetime, #{params.beginTime}, 20)]]>-->
                and datediff(d, create_time, #{params.beginTime}) <![CDATA[<=]]> 0
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- ç»“束时间检索 -->
                AND date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
                <!--                and <![CDATA[ create_time <= convert(datetime, #{params.endTime}, 20)]]>-->
                and datediff(d, create_time, #{params.endTime}) <![CDATA[>=]]> 0
            </if>
        </where>
    </select>

    <select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
        select table_name, table_comment, create_time, update_time from information_schema.tables
        where table_schema = (select database())
        AND table_name NOT LIKE 'qrtz\_%' AND table_name NOT LIKE 'gen\_%'
        AND table_name NOT IN (select table_name from gen_table)
        SELECT
        so.name as table_name,
        sep.value as table_comment,
        so.create_date as create_time,
        so.modify_date as update_time
        FROM
        sys.objects as so
        LEFT JOIN sys.extended_properties as sep on so.object_id = sep.major_id
        WHERE
        so.type = 'U'
        AND sep.minor_id = 0
        AND so.name NOT LIKE 'qrtz_%' AND so.name NOT LIKE 'gen_%'
        AND so.name NOT LIKE 'act_%'  AND so.name NOT LIKE 'flw_%'
        AND so.name NOT IN (select table_name from gen_table)
        <if test="tableName != null and tableName != ''">
            AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
            AND lower(so.name) like lower(concat('%', #{tableName}, '%'))
        </if>
        <if test="tableComment != null and tableComment != ''">
            AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
            AND lower(cast(sep.value as nvarchar)) like lower(concat('%', #{tableComment}, '%'))
        </if>
        <if test="params.beginTime != null and params.beginTime != ''"><!-- å¼€å§‹æ—¶é—´æ£€ç´¢ -->
            AND date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
            <!--            and <![CDATA[ create_time >= convert(datetime, #{params.beginTime}, 20)]]>-->
            and datediff(d, so.create_date, #{params.beginTime}) <![CDATA[<=]]> 0
        </if>
        <if test="params.endTime != null and params.endTime != ''"><!-- ç»“束时间检索 -->
            AND date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
            <!--            and <![CDATA[ create_time <= convert(datetime, #{params.endTime}, 20)]]>-->
            and datediff(d, so.create_date, #{params.endTime}) <![CDATA[>=]]> 0
        </if>
        order by create_time desc
        order by so.create_date desc
    </select>
	

    <select id="selectDbTableListByNames" resultMap="GenTableResult">
        select table_name, table_comment, create_time, update_time from information_schema.tables
        where table_name NOT LIKE 'qrtz\_%' and table_name NOT LIKE 'gen\_%' and table_schema = (select database())
        and table_name in
        <foreach collection="array" item="name" open="(" separator="," close=")">
             #{name}
        </foreach> 
        SELECT
        SO.name table_name,
        SEP.VALUE table_comment,
        SO.create_date create_time,
        SO.modify_date update_time
        FROM
        sys.objects AS SO
        LEFT JOIN sys.extended_properties AS SEP ON SO.object_id = SEP.major_id
        WHERE
        SO.type = 'U'
        AND SEP.minor_id = 0
        and SO.name NOT LIKE 'qrtz_%' and SO.name NOT LIKE 'gen_%'
        AND so.name NOT LIKE 'act_%'  AND so.name NOT LIKE 'flw_%'
        and SO.name in
        <foreach collection="array" item="name" open="(" separator="," close=")">
            #{name}
        </foreach>
    </select>
	

    <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
        select table_name, table_comment, create_time, update_time from information_schema.tables
        where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
        and table_name = #{tableName}
          and table_name = #{tableName}
    </select>
	

    <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
        FROM gen_table t
             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
        where t.table_id = #{tableId} order by c.sort
    </select>
	

    <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
        FROM gen_table t
             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
        where t.table_name = #{tableName} order by c.sort
    </select>
	

    <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
        FROM gen_table t
             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
        order by c.sort
    </select>
	

    <insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
        insert into gen_table (
            <if test="tableName != null">table_name,</if>
            <if test="tableComment != null and tableComment != ''">table_comment,</if>
            <if test="className != null and className != ''">class_name,</if>
            <if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
            <if test="tplWebType != null and tplWebType != ''">tpl_web_type,</if>
            <if test="packageName != null and packageName != ''">package_name,</if>
            <if test="moduleName != null and moduleName != ''">module_name,</if>
            <if test="businessName != null and businessName != ''">business_name,</if>
            <if test="functionName != null and functionName != ''">function_name,</if>
            <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
            <if test="genType != null and genType != ''">gen_type,</if>
            <if test="genPath != null and genPath != ''">gen_path,</if>
            <if test="remark != null and remark != ''">remark,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
            create_time
         )values(
            <if test="tableName != null">#{tableName},</if>
            <if test="tableComment != null and tableComment != ''">#{tableComment},</if>
            <if test="className != null and className != ''">#{className},</if>
            <if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
            <if test="tplWebType != null and tplWebType != ''">#{tplWebType},</if>
            <if test="packageName != null and packageName != ''">#{packageName},</if>
            <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
            <if test="businessName != null and businessName != ''">#{businessName},</if>
            <if test="functionName != null and functionName != ''">#{functionName},</if>
            <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
            <if test="genType != null and genType != ''">#{genType},</if>
            <if test="genPath != null and genPath != ''">#{genPath},</if>
            <if test="remark != null and remark != ''">#{remark},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
            sysdate()
         )
    </insert>
    
    <update id="createTable">
        ${sql}
    </update>
    
    <update id="updateGenTable" parameterType="GenTable">
        update gen_table
        <set>
            <if test="tableName != null">table_name = #{tableName},</if>
            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
            <if test="className != null and className != ''">class_name = #{className},</if>
            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
            <if test="tplWebType != null and tplWebType != ''">tpl_web_type = #{tplWebType},</if>
            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
            <if test="options != null and options != ''">options = #{options},</if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            <if test="remark != null">remark = #{remark},</if>
            update_time = sysdate()
        </set>
        where table_id = #{tableId}
    </update>
    
    <delete id="deleteGenTableByIds" parameterType="Long">
        delete from gen_table where table_id in 
        <foreach collection="array" item="tableId" open="(" separator="," close=")">
            #{tableId}
        </foreach>
    </delete>
        insert into gen_table (
        <if test="tableName != null">table_name,</if>
        <if test="tableComment != null and tableComment != ''">table_comment,</if>
        <if test="className != null and className != ''">class_name,</if>
        <if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
        <if test="packageName != null and packageName != ''">package_name,</if>
        <if test="moduleName != null and moduleName != ''">module_name,</if>
        <if test="businessName != null and businessName != ''">business_name,</if>
        <if test="functionName != null and functionName != ''">function_name,</if>
        <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
        <if test="genType != null and genType != ''">gen_type,</if>
        <if test="genPath != null and genPath != ''">gen_path,</if>
        <if test="remark != null and remark != ''">remark,</if>
        <if test="createBy != null and createBy != ''">create_by,</if>
        create_time
        )values(
        <if test="tableName != null">#{tableName},</if>
        <if test="tableComment != null and tableComment != ''">#{tableComment},</if>
        <if test="className != null and className != ''">#{className},</if>
        <if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
        <if test="packageName != null and packageName != ''">#{packageName},</if>
        <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
        <if test="businessName != null and businessName != ''">#{businessName},</if>
        <if test="functionName != null and functionName != ''">#{functionName},</if>
        <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
        <if test="genType != null and genType != ''">#{genType},</if>
        <if test="genPath != null and genPath != ''">#{genPath},</if>
        <if test="remark != null and remark != ''">#{remark},</if>
        <if test="createBy != null and createBy != ''">#{createBy},</if>
        getdate()
        )
    </insert>

    <update id="updateGenTable" parameterType="GenTable">
        update gen_table
        <set>
            <if test="tableName != null">table_name = #{tableName},</if>
            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
            <if test="className != null and className != ''">class_name = #{className},</if>
            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
            <if test="options != null and options != ''">options = #{options},</if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            <if test="remark != null">remark = #{remark},</if>
            update_time = getdate()
        </set>
        where table_id = #{tableId}
    </update>

    <delete id="deleteGenTableByIds" parameterType="Long">
        delete from gen_table where table_id in
        <foreach collection="array" item="tableId" open="(" separator="," close=")">
            #{tableId}
        </foreach>
    </delete>

</mapper>

 billion-main/pom.xml

@@ -59,18 +59,24 @@
            <artifactId>billion-framework</artifactId>
        </dependency>

        <!-- opc start-->
        <dependency>
            <groupId>com.kangaroohy</groupId>
            <artifactId>milo-spring-boot-starter</artifactId>
            <version>3.0.4</version>
            <version>3.0.5</version>
        </dependency>

        <!-- opc start-->
<!--        <dependency>-->
<!--            <groupId>com.kangaroohy</groupId>-->
<!--            <artifactId>milo-spring-boot-starter</artifactId>-->
<!--            <version>3.0.4</version>-->
<!--        </dependency>-->
        <!-- opc end-->

        <dependency>
            <groupId>com.billion</groupId>
            <artifactId>billion-quartz</artifactId>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.billion</groupId>-->
<!--            <artifactId>billion-quartz</artifactId>-->
<!--        </dependency>-->
        <dependency>
            <groupId>org.mybatis</groupId>
            <artifactId>mybatis</artifactId>
@@ -87,6 +93,11 @@
            <artifactId>hutool-all</artifactId>
            <version>5.8.22</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
            <version>2.0.22</version>
        </dependency>
    </dependencies>

</project>

 billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java

@@ -43,15 +43,15 @@
            omProductionOrderInfo.setWorkOrderNo(workOrdersInfo.getOrderNumber());
            omProductionOrderInfo.setSalesOrderCode(workOrdersInfo.getBatchNumber());
            omProductionOrderInfo.setProductCode(workOrdersInfo.getMaterialNumber());
            omProductionOrderInfo.setEngineType(workOrdersInfo.getEngineType());
            omProductionOrderInfo.setEngineName(workOrdersInfo.getEngineName());
//            omProductionOrderInfo.setEngineType(workOrdersInfo.getEngineType());
//            omProductionOrderInfo.setEngineName(workOrdersInfo.getEngineName());
            omProductionOrderInfo.setPlanQty(Long.valueOf(workOrdersInfo.getProductionPlan()));
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            Date startTime = sdf.parse(workOrdersInfo.getStartTime());
            omProductionOrderInfo.setPlanStartTime(startTime);
            omProductionOrderInfo.setRemarks(workOrdersInfo.getDescription());
            omProductionOrderInfo.setOrderStatus(workOrdersInfo.getState());
            omProductionOrderInfo.setFlag(workOrdersInfo.getFLAG());
            omProductionOrderInfo.setDelFlag(workOrdersInfo.getFLAG());
            omProductionOrderInfoService.save(omProductionOrderInfo);
            //保存BOM主表信息
            BsBomInfo bsBomInfo = new BsBomInfo();

 billion-main/src/main/java/com/billion/main/da/controller/DaStationCollectionController.java

@@ -1,18 +1,34 @@
package com.billion.main.da.controller;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.billion.common.annotation.Log;
import com.billion.common.core.controller.BaseController;
import com.billion.common.core.domain.AjaxResult;
import com.billion.common.core.domain.R;
import com.billion.common.core.page.TableDataInfo;
import com.billion.common.enums.BusinessType;
import com.billion.common.exception.ServiceException;
import com.billion.common.utils.poi.ExcelUtil;
import com.billion.main.da.domain.DaStationCollection;
import com.billion.main.da.service.IDaStationCollectionService;
import com.billion.main.da.service.impl.DaStationCollectionServiceImpl;
import com.billion.main.plc.constant.Constants;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.rmi.ServerError;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -26,7 +42,10 @@
public class DaStationCollectionController extends BaseController
{
    @Autowired
    private IDaStationCollectionService daStationCollectionService;
    private DaStationCollectionServiceImpl daStationCollectionService;

    @Resource
    private MiloService miloService;

    /**
     * æŸ¥è¯¢è¿‡ç«™é‡‡é›†åˆ—表
@@ -38,6 +57,13 @@
        startPage();
        List<DaStationCollection> list = daStationCollectionService.selectDaStationCollectionList(daStationCollection);
        return getDataTable(list);
    }

    @GetMapping("/printList")
    public R printList()
    {
        List<DaStationCollection> list = daStationCollectionService.list(new LambdaQueryWrapper<DaStationCollection>().eq(DaStationCollection::getStatus,"0"));
        return R.ok(list);
    }

    /**
@@ -90,9 +116,149 @@
     */
    @PreAuthorize("@ss.hasPermi('da:stationCollection:remove')")
    @Log(title = "过站采集", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    @DeleteMapping("/{id}")
    public R remove(@PathVariable Long id)
    {
        return toAjax(daStationCollectionService.deleteDaStationCollectionByIds(ids));
        if (ObjUtil.isNull(id)){
            throw new ServiceException("id不能为空");
        }
        List<DaStationCollection> list = daStationCollectionService.list(new LambdaQueryWrapper<DaStationCollection>().eq(DaStationCollection::getId, id));
        if (CollUtil.isEmpty(list)){
            throw new ServiceException("数据不存在，请刷新后重试");
        }
        daStationCollectionService.removeById(id);
        return R.ok();
    }


    @GetMapping("/crave")
    public R crave(String sfcCode) throws IOException {
        if (StrUtil.isBlank(sfcCode)){
            throw new ServiceException("序列号不能为空");
        }
        if (!sfcCode.contains(StrUtil.SPACE)){
            throw new ServiceException("输入的序列号需要包含空格！");
        }

        List<DaStationCollection> list = daStationCollectionService.list(new LambdaQueryWrapper<DaStationCollection>()
                .eq(DaStationCollection::getSfcCode, sfcCode)
                .eq(DaStationCollection::getLocationCode,"OP001"));
        if (CollUtil.isNotEmpty(list)){
            DaStationCollection daStationCollection = list.get(0);
            //重复刻码
            return R.ok(303,"此序列号已刻码");
        } else {
//            //首次刻码-发送刻码信号给下位机
//            TcpClient tcpClient = new TcpClient();
//            byte[] bytes = sfcCode.getBytes(StandardCharsets.UTF_8);
//            tcpClient.sendData(bytes);
            //查询数据中状态为0的数据
            List<DaStationCollection> collect = daStationCollectionService.list(new LambdaQueryWrapper<DaStationCollection>()
                    .eq(DaStationCollection::getStatus, "0"));
            if (CollUtil.isNotEmpty(collect)) {
                //清除
                daStationCollectionService.update(new LambdaUpdateWrapper<DaStationCollection>()
                        .eq(DaStationCollection::getStatus,"0")
                        .set(DaStationCollection::getStatus,"1"));
            }

            //保存数据
            DaStationCollection daStationCollection = new DaStationCollection();
            Date date = new Date();
            daStationCollection.setSfcCode(sfcCode);
            List<String> split = ListUtil.toList(sfcCode.split(StrUtil.SPACE));
            if (CollUtil.isNotEmpty(split)){
                if (split.size() > 1){
                    daStationCollection.setPrintCode(split.get(1));
                }
            }
            daStationCollection.setLocationCode("OP001");
            daStationCollection.setCollectTime(date);
            daStationCollection.setInboundTime(date);
            daStationCollection.setOutboundTime(date);
            daStationCollection.setStatus("0");
            daStationCollectionService.save(daStationCollection);
            return R.ok(200);

        }

    }


    @GetMapping("/reCrave")
    public R reCrave(String sfcCode) throws IOException {
        if (StrUtil.isBlank(sfcCode)){
            throw new ServiceException("序列号不能为空");
        }
        if (!sfcCode.contains(StrUtil.SPACE)){
            throw new ServiceException("输入的序列号需要包含空格！");
        }
//        //发送刻码信号给下位机
//            TcpClient tcpClient = new TcpClient();
//            byte[] bytes = sfcCode.getBytes(StandardCharsets.UTF_8);
//            tcpClient.sendData(bytes);

        List<DaStationCollection> collect = daStationCollectionService.list(new LambdaQueryWrapper<DaStationCollection>()
                .eq(DaStationCollection::getStatus, "0"));
        if (CollUtil.isNotEmpty(collect)) {
            //清除
            daStationCollectionService.update(new LambdaUpdateWrapper<DaStationCollection>()
                    .eq(DaStationCollection::getStatus,"0")
                    .set(DaStationCollection::getStatus,"1"));
        }

        //保存数据
        DaStationCollection daStationCollection = new DaStationCollection();
        Date date = new Date();
        daStationCollection.setSfcCode(sfcCode);
        List<String> split = ListUtil.toList(sfcCode.split(StrUtil.SPACE));
        if (CollUtil.isNotEmpty(split)){
            if (split.size() > 1){
                daStationCollection.setPrintCode(split.get(1));
            }
        }
        daStationCollection.setLocationCode("OP001");
        daStationCollection.setCollectTime(date);
        daStationCollection.setInboundTime(date);
        daStationCollection.setOutboundTime(date);
        daStationCollection.setStatus("0");
        daStationCollectionService.save(daStationCollection);
        return R.ok(200);


    }


    @GetMapping("/addPassStationCollection")
    public R addPassStationCollection(String SNCode, String LocationCode) throws Exception {
        if (StrUtil.isBlank(SNCode)){
            return R.fail("序列号不能为空");
        }
        if (!SNCode.contains(" ")){
            return R.fail("请检查序列号是否正确");
        }
        DaStationCollection daStationCollection = new DaStationCollection();
        Date date = new Date();
        daStationCollection.setSfcCode(SNCode);
        daStationCollection.setLocationCode(LocationCode);
        daStationCollection.setCollectTime(date);
        daStationCollection.setInboundTime(date);
        daStationCollection.setOutboundTime(date);
        daStationCollection.setStatus(Constants.ZERO);
        daStationCollectionService.save(daStationCollection);


        if (Constants.OP010.equals(LocationCode)){
            //传入SNCode到PLC
            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(Constants.OP010_SNCODE1).value(SNCode).build());
        }
        return R.ok();
    }


//    @GetMapping("/testSend")
//    public void test(){
//        TcpClient tcpClient = new TcpClient();
//        tcpClient.receiveData();
//    }
}

 billion-main/src/main/java/com/billion/main/da/domain/DaStationCollection.java

@@ -48,4 +48,7 @@
    private Date collectTime;


    private String printCode;


}

 billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java

@@ -58,7 +58,7 @@

    @Override
    public int insertDaStationCollection(DaStationCollection daStationCollection) {
        return daStationCollectionMapper.insertDaStationCollection(daStationCollection);
        return daStationCollectionMapper.insert(daStationCollection);
    }

    /**

 billion-main/src/main/java/com/billion/main/om/controller/OmProductionOrderInfoController.java

@@ -1,5 +1,6 @@
package com.billion.main.om.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.billion.common.annotation.Log;
import com.billion.common.core.controller.BaseController;
import com.billion.common.core.domain.AjaxResult;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;

@@ -103,4 +105,16 @@
    {
        return toAjax(OmProductionOrderInfoService.deleteOmProductionOrderInfoByIds(ids));
    }


    @PreAuthorize("@ss.hasPermi('main:info:list')")
    @GetMapping("/getTodayList")
    public R getTodayList()
    {
        LocalDate today = LocalDate.now();
        List<OmProductionOrderInfo> list = OmProductionOrderInfoService.list(new LambdaQueryWrapper<OmProductionOrderInfo>()
                .eq(OmProductionOrderInfo::getPlanStartTime,today));
        return R.ok(list);

    }
}

 billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableId;
import com.billion.common.annotation.Excel;
import com.billion.main.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

@@ -14,18 +15,15 @@
 * @date 2024-11-20
 */
@Data
public class OmProductionOrderInfo
public class OmProductionOrderInfo extends BaseEntity
{
    @TableId
    /** ä¸»é”®id */
    private Long id;

    /** å·¥å•ç¼–号 */
    @Excel(name = "工单编号")
//    @Excel(name = "工单编号")
    private String workOrderNo;

    /** è®¢å•ç¼–号 */
    @Excel(name = "订单编号")
//    @Excel(name = "订单编号")
    private String salesOrderCode;

    /** äº§å“ç¼–号 */
@@ -33,7 +31,7 @@
    private String productCode;

    /** äº§çº¿ç¼–号 */
    @Excel(name = "产线编号")
//    @Excel(name = "产线编号")
    private String lineCode;

    /** è®¡åˆ’数量 */
@@ -41,46 +39,31 @@
    private Long planQty;

    /** è®¡åˆ’开始时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "计划开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "计划开始时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date planStartTime;

    /** è®¡åˆ’结束时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
//    @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date planEndTime;

    /** å·¥å•çŠ¶æ€ï¼ˆ1未开始2生产中3已完成4已关闭） */
    @Excel(name = "工单状态", readConverterExp = "1=未开始,2=生产中,3=已完成,4=已关闭")
//    @Excel(name = "工单状态", readConverterExp = "1=未开始,2=生产中,3=已完成,4=已关闭")
    private String orderStatus;

    /** å¤‡æ³¨ */
    @Excel(name = "备注")
    private String remarks;

    /** å‘动机型号 */
    @Excel(name = "发动机型号")
    private String engineType;
//    /** å‘动机型号 */
//    @Excel(name = "发动机型号")
//    private String engineType;
//
//    /** æœºåž‹ */
//    @Excel(name = "机型")
//    private String engineName;

    /** æœºåž‹ */
    @Excel(name = "机型")
    private String engineName;

    /** è®¢å•çŠ¶æ€ */
    @Excel(name = "订单状态")
    private String flag;
    /** åˆ›å»ºè€… */
    private String createBy;

    /** åˆ›å»ºæ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /** æ›´æ–°è€… */
    private String updateBy;

    /** æ›´æ–°æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

}

 billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java

@@ -1,6 +1,7 @@
package com.billion.main.om.service.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.billion.common.core.domain.entity.SysUser;
@@ -84,20 +85,20 @@
    @Override
    public int updateOmProductionOrderInfo(OmProductionOrderInfo omProductionOrderInfo)
    {
        Collection<Long> omProductionOrderInfoIds = Collections.emptyList();
        List<OmProductionOrderInfo> checkList = this.list(new LambdaQueryWrapper<OmProductionOrderInfo>()
                .eq(OmProductionOrderInfo::getWorkOrderNo, omProductionOrderInfo.getWorkOrderNo())
                        .notIn(OmProductionOrderInfo::getId, omProductionOrderInfoIds));
//                .stream().filter(x -> !x.getId().equals(omProductionOrderInfo.getId()))
//                .collect(Collectors.toList());
        if (CollUtil.isNotEmpty(checkList)){
            throw new ServiceException("已存在工单编号为"+omProductionOrderInfo.getWorkOrderNo()+"的数据");
        }
        LoginUser loginUser = SecurityUtils.getLoginUser();
        SysUser user = loginUser.getUser();
        omProductionOrderInfo.setUpdateTime(new Date());
        omProductionOrderInfo.setUpdateBy(user.getUserName());
        return OmProductionOrderInfoMapper.updateOmProductionOrderInfo(omProductionOrderInfo);
//        Collection<Long> omProductionOrderInfoIds = Collections.emptyList();
//        List<OmProductionOrderInfo> checkList = this.list(new LambdaQueryWrapper<OmProductionOrderInfo>()
//                .eq(OmProductionOrderInfo::getWorkOrderNo, omProductionOrderInfo.getWorkOrderNo())
//                        .notIn(OmProductionOrderInfo::getId, omProductionOrderInfoIds));
////                .stream().filter(x -> !x.getId().equals(omProductionOrderInfo.getId()))
////                .collect(Collectors.toList());
//        if (CollUtil.isNotEmpty(checkList)){
//            throw new ServiceException("已存在工单编号为"+omProductionOrderInfo.getWorkOrderNo()+"的数据");
//        }
//        LoginUser loginUser = SecurityUtils.getLoginUser();
//        SysUser user = loginUser.getUser();
//        omProductionOrderInfo.setUpdateTime(new Date());
//        omProductionOrderInfo.setUpdateBy(user.getUserName());
        return OmProductionOrderInfoMapper.updateById(omProductionOrderInfo);
    }

    /**

 billion-main/src/main/java/com/billion/main/plc/CustomRunner.java

@@ -10,12 +10,14 @@
import com.billion.main.sc.domain.ScOpcConf;
import com.billion.main.sc.service.IScCollectionParamConfService;
import com.billion.main.sc.service.IScOpcConfService;
import com.billion.system.service.impl.SysNoticeServiceImpl;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;

@@ -33,6 +35,9 @@
    @Autowired
    private IDaStationCollectionService stationCollectionService;

    @Resource
    private SysNoticeServiceImpl sysNoticeService;

    @Override
    public void run(ApplicationArguments args) throws Exception {

@@ -40,7 +45,8 @@
                miloService,
                collectionParamConfService,
                paramCollectionService,
                stationCollectionService);
                stationCollectionService,
                sysNoticeService);

        List<String> lists = getSubList();
        System.out.println("订阅内容："+lists);

 billion-main/src/main/java/com/billion/main/plc/constant/Constants.java

@@ -40,9 +40,13 @@
    public static final String STRING_TWO_THREE= "23";


    public static final Integer INTEGER_ONE_ONE= 11;
    public static final Integer INTEGER_ONE_TWO= 12;
    public static final Integer INTEGER_TWO_ONE= 21;
    public static final Integer INTEGER_TWO_FIVE= 25;
    public static final Integer INTEGER_TWO_THREE= 23;

    public static final String OP010_SNCODE1 = "OP010.OP010.SNCode1";


    public static final Integer USE_ING= 0;
@@ -56,6 +60,9 @@
    public static final String ONE= "1";
    public static final String ZERO= "0";
    public static final String TWO= "2";
    public static final String THREE = "3";
    public static final String FOUR= "4";
    public static final String FIVE= "5";

    public static final String OP010= "OP010";
    public static final String OP020= "OP020";

 billion-main/src/main/java/com/billion/main/plc/sub/OPCUaSubscription.java

@@ -2,18 +2,24 @@


import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
import com.alibaba.druid.sql.visitor.functions.Substring;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.billion.main.api.domain.StationST180;
import com.billion.main.da.domain.DaParamCollection;
import com.billion.main.da.domain.DaStationCollection;
import com.billion.main.da.service.IDaParamCollectionService;
import com.billion.main.da.service.IDaStationCollectionService;
import com.billion.main.plc.constant.Constants;
import com.billion.main.sc.domain.ScCollectionParamConf;
import com.billion.main.sc.service.IScCollectionParamConfService;
import com.billion.system.domain.SysNotice;
import com.billion.system.service.impl.SysNoticeServiceImpl;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
@@ -38,19 +44,23 @@
    public static IDaParamCollectionService paramCollectionService;
    public static IDaStationCollectionService stationCollectionService;

    public static SysNoticeServiceImpl sysNoticeService;

    public OPCUaSubscription(MiloService miloService, IScCollectionParamConfService collectionParamConfService
            ,IDaParamCollectionService paramCollectionService,IDaStationCollectionService stationCollectionService) {
            ,IDaParamCollectionService paramCollectionService,IDaStationCollectionService stationCollectionService,SysNoticeServiceImpl sysNoticeService) {
        OPCUaSubscription.miloService = miloService;
        OPCUaSubscription.collectionParamConfService = collectionParamConfService;
        OPCUaSubscription.paramCollectionService = paramCollectionService;
        OPCUaSubscription.stationCollectionService = stationCollectionService;
        OPCUaSubscription.sysNoticeService = sysNoticeService;

    }

    @Override
    public void onSubscribe(String identifier, Object value) {
        log.info("地址："+identifier+"值："+value);
        try {
            if(null != value && !Constants.ZERO.equals(value.toString())) {
            if(ObjUtil.isNotNull(value) && !Constants.ZERO.equals(value.toString())) {
                String[] nodes = identifier.split("[.]");
                String thoroughfare = nodes[0];//通道
                String device = nodes[1];//设备
@@ -71,12 +81,66 @@
        try{
            //监听recordData
            if(tab.equals(Constants.RECORD_DATA)){
                //如果是2做出站处理
                if(valueString.equals(Constants.TWO)){
                if(valueString.equals(Constants.ONE)){
//                    Object StationStatusObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus").getValue();
//                    if (ObjUtil.isNotNull(StationStatusObject)){
//                        String StationStatus = StationStatusObject.toString();
//                        if (!Constants.ONE.equals(StationStatus)){
//                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(Constants.INTEGER_ONE_TWO).build());
//                        } else {
//                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(Constants.INTEGER_ONE_ONE).build());
//                        }
//                    }

                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(Constants.INTEGER_ONE_ONE).build());

                } else if(valueString.equals(Constants.TWO)){
                    //如果是2做出站处理
                    Object SNCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                    if (ObjUtil.isNotNull(SNCodeObject)){
                        String SnCode = SNCodeObject.toString();
                        if (StrUtil.isNotBlank(SnCode)){
                            savePassingStation(thoroughfare,device,"snCode");
                            saveParamCollection(device, "snCode", "stationStatus");
                        }
                    }
                    Integer result = Constants.INTEGER_TWO_ONE;
                    result = saveParamCollection(device, "snCode", "stationStatus");
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
                }
            } else if (tab.startsWith("OP")){
                //处理设备报警
                if (Constants.FIVE.equals(valueString)){
                    //重置
                    List<SysNotice> list = sysNoticeService.list(new LambdaQueryWrapper<SysNotice>()
                            .eq(SysNotice::getNoticeTitle, tab)
                            .eq(SysNotice::getStatus, Constants.ONE)
                            .eq(SysNotice::getNoticeType,valueString));
                    if (CollUtil.isNotEmpty(list)){
                       list.forEach(x ->{
                           x.setStatus(Constants.ZERO);
                       });
                       sysNoticeService.updateBatchById(list);
                    }
                } else {
                    SysNotice sysNotice = new SysNotice();
                    sysNotice.setNoticeTitle(tab);
                    sysNotice.setNoticeType(valueString);
                    String type = "";
                    if (Constants.ONE.equals(valueString)){
                        type = "缺料";
                    } else if (Constants.TWO.equals(valueString)){
                        type = "故障";
                    } else if (Constants.THREE.equals(valueString)){
                        type = "设备";
                    } else if (Constants.FOUR.equals(valueString)){
                        type = "急停";
                    }
                    String content = tab + "工位" +type+ "报警";
                    sysNotice.setNoticeContent(content);
                    sysNotice.setStatus(Constants.ONE);
                    sysNoticeService.insertNotice(sysNotice);
                }

            }
        }catch (Exception e) {
            log.error(e.getMessage());
@@ -91,16 +155,23 @@
     * @return Integer
     * @throws Exception e
     */
    private static Integer savePassingStation(String device, String snCode,String stationStatus){
        Integer result = 21;
    private static void savePassingStation(String thoroughfare, String device, String snCode){
        try {


            DaStationCollection daStationCollection = new DaStationCollection();
            daStationCollection.setSfcCode(snCode);
            daStationCollection.setLocationCode(device);
            daStationCollection.setInboundTime(new Date());
            daStationCollection.setOutboundTime(new Date());
            Object StationStatusObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus").getValue();
            if (ObjUtil.isNotNull(StationStatusObject)){
                String StationStatus = StationStatusObject.toString();
                daStationCollection.setStatus(StationStatus);
            }
            daStationCollection.setCollectTime(new Date());
            stationCollectionService.insertDaStationCollection(daStationCollection);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }

        return result;
    }

    /**
@@ -111,8 +182,7 @@
     * @return result
     * @throws Exception e
     */
    private static Integer saveParamCollection(String device, String snCode, String stationStatus) {
        Integer result = Constants.INTEGER_TWO_ONE;
    private static void saveParamCollection(String device, String snCode, String stationStatus) {
        try {
            // æŸ¥è¯¢å‚数配置表
            List<ScCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<ScCollectionParamConf>()
@@ -120,37 +190,36 @@
                    .eq(ScCollectionParamConf::getSubscribe, Constants.ONE)
                    .orderByDesc(ScCollectionParamConf::getOrderNum)
            );
            

            if (CollUtil.isNotEmpty(list)) {
                // èŽ·å–参数值
                List<String> collect = list.stream()
                        .map(ScCollectionParamConf::getNode)
                        .collect(Collectors.toList());
                List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(collect);
                

                // ä¿å­˜é‡‡é›†æ•°æ®
                saveCollectionData(device, snCode, list, readWriteEntityList);
                
                // åˆ›å»ºå·¥ä½å¯¹è±¡å¹¶èµ‹å€¼
                Object stationObject = createStationObject(device, list, readWriteEntityList);
                if (stationObject != null) {
                    System.out.println("工位" + device + "对象创建成功：" + stationObject);
                    // è¿™é‡Œå¯ä»¥å¯¹åˆ›å»ºçš„对象进行进一步处理
                    handleMesRequest(stationObject, device);
                }

//                // åˆ›å»ºå·¥ä½å¯¹è±¡å¹¶èµ‹å€¼
//                Object stationObject = createStationObject(device, list, readWriteEntityList);
//                if (stationObject != null) {
//                    System.out.println("工位" + device + "对象创建成功：" + stationObject);
//                    // è¿™é‡Œå¯ä»¥å¯¹åˆ›å»ºçš„对象进行进一步处理
//
//                }
            }

        } catch (Exception e) {
            log.error("保存数据异常", e);
            throw new RuntimeException("保存数据发送工厂MES异常");
            throw new RuntimeException("保存数据异常");
        }
        return result;
    }

    /**
     * ä¿å­˜é‡‡é›†æ•°æ®
     */
    private static void saveCollectionData(String device, String snCode, 
    private static void saveCollectionData(String device, String snCode,
            List<ScCollectionParamConf> list, List<ReadWriteEntity> readWriteEntityList) {
        ArrayList<DaParamCollection> collectionList = new ArrayList<>();
        for (int i = 0; i < readWriteEntityList.size(); i++) {
@@ -169,7 +238,7 @@
    /**
     * åˆ›å»ºå·¥ä½å¯¹è±¡å¹¶èµ‹å€¼
     */
    private static Object createStationObject(String device, 
    private static Object createStationObject(String device,
            List<ScCollectionParamConf> list, List<ReadWriteEntity> readWriteEntityList) {
        try {
            // æž„建完整的类名
@@ -179,11 +248,11 @@

            // èŽ·å–所有属性
            Field[] fields = stationClass.getDeclaredFields();
            

            // åˆ›å»ºå‚数值Map，方便查找
            Map<String, String> paramValueMap = new HashMap<>();
            for (int i = 0; i < list.size(); i++) {
                paramValueMap.put(list.get(i).getParamCode(), 
                paramValueMap.put(list.get(i).getParamCode(),
                    readWriteEntityList.get(i).getValue().toString());
            }

@@ -192,7 +261,7 @@
                field.setAccessible(true);
                String paramCode = field.getName(); // å‡è®¾å±žæ€§åä¸Žå‚数编码一致
                String value = paramValueMap.get(paramCode);
                

                if (value != null) {
                    // æ ¹æ®å­—段类型转换值
                    Object convertedValue = convertValue(value, field.getType());
@@ -232,55 +301,6 @@
            }
        }
        return value;
    }

    private static void handleMesRequest(Object stationObject, String device) {
        try {
            // å‘送HTTP请求
            HttpResponse response = HttpRequest.post(Constants.SY_MES_URL)
                    .body(JSONUtil.toJsonStr(stationObject))
                    .timeout(5000) // è®¾ç½®è¶…时时间
                    .execute();

            // è§£æžå“åº”
            if (response.isOk()) { // è¯·æ±‚成功
                JSONObject jsonResponse = JSONUtil.parseObj(response.body());
                String message = jsonResponse.getStr("message");
                
                if (!"ok".equals(message)) {
                    // å“åº”不是ok，保存失败记录
                    saveMesFailRecord(stationObject, device, "响应异常：" + message);
                }
            } else {
                // HTTP请求失败，保存失败记录
                saveMesFailRecord(stationObject, device, "HTTP状态码：" + response.getStatus());
            }
        } catch (Exception e) {
            // å‘生异常（比如连接超时、服务不可用等），保存失败记录
            saveMesFailRecord(stationObject, device, "请求异常：" + e.getMessage());
        }
    }

    /**
     * ä¿å­˜MES推送失败记录
     */
    private static void saveMesFailRecord(Object stationObject, String device, String errorMsg) {
        try {
            MesFailRecord failRecord = new MesFailRecord();
            failRecord.setDeviceCode(device);
            failRecord.setRequestData(JSONUtil.toJsonStr(stationObject));
            failRecord.setErrorMsg(errorMsg);
            failRecord.setCreateTime(new Date());
            failRecord.setStatus(0); // 0:未处理 1:已处理
            failRecord.setRetryCount(0); // é‡è¯•æ¬¡æ•°
            
            // ä¿å­˜åˆ°æ•°æ®åº“
            mesFailRecordService.save(failRecord);
            
            log.error("MES推送失败，已保存失败记录。设备：{}，错误：{}", device, errorMsg);
        } catch (Exception e) {
            log.error("保存MES失败记录时发生错误", e);
        }
    }

}

 billion-main/src/main/java/com/billion/main/plc/sub/OPCUaSubscriptionTemp.java

ÎļþÒÑɾ³ý

 billion-main/src/main/java/com/billion/main/tcp/TcpClient.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,134 @@
//package com.billion.main.tcp;
//
//import cn.hutool.core.collection.CollUtil;
//import cn.hutool.core.util.ObjUtil;
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
//import com.billion.main.da.domain.DaStationCollection;
//import com.billion.main.da.service.impl.DaStationCollectionServiceImpl;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.scheduling.annotation.Async;
//import org.springframework.stereotype.Component;
//
//import javax.annotation.PostConstruct;
//import javax.annotation.Resource;
//import java.io.IOException;
//import java.io.InputStream;
//import java.io.OutputStream;
//import java.net.InetAddress;
//import java.net.ServerSocket;
//import java.net.Socket;
//import java.net.UnknownHostException;
//import java.util.Arrays;
//import java.util.List;
//import java.nio.charset.StandardCharsets;
//
///**
// * ç®€ä»‹è¯´æ˜Ž:TCP连接
// *
// * @author: Eric
// * @date: 2025-03-29 13:29:01
// * @version: 1.0
// */
//@Slf4j
//@Component
//public class TcpClient {
//
//    private Socket socket;
//    private InputStream input;
//    private OutputStream output;
//
//    @Value("${tcp.server.ip}")
//    private String serverIp;
//
//    @Value("${tcp.server.port}")
//    private int serverPort;
//
//    @Resource
//    private DaStationCollectionServiceImpl daStationCollectionService;
//
//    @PostConstruct
//    public void init() throws UnknownHostException {
//
//        try {
//            log.info("开始建立连接");
//            // å»ºç«‹ TCP è¿žæŽ¥
//            socket = new Socket(serverIp, serverPort);
//            int localPort = socket.getLocalPort();
//            InetAddress localAddress = socket.getLocalAddress();
//            log.info("localPort",localPort);
//            log.info("localAddress",localAddress);
//            int port = socket.getPort();
//            log.info("port:",port);
//            input = socket.getInputStream();
//            output = socket.getOutputStream();
//            log.info("input:",input);
//            log.info("output:",output);
//        } catch (IOException e) {
//            e.printStackTrace();
//        }
//    }
//
//    // å‘送数据到下位机
//    public void sendData(byte[] data) throws IOException {
//        output.write(data);
//        output.flush();
//    }
//
//    // æŽ¥æ”¶ä¸‹ä½æœºæ•°æ®ï¼ˆæŒç»­ç›‘听）
//    @Async
//    public void receiveData() {
//        log.info("接收数据循环");
//        byte[] buffer = new byte[1024];
//        if (ObjUtil.isNotNull(socket)){
//            while (!socket.isClosed()) {
//                try {
//                    log.info("开始接收数据");
//                    int len = input.read(buffer);
//                    if (len > 0) {
//                        byte[] received = Arrays.copyOf(buffer, len);
//                        String str = new String(received, "UTF-8");
//                        System.out.println(str);
//                        log.info("接收到数据：",str);
////                    processData(received); // å¤„理数据
//                        List<DaStationCollection> collect = daStationCollectionService.list(new LambdaQueryWrapper<DaStationCollection>()
//                                .eq(DaStationCollection::getStatus, "0"));
//                        if (CollUtil.isNotEmpty(collect)) {
//                            DaStationCollection daStationCollection = collect.get(0);
//                            String sfcCode = daStationCollection.getSfcCode();
//                            TcpClient tcpClient = new TcpClient();
//                            byte[] bytes = sfcCode.getBytes(StandardCharsets.UTF_8);
//                            tcpClient.sendData(bytes);
//                            log.info("发送数据：",sfcCode);
//                            log.info("发送数据-byte：",bytes);
//                            //清除
//                            daStationCollectionService.update(new LambdaUpdateWrapper<DaStationCollection>()
//                                    .eq(DaStationCollection::getSfcCode,sfcCode)
//                                    .set(DaStationCollection::getStatus,"1"));
//                        }
//                    }
//                } catch (IOException e) {
//                    e.printStackTrace();
//                    closeConnection();
//                }
//            }
//        }
//
//    }
//
////    private void processData(byte[] data) {
////        // è§£æžæ•°æ®ï¼ˆå¦‚ Modbus TCP åè®®ï¼‰
////        System.out.println("Received: " + HexUtils.bytesToHex(data));
////    }
//
//    public void closeConnection() {
//        try {
//            input.close();
//            output.close();
//            socket.close();
//        } catch (IOException e) {
//            e.printStackTrace();
//        }
//    }
//}

 billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml

@@ -33,13 +33,14 @@
            <if test="salesOrderCode != null  and salesOrderCode != ''"> and sales_order_code = #{salesOrderCode}</if>
            <if test="productCode != null  and productCode != ''"> and product_code = #{productCode}</if>
            <if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
            and del_flag = "0"
            and del_flag = '0'
        </where>
        order by update_time desc
    </select>
    
    <select id="selectOmProductionOrderInfoById" parameterType="Long" resultMap="OmProductionOrderInfoResult">
        <include refid="selectOmProductionOrderInfoVo"/>
        where id = #{id} and del_flag = "0"
        where id = #{id} and del_flag = '0'
    </select>

    <insert id="insertOmProductionOrderInfo" parameterType="OmProductionOrderInfo" useGeneratedKeys="true" keyProperty="id">
@@ -100,11 +101,11 @@
    </update>

    <update id="deleteOmProductionOrderInfoById" parameterType="Long">
        update om_production_order_info set del_flag = "1" where id = #{id}
        update om_production_order_info set del_flag = '1' where id = #{id}
    </update>

    <update id="deleteOmProductionOrderInfoByIds" parameterType="String">
        update om_production_order_info set del_flag = "1" where id in
        update om_production_order_info set del_flag = '1' where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>

 billion-quartz/pom.xml

@@ -34,6 +34,10 @@
            <groupId>com.billion</groupId>
            <artifactId>billion-common</artifactId>
        </dependency>
        <dependency>
            <groupId>com.billion</groupId>
            <artifactId>billion-main</artifactId>
        </dependency>

    </dependencies>


 billion-quartz/src/main/java/com/billion/quartz/task/RyTask.java

@@ -1,7 +1,10 @@
package com.billion.quartz.task;


import org.springframework.stereotype.Component;
import com.billion.common.utils.StringUtils;

import javax.annotation.Resource;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦æµ‹è¯•
@@ -11,6 +14,10 @@
@Component("ryTask")
public class RyTask
{

//    @Resource
//    private TcpClient tcpClient;

    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
    {
        System.out.println(StringUtils.format("执行多参方法： å­—符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -24,5 +31,6 @@
    public void ryNoParams()
    {
        System.out.println("执行无参方法");
//        tcpClient.receiveData();
    }
}

 billion-quartz/src/main/java/com/billion/quartz/util/AbstractQuartzJob.java

@@ -93,7 +93,7 @@
        }

        // å†™å…¥æ•°æ®åº“当中
        SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
//        SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
    }

    /**

 billion-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

@@ -87,7 +87,7 @@
             <if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
             <if test="status != null and status != ''">#{status},</if>
             <if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
             sysdate()
        GETDATE()
         )
    </insert>


 billion-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml

@@ -75,7 +75,7 @@
             <if test="status !=null">status = #{status},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
             update_time = GETDATE()
         </set>
         where job_id = #{jobId}
    </update>
@@ -104,7 +104,7 @@
             <if test="status != null and status != ''">#{status},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             sysdate()
            GETDATE()
         )
    </insert>


 billion-system/src/main/java/com/billion/system/mapper/SysNoticeMapper.java

@@ -1,6 +1,8 @@
package com.billion.system.mapper;

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.billion.system.domain.SysNotice;

/**
@@ -8,7 +10,7 @@
 * 
 * @author ruoyi
 */
public interface SysNoticeMapper
public interface SysNoticeMapper extends BaseMapper<SysNotice>
{
    /**
     * æŸ¥è¯¢å…¬å‘Šä¿¡æ¯

 billion-system/src/main/java/com/billion/system/service/impl/SysNoticeServiceImpl.java

@@ -1,6 +1,9 @@
package com.billion.system.service.impl;

import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.billion.system.domain.SysNotice;
@@ -13,7 +16,7 @@
 * @author ruoyi
 */
@Service
public class SysNoticeServiceImpl implements ISysNoticeService
public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper,SysNotice> implements ISysNoticeService
{
    @Autowired
    private SysNoticeMapper noticeMapper;

 billion-ui/src/api/main/da/stationCollection.js

@@ -8,7 +8,14 @@
    params: query
  })
}

export function printList(query) {
  return request({
    url: '/da/stationCollection/printList',
    method: 'get',
    params: query
  })
}
printList
// æŸ¥è¯¢è¿‡ç«™é‡‡é›†è¯¦ç»†
export function getStationCollection(id) {
  return request({
@@ -42,3 +49,35 @@
    method: 'delete'
  })
}

export function crave(param) {
  return request({
    url: '/da/stationCollection/crave',
    method: 'get',
    params: param
  })
}

export function reCrave(param) {
  return request({
    url: '/da/stationCollection/reCrave',
    method: 'get',
    params: param
  })
}

export function getWelcomeWord(dictType) {
  return request({
    url: '/system/dict/data/type/'+dictType,
    method: 'get',
  })
}


export function addPassStationCollection(param) {
  return request({
    url: '/da/stationCollection/addPassStationCollection',
    method: 'get',
    params: param
  })
}

 billion-ui/src/api/main/om/info.js

@@ -9,6 +9,13 @@
  })
}

export function getTodayList() {
  return request({
    url: '/main/info/getTodayList',
    method: 'get',
  })
}

export function getOrderList() {
  return request({
    url: '/main/info/getOrderList',

 billion-ui/src/assets/logo/logo.png

 billion-ui/src/assets/logo/logo2.png

 billion-ui/src/router/index.js

@@ -62,9 +62,9 @@
    hidden: true
  },
  {
    path: '/',
    path: '',
    component: Layout,
    redirect: '/index',
    redirect: 'index',
    children: [
      {
        path: 'index',
@@ -89,24 +89,24 @@
    ]
  },
  // æ ·æœºæ ‡ç­¾æ‰“印路由
  {
    path: '/main/bq',
    component: Layout,
    children: [
      {
        path: 'prototypeLabelPrinting',
        component: () => import('@/views/main/bq/prototypeLabelPrinting'),
        name: 'PrototypeLabelPrinting',
        meta: { title: '样机标签打印', icon: 'printer' }
      }
    ]
  },
  // {
  //   path: '/main/bq',
  //   component: Layout,
  //   children: [
  //     {
  //       path: 'prototypeLabelPrinting',
  //       component: () => import('@/views/main/bq/prototypeLabelPrinting'),
  //       name: 'PrototypeLabelPrinting',
  //       meta: { title: '样机标签打印', icon: 'printer' }
  //     }
  //   ]
  // },
  // åŒ¹é…æ‰€æœ‰è·¯å¾„
  {
    path: '*',
    redirect: '/404',
    hidden: true
  }
  // {
  //   path: '*',
  //   redirect: '/404',
  //   hidden: true
  // }
]

// åŠ¨æ€è·¯ç”±ï¼ŒåŸºäºŽç”¨æˆ·æƒé™åŠ¨æ€åŽ»åŠ è½½

 billion-ui/src/views/index.vue

@@ -1,1097 +1,236 @@
<template>
  <div class="app-container home">
    <el-row :gutter="20">
      <el-col :sm="24" :lg="24">
        <blockquote class="text-warning" style="font-size: 14px">
          é¢†å–阿里云通用云产品1888优惠券
          <br />
          <el-link
            href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
            type="primary"
            target="_blank"
            >https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
          >
          <br />
          é¢†å–腾讯云通用云产品2860优惠券
          <br />
          <el-link
            href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
            type="primary"
            target="_blank"
            >https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
          >
          <br />
          é˜¿é‡Œäº‘服务器折扣区
          <el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
            >>☛☛点我进入☚☚</el-link
          >
          &nbsp;&nbsp;&nbsp; è…¾è®¯äº‘服务器秒杀区
          <el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
            >>☛☛点我进入☚☚</el-link
          ><br />
          <h4 class="text-danger">
            äº‘产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
          </h4>
        </blockquote>
  <div class="container">
    <!-- æ ‡é¢˜ -->
    <h1 class="title">生产数据看板</h1>

        <hr />
      </el-col>
    </el-row>
    <el-row :gutter="20">
      <el-col :sm="24" :lg="12" style="padding-left: 20px">
        <h2>若依后台管理框架</h2>
        <p>
          ä¸€ç›´æƒ³åšä¸€æ¬¾åŽå°ç®¡ç†ç³»ç»Ÿï¼Œçœ‹äº†å¾ˆå¤šä¼˜ç§€çš„开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
        </p>
        <p>
          <b>当前版本:</b> <span>v{{ version }}</span>
        </p>
        <p>
          <el-tag type="danger">&yen;免费开源</el-tag>
        </p>
        <p>
          <el-button
            type="primary"
            size="mini"
            icon="el-icon-cloudy"
            plain
            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
            >访问码云</el-button
          >
          <el-button
            size="mini"
            icon="el-icon-s-home"
            plain
            @click="goTarget('http://ruoyi.vip')"
            >访问主页</el-button
          >
        </p>
      </el-col>
    <!-- è‡ªåŠ¨æ¨ªå‘滚动提示 -->
    <div class="scroll-tip">
      <div ref="tipContent" class="tip-content">{{ scrollTipText }}</div>
    </div>
    <!-- è¡¨æ ¼åŒºåŸŸ -->
    <div class="table-container">
      <table>
        <thead>
        <tr>
          <th class="col-machine">机型</th>
          <th class="col-plan">计划数量</th>
          <th class="col-completed">上线数量</th>
          <th class="col-completed">下线数量</th>
          <th class="col-completed">在制数量</th>
        </tr>
        </thead>
        <tbody>
        <tr v-for="item in tableData" :key="item.id">
          <td>{{ item.productCode }}</td>
          <td>{{ item.planQty }}</td>
          <td>{{ item.planQty }}</td>
          <td>{{ item.planQty }}</td>
          <td>{{ item.planQty }}</td>
        </tr>
        </tbody>
      </table>
    </div>

      <el-col :sm="24" :lg="12" style="padding-left: 50px">
        <el-row>
          <el-col :span="12">
            <h2>技术选型</h2>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="6">
            <h4>后端技术</h4>
            <ul>
              <li>SpringBoot</li>
              <li>Spring Security</li>
              <li>JWT</li>
              <li>MyBatis</li>
              <li>Druid</li>
              <li>Fastjson</li>
              <li>...</li>
            </ul>
          </el-col>
          <el-col :span="6">
            <h4>前端技术</h4>
            <ul>
              <li>Vue</li>
              <li>Vuex</li>
              <li>Element-ui</li>
              <li>Axios</li>
              <li>Sass</li>
              <li>Quill</li>
              <li>...</li>
            </ul>
          </el-col>
        </el-row>
      </el-col>
    </el-row>
    <el-divider />
    <el-row :gutter="20">
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>联系信息</span>
          </div>
          <div class="body">
            <p>
              <i class="el-icon-s-promotion"></i> å®˜ç½‘：<el-link
                href="http://www.ruoyi.vip"
                target="_blank"
                >http://www.ruoyi.vip</el-link
              >
            </p>
            <p>
              <i class="el-icon-user-solid"></i> QQ群：<s> æ»¡937441 </s> <s> æ»¡887144332 </s>
              <s> æ»¡180251782 </s> <s> æ»¡104180207 </s> <s> æ»¡186866453 </s> <s> æ»¡201396349 </s>
              <s> æ»¡101456076 </s> <s> æ»¡101539465 </s> <s> æ»¡264312783 </s> <s> æ»¡167385320 </s> 
              <s> æ»¡104748341 </s> <s> æ»¡160110482 </s> <s> æ»¡170801498 </s> <s> æ»¡108482800 </s> 
              <s> æ»¡101046199 </s> <s> æ»¡136919097 </s> <s> æ»¡143961921 </s> <s> æ»¡174951577 </s> 
              <s> æ»¡161281055 </s> <s> æ»¡138988063 </s> <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=SUc-msaypcqB2UTFif4eqGlBHkKcvMNP&authKey=JdQBouY2PG%2BS%2BCzAfIgbCGNgxyahpfh24IW%2F03rPxGilhqVbisLma%2FFFnt79DHNh&noverify=0&group_code=151450850" target="_blank">151450850</a>
            </p>
            <p>
              <i class="el-icon-chat-dot-round"></i> å¾®ä¿¡ï¼š<a
                href="javascript:;"
                >/ *若依</a
              >
            </p>
            <p>
              <i class="el-icon-money"></i> æ”¯ä»˜å®ï¼š<a
                href="javascript:;"
                class="支付宝信息"
                >/ *若依</a
              >
            </p>
          </div>
        </el-card>
      </el-col>
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>更新日志</span>
          </div>
          <el-collapse accordion>
            <el-collapse-item title="v3.8.8 - 2024-06-30">
              <ol>
                <li>菜单管理新增路由名称</li>
                <li>新增数据脱敏过滤注解</li>
                <li>用户密码新增非法字符验证</li>
                <li>限制用户操作数据权限范围</li>
                <li>代码生成新增创建表结构功能</li>
                <li>定时任务白名单配置范围缩小</li>
                <li>优化代码生成主子表关联查询方式</li>
                <li>Excel注解新增属性comboReadDict</li>
                <li>Excel注解ColumnType类型新增文本</li>
                <li>新增国际化资源文件配置</li>
                <li>升级oshi到最新版本6.6.1</li>
                <li>升级druid到最新版本1.2.23</li>
                <li>升级core-js到最新版本3.37.1</li>
                <li>更新HttpUtils中的User-Agent</li>
                <li>更新compressionPlugin到6.1.2以兼容node18+</li>
                <li>升级spring-security到安全版本，防止漏洞风险</li>
                <li>升级spring-framework到安全版本，防止漏洞风险</li>
                <li>优化自定义XSS注解匹配方式</li>
                <li>优化缓存监控键名列表排序显示</li>
                <li>优化定时任务日志默认按时间排序</li>
                <li>优化默认文件大小超过2G无效的问题</li>
                <li>优化查表特殊字符使用反斜杠进行转义</li>
                <li>优化定时任务cron表达式小时配置显示错误问题</li>
                <li>优化多个自定数据权限使用in查询,避免多次拼接</li>
                <li>优化导入Excel时设置dictType属性重复查缓存问题</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.7 - 2023-12-08">
              <ol>
                <li>操作日志记录部门名称</li>
                <li>全局数据存储用户编号</li>
                <li>新增编程式判断资源访问权限</li>
                <li>操作日志列表新增IP地址查询</li>
                <li>定时任务新增页去除状态选项</li>
                <li>代码生成支持选择前端模板类型</li>
                <li>显隐列组件支持复选框弹出类型</li>
                <li>通用排序属性orderBy参数限制长度</li>
                <li>Excel自定义数据处理器增加单元格/工作簿对象</li>
                <li>升级oshi到最新版本6.4.8</li>
                <li>升级druid到最新版本1.2.20</li>
                <li>升级fastjson到最新版2.0.43</li>
                <li>升级pagehelper到最新版1.4.7</li>
                <li>升级commons.io到最新版本2.13.0</li>
                <li>升级element-ui到最新版本2.15.14</li>
                <li>修复五级路由缓存无效问题</li>
                <li>修复外链带端口出现的异常</li>
                <li>修复树模板父级编码变量错误</li>
                <li>修复字典表详情页面搜索问题</li>
                <li>修复内链iframe没有传递参数问题</li>
                <li>修复自定义字典样式不生效的问题</li>
                <li>修复字典缓存删除方法参数错误问题</li>
                <li>修复Excel导入数据临时文件无法删除问题</li>
                <li>修复未登录带参数访问成功后参数丢失问题</li>
                <li>修复HeaderSearch组件跳转query参数丢失问题</li>
                <li>修复代码生成导入后必填项与数据库不匹配问题</li>
                <li>修复Excels导入时无法获取到dictType字典值问题</li>
                <li>优化下载zip方法新增遮罩层</li>
                <li>优化头像上传参数新增文件名称</li>
                <li>优化字典标签支持自定义分隔符</li>
                <li>优化菜单管理类型为按钮状态可选</li>
                <li>优化前端防重复提交数据大小限制</li>
                <li>优化TopNav菜单没有图标svg不显示</li>
                <li>优化数字金额大写转换精度丢失问题</li>
                <li>优化富文本Editor组件检验图片格式</li>
                <li>优化页签在Firefox浏览器被遮挡的问题</li>
                <li>优化个人中心/基本资料修改时数据显示问题</li>
                <li>优化缓存监控图表支持跟随屏幕大小自适应调整</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.6 - 2023-06-30">
              <ol>
                <li>支持登录IP黑名单限制</li>
                <li>新增监控页面图标显示</li>
                <li>操作日志新增消耗时间属性</li>
                <li>屏蔽定时任务bean违规的字符</li>
                <li>日志管理使用索引提升查询性能</li>
                <li>日志注解支持排除指定的请求参数</li>
                <li>支持自定义隐藏属性列过滤子对象</li>
                <li>升级oshi到最新版本6.4.3</li>
                <li>升级druid到最新版本1.2.16</li>
                <li>升级fastjson到最新版2.0.34</li>
                <li>升级spring-boot到最新版本2.5.15</li>
                <li>升级element-ui到最新版本2.15.13</li>
                <li>移除apache/commons-fileupload依赖</li>
                <li>修复页面切换时布局错乱的问题</li>
                <li>修复匿名注解Anonymous空指针问题</li>
                <li>修复路由跳转被阻止时内部产生报错信息问题</li>
                <li>修复isMatchedIp的参数判断产生空指针的问题</li>
                <li>修复用户多角色数据权限可能出现权限抬升的情况</li>
                <li>修复开启TopNav后一级菜单路由参数设置无效问题</li>
                <li>修复DictTag组件value没有匹配的值时则展示value</li>
                <li>优化文件下载出现的异常</li>
                <li>优化选择图标组件高亮回显</li>
                <li>优化弹窗后导航栏偏移的问题</li>
                <li>优化修改密码日志存储明文问题</li>
                <li>优化页签栏关闭其他出现的异常问题</li>
                <li>优化页签关闭左侧选项排除首页选项</li>
                <li>优化关闭当前tab页跳转最右侧tab页</li>
                <li>优化缓存列表清除操作提示不变的问题</li>
                <li>优化字符未使用下划线不进行驼峰式处理</li>
                <li>优化用户导入更新时需获取用户编号问题</li>
                <li>优化侧边栏的平台标题与VUE_APP_TITLE保持同步</li>
                <li>优化导出Excel时设置dictType属性重复查缓存问题</li>
                <li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.5 - 2023-01-01">
              <ol>
                <li>定时任务违规的字符</li>
                <li>重置时取消部门选中</li>
                <li>新增返回警告消息提示</li>
                <li>忽略不必要的属性数据返回</li>
                <li>修改参数键名时移除前缓存配置</li>
                <li>导入更新用户数据前校验数据权限</li>
                <li>兼容Excel下拉框内容过多无法显示的问题</li>
                <li>升级echarts到最新版本5.4.0</li>
                <li>升级core-js到最新版本3.25.3</li>
                <li>升级oshi到最新版本6.4.0</li>
                <li>升级kaptcha到最新版2.3.3</li>
                <li>升级druid到最新版本1.2.15</li>
                <li>升级fastjson到最新版2.0.20</li>
                <li>升级pagehelper到最新版1.4.6</li>
                <li>优化弹窗内容过多展示不全问题</li>
                <li>优化swagger-ui静态资源使用缓存</li>
                <li>开启TopNav没有子菜单隐藏侧边栏</li>
                <li>删除fuse无效选项maxPatternLength</li>
                <li>优化导出对象的子列表为空会出现[]问题</li>
                <li>优化编辑头像时透明部分会变成黑色问题</li>
                <li>优化小屏幕上修改头像界面布局错位的问题</li>
                <li>修复代码生成勾选属性无效问题</li>
                <li>修复文件上传组件格式验证问题</li>
                <li>修复回显数据字典数组异常问题</li>
                <li>修复sheet超出最大行数异常问题</li>
                <li>修复Log注解GET请求记录不到参数问题</li>
                <li>修复调度日志点击多次数据不变化的问题</li>
                <li>修复主题颜色在Drawer组件不会加载问题</li>
                <li>修复文件名包含特殊字符的文件无法下载问题</li>
                <li>修复table中更多按钮切换主题色未生效修复问题</li>
                <li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
                <li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
                <li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.4 - 2022-09-26">
              <ol>
                <li>数据逻辑删除不进行唯一验证</li>
                <li>Excel注解支持导出对象的子列表方法</li>
                <li>Excel注解支持自定义隐藏属性列</li>
                <li>Excel注解支持backgroundColor属性设置背景色</li>
                <li>支持配置密码最大错误次数/锁定时间</li>
                <li>登录日志新增解锁账户功能</li>
                <li>通用下载方法新增config配置选项</li>
                <li>支持多权限字符匹配角色数据权限</li>
                <li>页面内嵌iframe切换tab不刷新数据</li>
                <li>操作日志记录支持排除敏感属性字段</li>
                <li>修复多文件上传报错出现的异常问题</li>
                <li>修复图片预览组件src属性为null值控制台报错问题</li>
                <li>升级oshi到最新版本6.2.2</li>
                <li>升级fastjson到最新版2.0.14</li>
                <li>升级pagehelper到最新版1.4.3</li>
                <li>升级core-js到最新版本3.25.2</li>
                <li>升级element-ui到最新版本2.15.10</li>
                <li>优化任务过期不执行调度</li>
                <li>优化字典数据使用store存取</li>
                <li>优化修改资料头像被覆盖的问题</li>
                <li>优化修改用户登录账号重复验证</li>
                <li>优化代码生成同步后值NULL问题</li>
                <li>优化定时任务支持执行父类方法</li>
                <li>优化用户个人信息接口防止修改部门</li>
                <li>优化布局设置使用el-drawer抽屉显示</li>
                <li>优化没有权限的用户编辑部门缺少数据</li>
                <li>优化日志注解记录限制请求地址的长度</li>
                <li>优化excel/scale属性导出单元格数值类型</li>
                <li>优化日志操作中重置按钮时重复查询的问题</li>
                <li>优化多个相同角色数据导致权限SQL重复问题</li>
                <li>优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.3 - 2022-06-27">
              <ol>
                <li>新增缓存列表菜单功能</li>
                <li>代码生成树表新增(展开/折叠)</li>
                <li>Excel注解支持color字体颜色</li>
                <li>新增Anonymous匿名访问不鉴权注解</li>
                <li>用户头像上传限制只能为图片格式</li>
                <li>接口使用泛型使其看到响应属性字段</li>
                <li>检查定时任务bean所在包名是否为白名单配置</li>
                <li>添加页签openPage支持传递参数</li>
                <li>用户缓存信息添加部门ancestors祖级列表</li>
                <li>升级element-ui到最新版本2.15.8</li>
                <li>升级oshi到最新版本6.1.6</li>
                <li>升级druid到最新版本1.2.11</li>
                <li>升级fastjson到最新版2.0.8</li>
                <li>升级spring-boot到最新版本2.5.14</li>
                <li>降级jsencrypt版本兼容IE浏览器</li>
                <li>删除多余的salt字段</li>
                <li>新增获取不带后缀文件名称方法</li>
                <li>新增获取配置文件中的属性值方法</li>
                <li>新增内容编码/解码方便插件集成使用</li>
                <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
                <li>优化设置分页参数默认值</li>
                <li>优化对空字符串参数处理的过滤</li>
                <li>优化显示顺序orderNum类型为整型</li>
                <li>优化表单构建按钮不显示正则校验</li>
                <li>优化字典数据回显样式下拉框显示值</li>
                <li>优化R响应成功状态码与全局保持一致</li>
                <li>优化druid开启wall过滤器出现的异常问题</li>
                <li>优化用户管理左侧树型组件增加选中高亮保持</li>
                <li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
                <li>优化默认不启用压缩文件缓存防止node_modules过大</li>
                <li>修复字典数据显示不全问题</li>
                <li>修复操作日志查询类型条件为0时会查到所有数据</li>
                <li>修复Excel注解prompt/combo同时使用不生效问题</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.2 - 2022-04-01">
              <ol>
                <li>前端支持设置是否需要防止数据重复提交</li>
                <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
                <li>侧边栏菜单名称过长悬停显示标题</li>
                <li>用户访问控制时校验数据权限，防止越权</li>
                <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
                <li>组件ImagePreview支持多图预览显示</li>
                <li>组件ImageUpload支持多图同时选择上传</li>
                <li>组件FileUpload支持多文件同时选择上传</li>
                <li>服务监控新增运行参数信息显示</li>
                <li>定时任务目标字符串过滤特殊字符</li>
                <li>定时任务目标字符串验证包名白名单</li>
                <li>代码生成列表图片支持预览</li>
                <li>代码生成编辑修改打开新页签</li>
                <li>代码生成新增Java类型Boolean</li>
                <li>代码生成子表支持日期/字典配置</li>
                <li>代码生成同步保留必填/类型选项</li>
                <li>升级oshi到最新版本6.1.2</li>
                <li>升级fastjson到最新版1.2.80</li>
                <li>升级pagehelper到最新版1.4.1</li>
                <li>升级spring-boot到最新版本2.5.11</li>
                <li>升级spring-boot-mybatis到最新版2.2.2</li>
                <li>添加遗漏的分页参数合理化属性</li>
                <li>修改npm即将过期的注册源地址</li>
                <li>修复分页组件请求两次问题</li>
                <li>修复通用文件下载接口跨域问题</li>
                <li>修复Xss注解字段值为空时的异常问题</li>
                <li>修复选项卡点击右键刷新丢失参数问题</li>
                <li>修复表单清除元素位置未垂直居中问题</li>
                <li>修复服务监控中运行参数显示条件错误</li>
                <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
                <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
                <li>优化加载字典缓存数据</li>
                <li>优化IP地址获取到多个的问题</li>
                <li>优化任务队列满时任务拒绝策略</li>
                <li>优化文件上传兼容Weblogic环境</li>
                <li>优化定时任务默认保存到内存中执行</li>
                <li>优化部门修改缩放后出现的错位问题</li>
                <li>优化Excel格式化不同类型的日期对象</li>
                <li>优化菜单表关键字导致的插件报错问题</li>
                <li>优化Oracle用户头像列为空时不显示问题</li>
                <li>优化页面若未匹配到字典标签则返回原字典值</li>
                <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.1 - 2022-01-01">
              <ol>
                <li>新增Vue3前端代码生成模板</li>
                <li>新增图片预览组件</li>
                <li>新增压缩插件实现打包Gzip</li>
                <li>自定义xss校验注解实现</li>
                <li>自定义文字复制剪贴指令</li>
                <li>代码生成预览支持复制内容</li>
                <li>路由支持单独配置菜单或角色权限</li>
                <li>用户管理部门查询选择节点后分页参数初始</li>
                <li>修复用户分配角色属性错误</li>
                <li>修复打包后字体图标偶现的乱码问题</li>
                <li>修复菜单管理重置表单出现的错误</li>
                <li>修复版本差异导致的懒加载报错问题</li>
                <li>修复Cron组件中周回显问题</li>
                <li>修复定时任务多参数逗号分隔的问题</li>
                <li>修复根据ID查询列表可能出现的主键溢出问题</li>
                <li>修复tomcat配置参数已过期问题</li>
                <li>升级clipboard到最新版本2.0.8</li>
                <li>升级oshi到最新版本v5.8.6</li>
                <li>升级fastjson到最新版1.2.79</li>
                <li>升级spring-boot到最新版本2.5.8</li>
                <li>升级log4j2到2.17.1，防止漏洞风险</li>
                <li>优化下载解析blob异常提示</li>
                <li>优化代码生成字典组重复问题</li>
                <li>优化查询用户的角色组&岗位组代码</li>
                <li>优化定时任务cron表达式小时设置24</li>
                <li>优化用户导入提示溢出则显示滚动条</li>
                <li>优化防重复提交标识组合为(key+url+header)</li>
                <li>优化分页方法设置成通用方便灵活调用</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.0 - 2021-12-01">
              <ol>
                <li>新增配套并同步的Vue3前端版本</li>
                <li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
                <li>优化导出数据/使用通用下载方法</li>
                <li>Excel注解支持自定义数据处理器</li>
                <li>Excel注解支持导入导出标题信息</li>
                <li>Excel导入支持@Excels注解</li>
                <li>新增组件data-dict，简化数据字典使用</li>
                <li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
                <li>生产环境使用路由懒加载提升页面响应速度</li>
                <li>修复五级以上菜单出现的404问题</li>
                <li>防重提交注解支持配置间隔时间/提示消息</li>
                <li>日志注解新增是否保存响应参数</li>
                <li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
                <li>升级SpringBoot到最新版本2.5.6</li>
                <li>升级pagehelper到最新版1.4.0</li>
                <li>升级spring-boot-mybatis到最新版2.2.0</li>
                <li>升级oshi到最新版本v5.8.2</li>
                <li>升级druid到最新版1.2.8</li>
                <li>升级velocity到最新版本2.3</li>
                <li>升级fastjson到最新版1.2.78</li>
                <li>升级axios到最新版本0.24.0</li>
                <li>升级dart-sass到版本1.32.13</li>
                <li>升级core-js到最新版本3.19.1</li>
                <li>升级jsencrypt到最新版本3.2.1</li>
                <li>升级js-cookie到最新版本3.0.1</li>
                <li>升级file-saver到最新版本2.0.5</li>
                <li>升级sass-loader到最新版本10.1.1</li>
                <li>升级element-ui到最新版本2.15.6</li>
                <li>新增sendGet无参请求方法</li>
                <li>禁用el-tag组件的渐变动画</li>
                <li>代码生成点击预览重置激活tab</li>
                <li>AjaxResult重写put方法，以方便链式调用</li>
                <li>优化登录/验证码请求headers不设置token</li>
                <li>优化用户个人信息接口防止修改用户名</li>
                <li>优化Cron表达式生成器关闭时销毁避免缓存</li>
                <li>优化注册成功提示消息类型success</li>
                <li>优化aop语法，使用spring自动注入注解</li>
                <li>优化记录登录信息，移除不必要的修改</li>
                <li>优化mybatis全局默认的执行器</li>
                <li>优化Excel导入图片可能出现的异常</li>
                <li>修复代码生成模板主子表删除缺少事务</li>
                <li>修复日志记录可能出现的转换异常</li>
                <li>修复代码生成复选框字典遗漏问题</li>
                <li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
                <li>修复字符串无法被反转义问题</li>
                <li>修复后端主子表代码模板方法名生成错误问题</li>
                <li>修复xss过滤后格式出现的异常</li>
                <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.7.0 - 2021-09-13">
              <ol>
                <li>参数管理支持配置验证码开关</li>
                <li>新增是否开启用户注册功能</li>
                <li>定时任务支持在线生成cron表达式</li>
                <li>菜单管理支持配置路由参数</li>
                <li>支持自定义注解实现接口限流</li>
                <li>Excel注解支持Image图片导入</li>
                <li>自定义弹层溢出滚动样式</li>
                <li>自定义可拖动弹窗宽度指令</li>
                <li>自定义可拖动弹窗高度指令</li>
                <li>修复任意账户越权问题</li>
                <li>修改时检查用户数据权限范围</li>
                <li>修复保存配置主题颜色失效问题</li>
                <li>新增暗色菜单风格主题</li>
                <li>菜单&部门新增展开/折叠功能</li>
                <li>页签新增关闭左侧&添加图标</li>
                <li>顶部菜单排除隐藏的默认路由</li>
                <li>顶部菜单同步系统主题样式</li>
                <li>跳转路由高亮相对应的菜单栏</li>
                <li>代码生成主子表多选行数据</li>
                <li>日期范围支持添加多组</li>
                <li>升级element-ui到最新版本2.15.5</li>
                <li>升级oshi到最新版本v5.8.0</li>
                <li>升级commons.io到最新版本v2.11.0</li>
                <li>定时任务屏蔽ldap远程调用</li>
                <li>定时任务屏蔽http(s)远程调用</li>
                <li>补充定时任务表字段注释</li>
                <li>定时任务对检查异常进行事务回滚</li>
                <li>启用父部门状态排除顶级节点</li>
                <li>富文本新增上传文件大小限制</li>
                <li>默认首页使用keep-alive缓存</li>
                <li>修改代码生成字典回显样式</li>
                <li>自定义分页合理化传入参数</li>
                <li>修复字典组件值为整形不显示问题</li>
                <li>修复定时任务日志执行状态显示</li>
                <li>角色&菜单新增字段属性提示信息</li>
                <li>修复角色分配用户页面参数类型错误提醒</li>
                <li>优化布局设置动画特效</li>
                <li>优化异常处理信息</li>
                <li>优化错误token导致的解析异常</li>
                <li>密码框新增显示切换密码图标</li>
                <li>定时任务新增更多操作</li>
                <li>更多操作按钮添加权限控制</li>
                <li>导入用户样式优化</li>
                <li>提取通用方法到基类控制器</li>
                <li>优化使用权限工具获取用户信息</li>
                <li>优化用户不能删除自己</li>
                <li>优化XSS跨站脚本过滤</li>
                <li>优化代码生成模板</li>
                <li>验证码默认20s超时</li>
                <li>BLOB下载时清除URL对象引用</li>
                <li>代码生成导入表按创建时间排序</li>
                <li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
                <li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
                <li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.6.0 - 2021-07-12">
              <ol>
                <li>角色管理新增分配用户功能</li>
                <li>用户管理新增分配角色功能</li>
                <li>日志列表支持排序操作</li>
                <li>优化参数&字典缓存操作</li>
                <li>系统布局配置支持动态标题开关</li>
                <li>菜单路由配置支持内链访问</li>
                <li>默认访问后端首页新增提示语</li>
                <li>富文本默认上传返回url类型</li>
                <li>新增自定义弹窗拖拽指令</li>
                <li>全局注册常用通用组件</li>
                <li>全局挂载字典标签组件</li>
                <li>ImageUpload组件支持多图片上传</li>
                <li>FileUpload组件支持多文件上传</li>
                <li>文件上传组件添加数量限制属性</li>
                <li>富文本编辑组件添加类型属性</li>
                <li>富文本组件工具栏配置视频</li>
                <li>封装通用iframe组件</li>
                <li>限制超级管理员不允许操作</li>
                <li>用户信息长度校验限制</li>
                <li>分页组件新增pagerCount属性</li>
                <li>添加bat脚本执行应用</li>
                <li>升级oshi到最新版本v5.7.4</li>
                <li>升级element-ui到最新版本2.15.2</li>
                <li>升级pagehelper到最新版1.3.1</li>
                <li>升级commons.io到最新版本v2.10.0</li>
                <li>升级commons.fileupload到最新版本v1.4</li>
                <li>升级swagger到最新版本v3.0.0</li>
                <li>修复关闭confirm提示框控制台报错问题</li>
                <li>修复存在的SQL注入漏洞问题</li>
                <li>定时任务屏蔽rmi远程调用</li>
                <li>修复用户搜索分页变量错误</li>
                <li>修复导出角色数据范围翻译缺少仅本人</li>
                <li>修复表单构建选择下拉选择控制台报错问题</li>
                <li>优化图片工具类读取文件</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.5.0 - 2021-05-25">
              <ol>
                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
                <li>布局设置支持保存&重置配置</li>
                <li>修复树表数据显示不全&加载慢问题</li>
                <li>新增IE浏览器版本过低提示页面</li>
                <li>用户登录后记录最后登录IP&时间</li>
                <li>页面导出按钮点击之后添加遮罩</li>
                <li>富文本编辑器支持自定义上传地址</li>
                <li>富文本编辑组件新增readOnly属性</li>
                <li>页签TagsView新增关闭右侧功能</li>
                <li>显隐列组件加载初始默认隐藏列</li>
                <li>关闭头像上传窗口还原默认图片</li>
                <li>个人信息添加手机&邮箱重复验证</li>
                <li>代码生成模板导出按钮点击后添加遮罩</li>
                <li>代码生成模板树表操作列添加新增按钮</li>
                <li>代码生成模板修复主子表字段重名问题</li>
                <li>升级fastjson到最新版1.2.76</li>
                <li>升级druid到最新版本v1.2.6</li>
                <li>升级mybatis到最新版3.5.6 é˜»æ­¢è¿œç¨‹ä»£ç æ‰§è¡Œæ¼æ´ž</li>
                <li>升级oshi到最新版本v5.6.0</li>
                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
                <li>数据监控页默认账户密码防止越权访问</li>
                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
                <li>修正后端导入表权限标识</li>
                <li>修正前端操作日志&登录日志权限标识</li>
                <li>设置Redis配置HashKey序列化</li>
                <li>删除操作日志记录信息</li>
                <li>上传媒体类型添加视频格式</li>
                <li>修复请求形参未传值记录日志异常问题</li>
                <li>优化xss校验json请求条件</li>
                <li>树级结构更新子节点使用replaceFirst</li>
                <li>优化ExcelUtil空值处理</li>
                <li>日志记录过滤BindingResult对象，防止异常</li>
                <li>修改主题后mini类型按钮无效问题</li>
                <li>优化通用下载完成后删除节点</li>
                <li>通用Controller添加响应返回消息</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.4.0 - 2021-02-22">
              <ol>
                <li>代码生成模板支持主子表</li>
                <li>表格右侧工具栏组件支持显隐列</li>
                <li>图片组件添加预览&移除功能</li>
                <li>Excel注解支持Image图片导出</li>
                <li>操作按钮组调整为朴素按钮样式</li>
                <li>代码生成支持文件上传组件</li>
                <li>代码生成日期控件区分范围</li>
                <li>代码生成数据库文本类型生成表单文本域</li>
                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
                <li>升级SpringBoot到最新版本2.2.13 æå‡å¯åŠ¨é€Ÿåº¦</li>
                <li>升级druid到最新版本v1.2.4</li>
                <li>升级fastjson到最新版1.2.75</li>
                <li>升级element-ui到最新版本2.15.0</li>
                <li>修复IE11浏览器报错问题</li>
                <li>优化多级菜单之间切换无法缓存的问题</li>
                <li>修复四级菜单无法显示问题</li>
                <li>修正侧边栏静态路由丢失问题</li>
                <li>修复角色管理-编辑角色-功能权限显示异常</li>
                <li>配置文件新增redis数据库索引属性</li>
                <li>权限工具类增加admin判断</li>
                <li>角色非自定义权限范围清空选择值</li>
                <li>修复导入数据为负浮点数时丢失精度问题</li>
                <li>移除path-to-regexp正则匹配插件</li>
                <li>修复生成树表代码异常</li>
                <li>修改ip字段长度防止ipv6地址长度不够</li>
                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
                <li>登录后push添加catch防止出现检查错误</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.3.0 - 2020-12-14">
              <ol>
                <li>新增缓存监控功能</li>
                <li>支持主题风格配置</li>
                <li>修复多级菜单之间切换无法缓存的问题</li>
                <li>多级菜单自动配置组件</li>
                <li>代码生成预览支持高亮显示</li>
                <li>支持Get请求映射Params参数</li>
                <li>删除用户和角色解绑关联</li>
                <li>去除用户手机邮箱部门必填验证</li>
                <li>Excel支持注解align对齐方式</li>
                <li>Excel支持导入Boolean型数据</li>
                <li>优化头像样式，鼠标移入悬停遮罩</li>
                <li>代码生成预览提供滚动机制</li>
                <li>代码生成删除多余的数字float类型</li>
                <li>修正转换字符串的目标字符集属性</li>
                <li>回显数据字典防止空值报错</li>
                <li>日志记录增加过滤多文件场景</li>
                <li>修改缓存Set方法可能导致嵌套的问题</li>
                <li>移除前端一些多余的依赖</li>
                <li>防止安全扫描YUI出现的风险提示</li>
                <li>修改node-sass为dart-sass</li>
                <li>升级SpringBoot到最新版本2.1.18</li>
                <li>升级poi到最新版本4.1.2</li>
                <li>升级oshi到最新版本v5.3.6</li>
                <li>升级bitwalker到最新版本1.21</li>
                <li>升级axios到最新版本0.21.0</li>
                <li>升级element-ui到最新版本2.14.1</li>
                <li>升级vue到最新版本2.6.12</li>
                <li>升级vuex到最新版本3.6.0</li>
                <li>升级vue-cli到版本4.5.9</li>
                <li>升级vue-router到最新版本3.4.9</li>
                <li>升级vue-cli到最新版本4.4.6</li>
                <li>升级vue-cropper到最新版本0.5.5</li>
                <li>升级clipboard到最新版本2.0.6</li>
                <li>升级core-js到最新版本3.8.1</li>
                <li>升级echarts到最新版本4.9.0</li>
                <li>升级file-saver到最新版本2.0.4</li>
                <li>升级fuse.js到最新版本6.4.3</li>
                <li>升级js-beautify到最新版本1.13.0</li>
                <li>升级js-cookie到最新版本2.2.1</li>
                <li>升级path-to-regexp到最新版本6.2.0</li>
                <li>升级quill到最新版本1.3.7</li>
                <li>升级screenfull到最新版本5.0.2</li>
                <li>升级sortablejs到最新版本1.10.2</li>
                <li>升级vuedraggable到最新版本2.24.3</li>
                <li>升级chalk到最新版本4.1.0</li>
                <li>升级eslint到最新版本7.15.0</li>
                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
                <li>升级lint-staged到最新版本10.5.3</li>
                <li>升级runjs到最新版本4.4.2</li>
                <li>升级sass-loader到最新版本10.1.0</li>
                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
                <li>升级svg-sprite-loader到最新版本5.1.1</li>
                <li>升级vue-template-compiler到最新版本2.6.12</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.2.1 - 2020-11-18">
              <ol>
                <li>阻止任意文件下载漏洞</li>
                <li>代码生成支持上传控件</li>
                <li>新增图片上传组件</li>
                <li>调整默认首页</li>
                <li>升级druid到最新版本v1.2.2</li>
                <li>mapperLocations配置支持分隔符</li>
                <li>权限信息调整</li>
                <li>调整sql默认时间</li>
                <li>解决代码生成没有bit类型的问题</li>
                <li>升级pagehelper到最新版1.3.0</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.2.0 - 2020-10-10">
              <ol>
                <li>升级springboot版本到2.1.17 æå‡å®‰å…¨æ€§</li>
                <li>升级oshi到最新版本v5.2.5</li>
                <li>升级druid到最新版本v1.2.1</li>
                <li>升级jjwt到版本0.9.1</li>
                <li>升级fastjson到最新版1.2.74</li>
                <li>修改sass为node-sass，避免el-icon图标乱码</li>
                <li>代码生成支持同步数据库</li>
                <li>代码生成支持富文本控件</li>
                <li>代码生成页面时不忽略remark属性</li>
                <li>代码生成添加select必填选项</li>
                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
                <li>Excel注解支持自动统计数据总和</li>
                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
                <li>菜单&数据权限新增（展开/折叠 å…¨é€‰/全不选 çˆ¶å­è”动）</li>
                <li>允许用户分配到部门父节点</li>
                <li>菜单新增是否缓存keep-alive</li>
                <li>表格操作列间距调整</li>
                <li>限制系统内置参数不允许删除</li>
                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
                <li>富文本工具栏样式对齐</li>
                <li>导入excel整形值校验优化</li>
                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
                <li>表单构建布局型组件新增按钮</li>
                <li>左侧菜单文字过长显示省略号</li>
                <li>修正根节点为子部门时，树状结构显示问题</li>
                <li>修正调用目标字符串最大长度</li>
                <li>修正菜单提示信息错误</li>
                <li>修正定时任务执行一次权限标识</li>
                <li>修正数据库字符串类型nvarchar</li>
                <li>优化递归子节点</li>
                <li>优化数据权限判断</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>

            <el-collapse-item title="v3.1.0 - 2020-08-13">
              <ol>
                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
                <li>后端支持CORS跨域请求</li>
                <li>代码生成支持选择上级菜单</li>
                <li>代码生成支持自定义路径</li>
                <li>代码生成支持复选框</li>
                <li>Excel导出导入支持dictType字典类型</li>
                <li>Excel支持分割字符串组内容</li>
                <li>验证码类型支持（数组计算、字符验证）</li>
                <li>升级vue-cli版本到4.4.4</li>
                <li>修改 node-sass ä¸º dart-sass</li>
                <li>表单类型为Integer/Long设置整形默认值</li>
                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
                <li>优化防重复提交拦截器</li>
                <li>优化上级菜单不能选择自己</li>
                <li>修复角色的权限分配后，未实时生效问题</li>
                <li>修复在线用户日志记录类型</li>
                <li>修复富文本空格和缩进保存后不生效问题</li>
                <li>修复在线用户判断逻辑</li>
                <li>唯一限制条件只返回单条数据</li>
                <li>添加获取当前的环境配置方法</li>
                <li>超时登录后页面跳转到首页</li>
                <li>全局异常状态汉化拦截处理</li>
                <li>HTML过滤器改为将html转义</li>
                <li>检查字符支持小数点&降级改成异常提醒</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>

            <el-collapse-item title="v3.0.0 - 2020-07-20">
              <ol>
                <li>单应用调整为多模块项目</li>
                <li>升级element-ui版本到2.13.2</li>
                <li>删除babel，提高编译速度。</li>
                <li>新增菜单默认主类目</li>
                <li>编码文件名修改为uuid方式</li>
                <li>定时任务cron表达式验证</li>
                <li>角色权限修改时已有权限未自动勾选异常修复</li>
                <li>防止切换权限用户后登录出现404</li>
                <li>Excel支持sort导出排序</li>
                <li>创建用户不允许选择超级管理员角色</li>
                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
                <li>修复代码生成点击多次表修改数据不变化的问题</li>
                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
                <li>修复布局为small者mini用户表单显示错位问题</li>
                <li>修复热部署导致的强换异常问题</li>
                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
                <li>生成domain å¦‚果是浮点型 ç»Ÿä¸€ç”¨BigDecimal</li>
                <li>定时任务调整label-width，防止部署出现错位</li>
                <li>调整表头固定列默认样式</li>
                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
                <li>代码生成字典Integer/Long使用parseInt</li>
                <li>
                  ä¿®å¤dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
                </li>
                <li>修正岗位导出权限注解</li>
                <li>禁止加密密文返回前端</li>
                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
                <li>修复首页搜索菜单外链无法点击跳转问题</li>
                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
                <li>用户管理部门分支节点不可检查&显示计数</li>
                <li>数据范围过滤属性调整</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>

            <el-collapse-item title="v2.3.0 - 2020-06-01">
              <ol>
                <li>升级fastjson到最新版1.2.70 ä¿®å¤é«˜å±å®‰å…¨æ¼æ´ž</li>
                <li>dev启动默认打开浏览器</li>
                <li>vue-cli使用默认source-map</li>
                <li>slidebar eslint报错优化</li>
                <li>当tags-view滚动关闭右键菜单</li>
                <li>字典管理添加缓存读取</li>
                <li>参数管理支持缓存操作</li>
                <li>支持一级菜单（和主页同级）在main区域显示</li>
                <li>限制外链地址必须以http(s)开头</li>
                <li>tagview & sidebar ä¸»é¢˜é¢œè‰²ä¸Želement ui(全局)同步</li>
                <li>修改数据源类型优先级，先根据方法，再根据类</li>
                <li>支持是否需要设置token属性，自定义返回码消息。</li>
                <li>swagger请求前缀加入配置。</li>
                <li>登录地点设置内容过长则隐藏显示</li>
                <li>修复定时任务执行一次按钮后不提示消息问题</li>
                <li>修改上级部门（选择项排除本身和下级）</li>
                <li>通用http发送方法增加参数 contentType ç¼–码类型</li>
                <li>更换IP地址查询接口</li>
                <li>修复页签变量undefined</li>
                <li>添加校验部门包含未停用的子部门</li>
                <li>修改定时任务详情下次执行时间日期显示错误</li>
                <li>角色管理查询设置默认排序字段</li>
                <li>swagger添加enable参数控制是否启用</li>
                <li>只对json类型请求构建可重复读取inputStream的request</li>
                <li>修改代码生成字典字段int类型没有自动选中问题</li>
                <li>vuex用户名取值修正</li>
                <li>表格树模板去掉多余的)</li>
                <li>代码生成序号修正</li>
                <li>全屏情况下不调整上外边距</li>
                <li>代码生成Date字段添加默认格式</li>
                <li>用户管理角色选择权限控制</li>
                <li>修复路由懒加载报错问题</li>
                <li>模板sql.vm添加菜单状态</li>
                <li>设置用户名称不能修改</li>
                <li>dialog添加append-to-body属性，防止ie遮罩</li>
                <li>菜单区分状态和显示隐藏功能</li>
                <li>升级fastjson到最新版1.2.68 ä¿®å¤å®‰å…¨åŠ å›º</li>
                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
                <li>登录请求params更换为data，防止暴露url</li>
                <li>日志返回时间格式处理</li>
                <li>添加handle控制允许拖动的元素</li>
                <li>布局设置点击扩大范围</li>
                <li>代码生成列属性排序查询</li>
                <li>代码生成列支持拖动排序</li>
                <li>修复时间格式不支持ios问题</li>
                <li>表单构建添加父级class，防止冲突</li>
                <li>定时任务并发属性修正</li>
                <li>角色禁用&菜单隐藏不查询权限</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>

            <el-collapse-item title="v2.2.0 - 2020-03-18">
              <ol>
                <li>系统监控新增定时任务功能</li>
                <li>添加一个打包Web工程bat</li>
                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
                <li>修复点击退出登录有时会无提示问题</li>
                <li>修复防重复提交注解无效问题</li>
                <li>修复通知公告批量删除异常问题</li>
                <li>添加菜单时路由地址必填限制</li>
                <li>代码生成字段描述可编辑</li>
                <li>修复用户修改个人信息导致缓存不过期问题</li>
                <li>个人信息创建时间获取正确属性值</li>
                <li>操作日志详细显示正确类型</li>
                <li>导入表单击行数据时选中对应的复选框</li>
                <li>批量替换表前缀逻辑调整</li>
                <li>固定重定向路径表达式</li>
                <li>升级element-ui版本到2.13.0</li>
                <li>操作日志排序调整</li>
                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>

            <el-collapse-item title="v2.1.0 - 2020-02-24">
              <ol>
                <li>新增表单构建</li>
                <li>代码生成支持树表结构</li>
                <li>新增用户导入</li>
                <li>修复动态加载路由页面刷新问题</li>
                <li>修复地址开关无效问题</li>
                <li>汉化错误提示页面</li>
                <li>代码生成已知问题修改</li>
                <li>修复多数据源下配置关闭出现异常处理</li>
                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
                <li>修复上传头像控制台出现异常</li>
                <li>修改用户管理分页不正确的问题</li>
                <li>修复验证码记录提示错误</li>
                <li>修复request.js缺少Message引用</li>
                <li>修复表格时间为空出现的异常</li>
                <li>添加Jackson日期反序列化时区配置</li>
                <li>调整根据用户权限加载菜单数据树形结构</li>
                <li>调整成功登录不恢复按钮，防止多次点击</li>
                <li>修改用户个人资料同步缓存信息</li>
                <li>修复页面同时出现el-upload和Editor不显示处理</li>
                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
                <li>配置文件新增redis密码属性</li>
                <li>设置mybatis全局的配置文件</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>

            <el-collapse-item title="v2.0.0 - 2019-12-02">
              <ol>
                <li>新增代码生成</li>
                <li>新增@RepeatSubmit注解，防止重复提交</li>
                <li>新增菜单主目录添加/删除操作</li>
                <li>日志记录过滤特殊对象，防止转换异常</li>
                <li>修改代码生成路由脚本错误</li>
                <li>用户上传头像实时同步缓存，无需重新登录</li>
                <li>调整切换页签后不重新加载数据</li>
                <li>添加jsencrypt实现参数的前端加密</li>
                <li>系统退出删除用户缓存记录</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v1.1.0 - 2019-11-11">
              <ol>
                <li>新增在线用户管理</li>
                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
                <li>新增查询条件重置按钮</li>
                <li>新增Swagger全局Token配置</li>
                <li>新增后端参数校验</li>
                <li>修复字典管理页面的日期查询异常</li>
                <li>修改时间函数命名防止冲突</li>
                <li>去除菜单上级校验，默认为顶级</li>
                <li>修复用户密码无法修改问题</li>
                <li>修复菜单类型为按钮时不显示权限标识</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v1.0.0 - 2019-10-08">
              <ol>
                <li>若依前后端分离系统正式发布</li>
              </ol>
            </el-collapse-item>
          </el-collapse>
        </el-card>
      </el-col>
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>捐赠支持</span>
          </div>
          <div class="body">
            <img
              src="@/assets/images/pay.png"
              alt="donate"
              width="100%"
            />
            <span style="display: inline-block; height: 30px; line-height: 30px"
              >你可以请作者喝杯咖啡表示鼓励</span
            >
          </div>
        </el-card>
      </el-col>
    </el-row>
    <!-- ä¿¡æ¯æè¿°æ¡† -->
    <div class="info-box">
      <p>告警信息：</p>
      <ul>
        <li>1. æ•°æ®ç»Ÿè®¡å‘¨æœŸä¸ºå½“æ—¥00:00至当前时间</li>
        <li>2. å®Œæˆæ•°é‡åŒ…含在制品</li>
        <li>3. æ¯å°æ—¶æ›´æ–°ä¸€æ¬¡æ•°æ®</li>
      </ul>
    </div>
  </div>
</template>

<script>
import { getWelcomeWord } from '@/api/main/da/stationCollection'
import { getTodayList } from '@/api/main/om/info'
export default {
  name: "Index",
  data() {
    return {
      // ç‰ˆæœ¬å·
      version: "3.8.8"
    };
      scrollTipText: '欢迎登录生产看板       æ¬¢è¿Žç™»å½•ç”Ÿäº§çœ‹æ¿        æ¬¢è¿Žç™»å½•ç”Ÿäº§çœ‹æ¿     æ¬¢è¿Žç™»å½•ç”Ÿäº§çœ‹æ¿     æ¬¢è¿Žç™»å½•ç”Ÿäº§çœ‹æ¿       æ¬¢è¿Žç™»å½•ç”Ÿäº§çœ‹æ¿     ',
      tableData: [],
    }
  },
  mounted() {
    this.getWelcomeWord()
    this.checkScrollNeeded()
    window.addEventListener('resize', this.checkScrollNeeded)
    this.getTableList()

  },
  beforeDestroy() {
    window.removeEventListener('resize', this.checkScrollNeeded)
  },
  methods: {
    goTarget(href) {
      window.open(href, "_blank");
    }
  }
};
</script>
    //看板欢迎词
    getWelcomeWord(){
      const query = 'welcome';
      getWelcomeWord(query).then(res => {
        console.log('res',res)
        if (res.code === 200){
          if (res.data.length > 0){
            if (res.data[0].remark !== null && res.data[0].remark !== ''){
              console.log('111')
              this.scrollTipText = res.data[0].remark
              console.log('this.scrollTipText',this.scrollTipText)
            }
          }
        }
      })
    },
    getTableList(){
      getTodayList().then(res => {
        if (res.code === 200){
          this.tableData = res.data
        }
      })
    },
    checkScrollNeeded() {
      this.$nextTick(() => {
        const content = this.$refs.tipContent
        const container = content.parentElement

<style scoped lang="scss">
.home {
  blockquote {
    padding: 10px 20px;
    margin: 0 0 20px;
    font-size: 17.5px;
    border-left: 5px solid #eee;
  }
  hr {
    margin-top: 20px;
    margin-bottom: 20px;
    border: 0;
    border-top: 1px solid #eee;
  }
  .col-item {
    margin-bottom: 20px;
  }
        // æ£€æµ‹å†…容是否超出容器
        const isOverflow = content.scrollWidth > container.offsetWidth

  ul {
    padding: 0;
    margin: 0;
  }
        // åŠ¨æ€åˆ‡æ¢æ»šåŠ¨çŠ¶æ€
        content.classList.toggle('auto-scroll', isOverflow)

  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
  font-size: 13px;
  color: #676a6c;
  overflow-x: hidden;

  ul {
    list-style-type: none;
  }

  h4 {
    margin-top: 0px;
  }

  h2 {
    margin-top: 10px;
    font-size: 26px;
    font-weight: 100;
  }

  p {
    margin-top: 10px;

    b {
      font-weight: 700;
    }
  }

  .update-log {
    ol {
      display: block;
      list-style-type: decimal;
      margin-block-start: 1em;
      margin-block-end: 1em;
      margin-inline-start: 0;
      margin-inline-end: 0;
      padding-inline-start: 40px;
        // è®¾ç½®æ»šåŠ¨é€Ÿåº¦ï¼ˆå¯æ ¹æ®éœ€è¦è°ƒæ•´ç³»æ•°ï¼‰
        if (isOverflow) {
          const overflowRatio = content.scrollWidth / container.offsetWidth
          content.style.setProperty('--scroll-duration', `${overflowRatio * 20}s`)
        }
      })
    }
  }
}
</style>
</script>

<style scoped>
.container {
  max-width: 2200px;
  margin: 0 auto;
  padding: 20px;
}

/* æ ‡é¢˜æ ·å¼ */
.title {
  font-size: 40px;
  font-weight: bold;
  text-align: center;
  margin-bottom: 30px;
  color: #333;
}

.scroll-tip {
  background: #e2fad0;
  border: 1px solid #80e33d;
  border-radius: 4px;
  padding: 12px;
  margin-bottom: 20px;
  overflow: hidden; /* éšè—æº¢å‡ºéƒ¨åˆ† */
  position: relative;
}

.tip-content {
  white-space: nowrap;
  display: inline-block;
  position: relative;
  left: 0;
  transition: all 0.3s;
  padding-right: 20px; /* é˜²æ­¢æ–‡å­—紧贴边缘 */
  font-size: 30px;
  color: red;
}

/* è‡ªåŠ¨æ»šåŠ¨åŠ¨ç”» */
.tip-content.auto-scroll {
  animation: auto-scroll linear infinite;
  animation-duration: var(--scroll-duration, 15s);
}

@keyframes auto-scroll {
  0% {
    transform: translateX(100%);
  }
  100% {
    transform: translateX(calc(-100% - 20px)); /* æ»šåŠ¨åˆ°å®Œå…¨æ¶ˆå¤± */
  }
}


/* è¡¨æ ¼æ ·å¼ */
.table-container {
  border: 1px solid #e8e8e8;
  border-radius: 4px;
  overflow: hidden;
  margin-bottom: 20px;
}

table {
  width: 100%;
  border-collapse: collapse;
}

thead {
  background: #fafafa;
}

th {
  padding: 16px;
  text-align: left;
  font-weight: 500;
  color: rgba(0, 0, 0, 0.85);
  border-bottom: 1px solid #e8e8e8;
}

tbody {
  display: block;
  max-height: 150px; /* 3行高度 */
  overflow-y: auto;
}

tr {
  display: table;
  width: 100%;
  table-layout: fixed;
}

td {
  padding: 12px 16px;
  border-bottom: 1px solid #e8e8e8;
  color: rgba(0, 0, 0, 0.65);
}

/* åˆ—宽设置 */
.col-machine { width: 25%; }
.col-plan { width: 25%; }
.col-completed { width: 25%; }

/* ä¿¡æ¯æè¿°æ¡† */
.info-box {
  background: #f0f9ff;
  border: 1px solid #91d5ff;
  border-radius: 4px;
  padding: 16px;
  color: #096dd9;
}

.info-box p {
  font-weight: 500;
  margin-bottom: 8px;
}

.info-box ul {
  margin: 0;
  padding-left: 20px;
}

.info-box li {
  line-height: 1.6;
  font-size: 14px;
}
</style>

 billion-ui/src/views/main/bq/prototypeLabelPrinting/index.vue

@@ -1,309 +1,101 @@
<template>
  <div class="app-container">
    <el-row :gutter="20">
      <el-col :span="12">
      <el-col :span="24">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
            <span>样机标签打印</span>
            <span>扫码上线</span>
          </div>
          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
            <el-form-item label="组别" prop="groupName">
              <el-select v-model="form.groupName" placeholder="请选择组别" style="width: 100%">
                <el-option
                  v-for="item in groupOptions"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
          <el-form ref="form" :model="form" :rules="rules" label-width="100px" @submit.native.prevent>
            <el-form-item label="序列号" prop="SNCode">
              <input
                v-model="form.SNCode"
                ref="inputdata"
                placeholder="请输入序列号"
                style="width: 100%; height: 40px; font-size: 30px"
              />
            </el-form-item>

            <el-form-item label="样机编号" prop="prototypeCode">
              <el-input
                v-model="form.prototypeCode"
                placeholder="请输入样机编号"
                style="width: 100%">
              </el-input>
            </el-form-item>

            <el-form-item>
              <el-button type="primary" @click="handlePrint" :loading="printing">
                <i class="el-icon-printer"></i> æ‰“印标签
              </el-button>
            </el-form-item>
          </el-form>
        </el-card>
      </el-col>

      <el-col :span="12">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
            <span>预览区域</span>
          </div>
          <div class="print-area">
            <div id="printSection" class="qrcode-container">
              <qrcode-vue :value="qrCodeValue" :size="300" level="H"></qrcode-vue>
              <div class="info-text">
                <div class="text-item">组别：{{ form.groupName || '-' }}</div>
                <div class="text-item">样机编号：{{ form.prototypeCode || '-' }}</div>
              </div>
            </div>
          </div>
        </el-card>
      </el-col>
    </el-row>
  </div>
</template>

<script>
import QrcodeVue from 'qrcode.vue'
import QRCode from 'qrcode'

import {addPassStationCollection} from "@/api/main/da/stationCollection";

export default {
  name: 'PrototypeLabelPrinting',
  components: {
    QrcodeVue
  },
  data() {
    return {
      printing: false,
      scannerFlag: false,
      form: {
        groupName: '',
        prototypeCode: ''
        SNCode: '',
        LocationCode: 'OP010'
      },
      rules: {
        groupName: [
          { required: true, message: '请选择组别', trigger: 'change' }
        ],
        prototypeCode: [
          { required: true, message: '请输入样机编号', trigger: 'blur' }
        SNCode: [
          { required: true, message: '请输入序列号', trigger: 'blur' }
        ]
      },
      groupOptions: [
        { value: '研发一组', label: '研发一组' },
        { value: '研发二组', label: '研发二组' },
        { value: '研发三组', label: '研发三组研发三组' }
      ]
    }
  },
  computed: {
    qrCodeValue() {
      if (!this.form.groupName || !this.form.prototypeCode) {
        return '暂无数据'
      }
      return `${this.form.groupName}${this.form.prototypeCode}`
    }
  },

  methods: {
    handlePrint() {
      this.$message.success('打印')

      this.$refs.form.validate(async valid => {
        if (valid) {
          this.printing = true
          try {
            const qrDataUrl = await QRCode.toDataURL(this.qrCodeValue, {
              width: 800,
              margin: 1,
              errorCorrectionLevel: 'H'
            })

            const testPrintContent = `
              <!DOCTYPE html>
              <html>
                <head>
                  <title>测试打印</title>
                </head>
                <body>
                  <h1>这是一个测试打印内容</h1>
                </body>
              </html>
            `

            // ç¬¬ä¸€ä¸ªæ‰“印机的内容 - åŽŸå§‹æ ‡ç­¾
            const firstPrintContent = `
              <!DOCTYPE html>
              <html>
                <head>
                  <title>样机标签打印-1</title>
                  <style>
                    @page {
                      size: 100mm 100mm;
                      margin: 0;
                    }
                    @media print {
                      html, body {
                        margin: 0;
                        padding: 0;
                        height: 100mm;
                        page-break-after: avoid;
                        page-break-before: avoid;
                      }
                    }
                    .print-container {
                      display: flex;
                      flex-direction: column;
                      align-items: center;
                      justify-content: center;
                      width: 100mm;
                      height: 80mm;
                      box-sizing: border-box;
                      padding: 5mm;
                      page-break-inside: avoid;
                    }
                    .qr-code {
                      width: 80mm;
                      height: 80mm;
                      margin-bottom: 3mm;
                    }
                    .qr-code img {
                      width: 100%;
                      height: 100%;
                      object-fit: contain;
                    }
                    .info-text {
                      text-align: center;
                      font-size: 3mm;
                      font-weight: bold;
                      line-height: 1.5;
                    }
                    .info-text div {
                      margin: 1mm 0;
                    }
                  </style>
                </head>
                <body>
                  <div class="print-container">
                    <div class="qr-code">
                      <img src="${qrDataUrl}" alt="QR Code"/>
                    </div>
                    <div class="info-text">
                      <div>组别：${this.form.groupName}</div>
                      <div>样机编号：${this.form.prototypeCode}</div>
                      <div>原始标签</div>
                    </div>
                  </div>
                </body>
              </html>
            `

            // ç¬¬äºŒä¸ªæ‰“印机的内容 - å¤‡ç”¨æ ‡ç­¾
            const secondPrintContent = `
              <!DOCTYPE html>
              <html>
                <head>
                  <title>样机标签打印-2</title>
                  <style>
                    @page {
                      size: 100mm 100mm;
                      margin: 0;
                    }
                    @media print {
                      html, body {
                        margin: 0;
                        padding: 0;
                        height: 100mm;
                        page-break-after: avoid;
                        page-break-before: avoid;
                      }
                    }
                    .print-container {
                      display: flex;
                      flex-direction: column;
                      align-items: center;
                      justify-content: center;
                      width: 100mm;
                      height: 80mm;
                      box-sizing: border-box;
                      padding: 5mm;
                      page-break-inside: avoid;
                    }
                    .qr-code {
                      width: 80mm;
                      height: 80mm;
                      margin-bottom: 3mm;
                    }
                    .qr-code img {
                      width: 100%;
                      height: 100%;
                      object-fit: contain;
                    }
                    .info-text {
                      text-align: center;
                      font-size: 3mm;
                      font-weight: bold;
                      line-height: 1.5;
                    }
                    .info-text div {
                      margin: 1mm 0;
                      color: red;
                    }
                  </style>
                </head>
                <body>
                  <div class="print-container">
                    <div class="qr-code">
                      <img src="${qrDataUrl}" alt="QR Code"/>
                    </div>
                    <div class="info-text">
                      <div>组别：${this.form.groupName}</div>
                      <div>样机编号：${this.form.prototypeCode}</div>
                      <div>备用标签</div>
                    </div>
                  </div>
                </body>
              </html>
            `

            // æŒ‡å®šæ‰“印机名称和对应的内容
            const printTasks = [
              {
                printerName: 'Kyocera ECOSYS M4125idn KX',  // ä½¿ç”¨ç³»ç»Ÿä¸­å®žé™…存在的打印机名称
                content: testPrintContent
              },
              {
                printerName: 'Kyocera ECOSYS M4125idn KX',  // ä½¿ç”¨ç³»ç»Ÿä¸­å®žé™…存在的打印机名称
                content: firstPrintContent
              },
              {
                printerName: 'Kyocera ECOSYS M4125idn KX',  // ä½¿ç”¨ç³»ç»Ÿä¸­å®žé™…存在的打印机名称
                content: secondPrintContent
              }
            ]

            // ç›‘听打印完成事件
            if (window.electron?.isElectron) {
              this.$message.success('22')

              window.electron.ipcRenderer.on('print-complete', (result) => {
                if (result.success) {
                  this.$message.success('打印成功')
                } else {
                  this.$message.error(`打印失败: ${result.error}`)
                  console.error('Print error:', result.error)
                }
              })

              // å‘送打印任务到主进程
              printTasks.forEach(task => {
                this.$message.success('33')

                window.electron.ipcRenderer.send('silent-print', {
                  content: task.content,
                  printerName: task.printerName
                })
              })
            }

            this.printing = false
          } catch (error) {
            console.error('打印失败:', error)
            this.$message.error('打印失败，请重试')
            this.printing = false
          }
        }
    setFocus(){
      this.$nextTick(()=>{
        this.$refs.inputdata.focus()
      })
    }
    },

    handleScannerInput(event){
      if (this.scannerFlag){
        this.form.SNCode = ''
        this.$refs.inputdata.value = ''
        this.scannerFlag = false
      }
      const input = event.target
      this.form.SNCode = input.value
      if (event.key === 'Enter'){
        this.scannerFlag = true
        //扫描完成
        addPassStationCollection({SNCode:this.form.SNCode,LocationCode: this.form.LocationCode}).then(res => {

          if (res.code === 200){
            this.$message({
              message: "扫码完成",
              type: "success"
            })
          } else {
            this.$message({
              message: "扫码错误，请重试",
              type: "error"
            })
          }
        })
      }
    },
  },
  mounted() {
    console.log('00')
    this.setFocus();
    this.$nextTick(() => {
      if (this.$refs.inputdata){
        this.$refs.inputdata.addEventListener('keydown',this.handleScannerInput)
      }

    })

  },

  beforeDestroy() {
    this.$refs.inputdata.removeEventListener('keydown',this.handleScannerInput)
  }
}
</script>

 billion-ui/src/views/main/bq/workstationOperation/index.vue

@@ -1,202 +1,99 @@
<template>
  <div class="app-container">
    <el-row :gutter="5">
      <el-col :span="6">
        <el-card class="box-card">
          <div class="card-item">
            <span class="label">工位编号:</span>
            <el-select v-model="locationCode" placeholder="请选择" class="content-item" @change="handleLocationChange">
              <el-option
                v-for="item in locationCodeOptions"
                :key="item.locationCode"
                :label="item.locationCode"
                :value="item.locationCode">
              </el-option>
            </el-select>
          </div>
        </el-card>
      </el-col>
      <el-col :span="6">
        <el-card class="box-card">
          <div class="card-item">
            <span class="label">样机编号:</span>
            <span class="content-item">{{prototypeNumber}}</span>
          </div>
        </el-card>
      </el-col>
      <el-col :span="12">
        <el-card class="box-card">
          <div class="card-item">
            <span class="label">物料编号:</span>
            <el-input class="content-item" v-model="materialCode" placeholder="请输入物料编号" @keyup.enter.native="handleMaterialCodeEnter"></el-input>
            <el-button @click="test1" type="primary">主要按钮</el-button>
            <el-button type="success">成功按钮</el-button>
          </div>
        </el-card>
      </el-col>
    </el-row>
    <el-row>
    <el-row :gutter="20">
      <el-col :span="24">
        <el-card class="box-card">
          <el-table
            ref="formulaTable"
            :data="sortedFormulaData"
            height="350"
            style="width: 100%"
            :row-class-name="tableRowClassName"
          >
            <el-table-column show-overflow-tooltip label="工位编号" align="center" prop="locationCode" />
            <el-table-column show-overflow-tooltip label="产品编号" align="center" prop="productCode" />
            <el-table-column show-overflow-tooltip label="操作内容" align="center" prop="operationContent" />
            <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" />
            <el-table-column show-overflow-tooltip label="采集值" align="center" prop="collectData" />
            <el-table-column show-overflow-tooltip label="结果" align="center" prop="results" />
          </el-table>
          <div slot="header" class="clearfix">
            <span>扫码下线</span>
          </div>
          <el-form ref="form" :model="form" :rules="rules" label-width="100px" @submit.native.prevent>
            <el-form-item label="序列号" prop="SNCode">
              <input
                v-model="form.SNCode"
                ref="inputdata"
                placeholder="请输入序列号"
                style="width: 100%; height: 40px; font-size: 30px"
              />
            </el-form-item>

          </el-form>
        </el-card>
      </el-col>
    </el-row>
    <el-row>
      <el-col :span="24">
        <el-card class="box-card">
          <span>缺陷记录:</span>
          <el-input style="width: 70%" v-model="defectInformation" placeholder="请输入缺陷记录"></el-input>
        </el-card>
      </el-col>
    </el-row>

  </div>
</template>

<script>
import { listLocationInfo, getLocationInfo, delLocationInfo, addLocationInfo, updateLocationInfo } from "@/api/main/bs/locationInfo";
import {addInfo, delInfo, getInfo, listInfo, updateCollectData, updateInfo} from "@/api/main/bs/formulaChildinfo";
import {addPassStationCollection} from "@/api/main/da/stationCollection";

export default {
  name: "workstationOperation",
  data() {
    return {
      printInfoData: {
        softwareVersion: 'SW001.001', //软件版本号
        hardwareVersion: 'HW001.001', //硬件版本号
        printModel: 'H2155D', //型号
        partNumber: '0', //零部件号
        supplierCode: '993983', //供应商编码
      scannerFlag: false,
      form: {
        SNCode: '',
        LocationCode: 'OP450'
      },
      locationCode: '',
      prototypeNumber: '',
      materialCode: '',
      defectInformation: '',
      locationCodeOptions: [],
      formulaTableData: [],
      isFirstEnter: true
    }
  },
  created() {
    this.initLocationOptions()
  },
  computed: {
    sortedFormulaData() {
      // å¯¹æ•°æ®è¿›è¡ŒæŽ’序，OK的放在前面
      return [...this.formulaTableData].sort((a, b) => {
        if (a.results === 'OK' && b.results !== 'OK') return -1;
        if (a.results !== 'OK' && b.results === 'OK') return 1;
        return 0;
      });
      rules: {
        SNCode: [
          { required: true, message: '请输入序列号', trigger: 'blur' }
        ]
      },
    }
  },
  methods: {
    async initLocationOptions() {
      try {
        const res = await listLocationInfo()
        this.locationCodeOptions = res.rows
      } catch (error) {
        this.$message.error('获取工位列表失败')
      }
    setFocus(){
      this.$nextTick(()=>{
        this.$refs.inputdata.focus()
      })
    },
    handleLocationChange(value) {
      if (!value) {
        this.prototypeNumber = ''
        this.materialCode = ''
        this.formulaTableData = []
        return

    handleScannerInput(event){
      if (this.scannerFlag){
        this.form.SNCode = ''
        this.$refs.inputdata.value = ''
        this.scannerFlag = false
      }
      this.isFirstEnter = true
      this.prototypeNumber = ''
      this.materialCode = ''
      this.formulaTableData = []
    },
    async handleMaterialCodeEnter() {
      if (!this.locationCode) {
        this.$message.warning('请先选择工位')
        return
      }
      const input = event.target
      this.form.SNCode = input.value
      if (event.key === 'Enter'){
        this.scannerFlag = true
        //扫描完成
        addPassStationCollection({SNCode:this.form.SNCode,LocationCode: this.form.LocationCode}).then(res => {

      if (this.isFirstEnter) {
        this.prototypeNumber = this.materialCode
        this.materialCode = ''
        this.isFirstEnter = false

        try {
          const res = await listInfo({
            locationCode: this.locationCode,
            pageFlag: true,
          })
          console.log(res)
          this.formulaTableData = res.rows
        } catch (error) {
          this.$message.error('获取配方数据失败')
        }
      } else {
        try {
          const res = await updateCollectData({
            locationCode: this.locationCode,
            inputValue: this.materialCode
          })

          if (res.code === 200) {
            this.formulaTableData = res.data
            this.$message.success('更新成功')
            this.materialCode = '' // æ¸…空输入框

            // åœ¨æ•°æ®æ›´æ–°åŽï¼Œæ»šåŠ¨åˆ°åˆé€‚的位置
            this.$nextTick(() => {
              const table = this.$refs.formulaTable;
              const completedCount = this.sortedFormulaData.filter(item => item.results === 'OK').length;
              const totalCount = this.sortedFormulaData.length;

              if (completedCount < totalCount) {
                // è®¡ç®—需要滚动的位置：将第一个未完成的行显示在中间
                const rowHeight = 40; // é¢„估的行高
                const scrollPosition = completedCount * rowHeight - (table.$el.clientHeight / 2) + rowHeight;

                // è®¾ç½®è¡¨æ ¼çš„滚动位置
                table.bodyWrapper.scrollTop = Math.max(0, scrollPosition);
              }
            });
          if (res.code === 200){
            this.$message({
              message: "扫码完成",
              type: "success"
            })
          } else {
            this.$message.warning(res.msg)
            this.$message({
              message: "扫码错误，请重试",
              type: "error"
            })
          }
        } catch (error) {
          this.$message.error('更新失败')
        }
        })
      }
    },

    // æ·»åŠ è¡Œæ ·å¼æ–¹æ³•
    tableRowClassName({row}) {
      if (row.results === 'OK') {
        return 'success-row'
  },
  mounted() {
    console.log('00')
    this.setFocus();
    this.$nextTick(() => {
      if (this.$refs.inputdata){
        this.$refs.inputdata.addEventListener('keydown',this.handleScannerInput)
      }
      return ''
    },

    test1(){
      let scanValue = '0RSMB05A132E3AF3V0000001'
      if(scanValue.includes("0RSMB")){
        this.$message.warning("成功"+scanValue)
      }else {
        this.$message.error('扫码识别错误的产品序列号'+scanValue+'请重新扫码');
      }
    }
    })

  },

  beforeDestroy() {
    this.$refs.inputdata.removeEventListener('keydown',this.handleScannerInput)
  }
}
</script>

 billion-ui/src/views/main/om/info/index.vue

@@ -2,22 +2,22 @@
  <div class="app-container">
    <div>
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
        <el-form-item label="工单编号" prop="workOrderNo">
          <el-input
            v-model="queryParams.workOrderNo"
            placeholder="请输入工单编号"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="订单编号" prop="salesOrderCode">
          <el-input
            v-model="queryParams.salesOrderCode"
            placeholder="请输入订单编号"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
<!--        <el-form-item label="工单编号" prop="workOrderNo">-->
<!--          <el-input-->
<!--            v-model="queryParams.workOrderNo"-->
<!--            placeholder="请输入工单编号"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="订单编号" prop="salesOrderCode">-->
<!--          <el-input-->
<!--            v-model="queryParams.salesOrderCode"-->
<!--            placeholder="请输入订单编号"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
        <el-form-item label="产品编号" prop="productCode">
          <el-input
            v-model="queryParams.productCode"
@@ -26,16 +26,16 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="工单状态" prop="orderStatus">
          <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
            <el-option
              v-for="dict in dict.type.order_status"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
<!--        <el-form-item label="工单状态" prop="orderStatus">-->
<!--          <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>-->
<!--            <el-option-->
<!--              v-for="dict in dict.type.order_status"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="dict.value"-->
<!--            />-->
<!--          </el-select>-->
<!--        </el-form-item>-->
        <el-form-item style="float: right; margin-right: 90px">
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -88,25 +88,25 @@
            v-hasPermi="['main:info:export']"
          >导出</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-receiving"
            size="mini"
            @click="handleReceive"
          >接收工单</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            :disabled="multiple"
            icon="el-icon-magic-stick"
            size="mini"
            @click="handleCreate"
          >生成</el-button>
        </el-col>
<!--        <el-col :span="1.5">-->
<!--          <el-button-->
<!--            type="primary"-->
<!--            plain-->
<!--            icon="el-icon-receiving"-->
<!--            size="mini"-->
<!--            @click="handleReceive"-->
<!--          >接收工单</el-button>-->
<!--        </el-col>-->
<!--        <el-col :span="1.5">-->
<!--          <el-button-->
<!--            type="primary"-->
<!--            plain-->
<!--            :disabled="multiple"-->
<!--            icon="el-icon-magic-stick"-->
<!--            size="mini"-->
<!--            @click="handleCreate"-->
<!--          >生成</el-button>-->
<!--        </el-col>-->
        <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
      </el-row>
    </div>
@@ -114,32 +114,32 @@

    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="工单编号" align="center" prop="workOrderNo" width="120">
        <template slot-scope="scope">
          <a style="color: #7099F9"  @click="orderDetail(scope.row.workOrderNo)" >{{scope.row.workOrderNo}}
          </a>
<!--          <div @click="orderDetail(scope.row.workOrderNo)">{{scope.row.workOrderNo}}</div>-->
        </template>
      </el-table-column>
      <el-table-column label="订单编号" align="center" prop="salesOrderCode" width="120"/>
<!--      <el-table-column label="工单编号" align="center" prop="workOrderNo" width="120">-->
<!--        <template slot-scope="scope">-->
<!--          <a style="color: #7099F9"  @click="orderDetail(scope.row.workOrderNo)" >{{scope.row.workOrderNo}}-->
<!--          </a>-->
<!--&lt;!&ndash;          <div @click="orderDetail(scope.row.workOrderNo)">{{scope.row.workOrderNo}}</div>&ndash;&gt;-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="订单编号" align="center" prop="salesOrderCode" width="120"/>-->
      <el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
      <el-table-column label="产线编号" align="center" prop="lineCode" />
<!--      <el-table-column label="产线编号" align="center" prop="lineCode" />-->
      <el-table-column label="计划数量" align="center" prop="planQty" />
      <el-table-column label="计划开始时间" align="center" prop="planStartTime" width="120">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="计划结束时间" align="center" prop="planEndTime" width="120">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="工单状态" align="center" prop="orderStatus">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
        </template>
      </el-table-column>
<!--      <el-table-column label="计划结束时间" align="center" prop="planEndTime" width="120">-->
<!--        <template slot-scope="scope">-->
<!--          <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="工单状态" align="center" prop="orderStatus">-->
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -160,20 +160,29 @@
    <!-- æ·»åŠ æˆ–修改生产工单对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="工单编号" prop="workOrderNo">
          <el-input v-model="form.workOrderNo" placeholder="请输入工单编号" />
        </el-form-item>
        <el-form-item label="订单编号" prop="salesOrderCode">
          <el-input v-model="form.salesOrderCode" placeholder="请输入订单编号" />
        </el-form-item>
<!--        <el-form-item label="工单编号" prop="workOrderNo">-->
<!--          <el-input v-model="form.workOrderNo" placeholder="请输入工单编号" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="订单编号" prop="salesOrderCode">-->
<!--          <el-input v-model="form.salesOrderCode" placeholder="请输入订单编号" />-->
<!--        </el-form-item>-->

        <el-form-item label="产品编号" prop="productCode">
          <el-input v-model="form.productCode" placeholder="请输入产品编号" />
          <el-select v-model="form.productCode" placeholder="请选择产品编号" clearable>
            <el-option
              v-for="dict in dict.type.product_type"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="产线编号" prop="lineCode">
          <el-input v-model="form.lineCode" placeholder="请输入产线编号" />
        </el-form-item>
<!--        <el-form-item label="产线编号" prop="lineCode">-->
<!--          <el-input v-model="form.lineCode" placeholder="请输入产线编号" />-->
<!--        </el-form-item>-->

        <el-form-item label="计划数量" prop="planQty">
          <el-input v-model="form.planQty" placeholder="请输入计划数量" />
          <el-input-number v-model="form.planQty" controls-position="right" :min="1" :max="10000"></el-input-number>
        </el-form-item>
        <el-form-item label="计划开始时间" prop="planStartTime">
          <el-date-picker clearable
@@ -183,23 +192,23 @@
            placeholder="请选择计划开始时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="计划结束时间" prop="planEndTime">
          <el-date-picker clearable
            v-model="form.planEndTime"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择计划结束时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="工单状态" prop="orderStatus" v-if = updateFlag>
          <el-radio-group v-model="form.orderStatus">
            <el-radio
              v-for="dict in dict.type.order_status"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
<!--        <el-form-item label="计划结束时间" prop="planEndTime">-->
<!--          <el-date-picker clearable-->
<!--            v-model="form.planEndTime"-->
<!--            type="date"-->
<!--            value-format="yyyy-MM-dd"-->
<!--            placeholder="请选择计划结束时间">-->
<!--          </el-date-picker>-->
<!--        </el-form-item>-->
<!--        <el-form-item label="工单状态" prop="orderStatus" v-if = updateFlag>-->
<!--          <el-radio-group v-model="form.orderStatus">-->
<!--            <el-radio-->
<!--              v-for="dict in dict.type.order_status"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
<!--          </el-radio-group>-->
<!--        </el-form-item>-->
        <el-form-item label="备注" prop="remarks">
          <el-input
            type="textarea"
@@ -216,56 +225,56 @@
        <el-button @click="cancel">取 æ¶ˆ</el-button>
      </div>
    </el-dialog>
    <el-dialog
      title="工单详情"
      :visible.sync="detailVisible"
      width="80%"
      center>
      <el-table v-loading="detailLoading" :data="schedulingList">
        <el-table-column label="工单编号" align="center" prop="workOrderNo" />
        <el-table-column label="总成序列号" width="180px" align="center" prop="sfcCode" />
        <el-table-column label="产品编码" align="center" prop="productCode" />
        <el-table-column label="上线时间" align="center" prop="onlineTime" width="180">
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.onlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
          </template>
        </el-table-column>
        <el-table-column label="下线时间" align="center" prop="offlineTime" width="180">
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.offlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
          </template>
        </el-table-column>
        <el-table-column label="质量状态" align="center" prop="qualityStatus">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.product_status" :value="scope.row.qualityStatus"/>
          </template>
        </el-table-column>
        <el-table-column label="状态" align="center" prop="status">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.status" :value="scope.row.status"/>
          </template>
        </el-table-column>
        <el-table-column label="更新用户" align="center" prop="updateBy" />
        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
          </template>
        </el-table-column>
        <el-table-column label="备注" width="180px" show-overflow-tooltip align="center" prop="remarks" />
      </el-table>
<!--    <el-dialog-->
<!--      title="工单详情"-->
<!--      :visible.sync="detailVisible"-->
<!--      width="80%"-->
<!--      center>-->
<!--      <el-table v-loading="detailLoading" :data="schedulingList">-->
<!--        <el-table-column label="工单编号" align="center" prop="workOrderNo" />-->
<!--        <el-table-column label="总成序列号" width="180px" align="center" prop="sfcCode" />-->
<!--        <el-table-column label="产品编码" align="center" prop="productCode" />-->
<!--        <el-table-column label="上线时间" align="center" prop="onlineTime" width="180">-->
<!--          <template slot-scope="scope">-->
<!--            <span>{{ parseTime(scope.row.onlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="下线时间" align="center" prop="offlineTime" width="180">-->
<!--          <template slot-scope="scope">-->
<!--            <span>{{ parseTime(scope.row.offlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="质量状态" align="center" prop="qualityStatus">-->
<!--          <template slot-scope="scope">-->
<!--            <dict-tag :options="dict.type.product_status" :value="scope.row.qualityStatus"/>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="状态" align="center" prop="status">-->
<!--          <template slot-scope="scope">-->
<!--            <dict-tag :options="dict.type.status" :value="scope.row.status"/>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="更新用户" align="center" prop="updateBy" />-->
<!--        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">-->
<!--          <template slot-scope="scope">-->
<!--            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="备注" width="180px" show-overflow-tooltip align="center" prop="remarks" />-->
<!--      </el-table>-->

      <pagination
        v-show="detailTotal>0"
        :total="detailTotal"
        :page.sync="queryDetailParams.pageNum"
        :limit.sync="queryDetailParams.pageSize"
        @pagination="getDetail"
      />
    <span slot="footer" class="dialog-footer">
<!--    <el-button @click="detailVisible = false">取 æ¶ˆ</el-button>-->
<!--    <el-button type="primary" @click="detailVisible = false">ç¡® å®š</el-button>-->
  </span>
    </el-dialog>
<!--      <pagination-->
<!--        v-show="detailTotal>0"-->
<!--        :total="detailTotal"-->
<!--        :page.sync="queryDetailParams.pageNum"-->
<!--        :limit.sync="queryDetailParams.pageSize"-->
<!--        @pagination="getDetail"-->
<!--      />-->
<!--    <span slot="footer" class="dialog-footer">-->
<!--&lt;!&ndash;    <el-button @click="detailVisible = false">取 æ¶ˆ</el-button>&ndash;&gt;-->
<!--&lt;!&ndash;    <el-button type="primary" @click="detailVisible = false">ç¡® å®š</el-button>&ndash;&gt;-->
<!--  </span>-->
<!--    </el-dialog>-->
  </div>

</template>
@@ -276,7 +285,7 @@

export default {
  name: "Info",
  dicts: ['order_status','product_status', 'status'],
  dicts: ['order_status','product_status', 'status', 'product_type'],
  data() {
    return {
      schedulingList: [],
@@ -321,27 +330,27 @@
      form: {},
      // è¡¨å•æ ¡éªŒ
      rules: {
        workOrderNo: [
          { required: true, message: "工单编号不能为空", trigger: "blur" }
        ],
        salesOrderCode: [
          { required: true, message: "订单编号不能为空", trigger: "blur" }
        ],
        // workOrderNo: [
        //   { required: true, message: "工单编号不能为空", trigger: "blur" }
        // ],
        // salesOrderCode: [
        //   { required: true, message: "订单编号不能为空", trigger: "blur" }
        // ],
        productCode: [
          { required: true, message: "产品编号不能为空", trigger: "blur" }
        ],
        lineCode: [
          { required: true, message: "产线编号不能为空", trigger: "blur" }
        ],
        // lineCode: [
        //   { required: true, message: "产线编号不能为空", trigger: "blur" }
        // ],
        planQty: [
          { required: true, message: "计划数量不能为空", trigger: "blur" }
        ],
        planStartTime: [
          { required: true, message: "计划开始时间不能为空", trigger: "blur" }
        ],
        planEndTime: [
          { required: true, message: "计划结束时间不能为空", trigger: "blur" }
        ],
        // planEndTime: [
        //   { required: true, message: "计划结束时间不能为空", trigger: "blur" }
        // ],
      }
    };
  },
@@ -449,6 +458,13 @@
    },
    /** æäº¤æŒ‰é’® */
    submitForm() {
      if (this.form.planQty !== null && this.form.planQty !== ''){
        var p = /^\d+$/
        if (!p.test(this.form.planQty)){
          this.$modal.msgError("数量请输入正整数");
          return
        }
      }
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {