修改产品查询界面后端筛选

guoyuji

2024-01-22 2891d9948252ee0f3107584b97924b8ccae1fb23

修改产品查询界面后端筛选

 north-glass-erp/.idea/dataSources.local.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="dataSourceStorageLocal" created-in="IU-232.9559.62">
    <data-source name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
    <data-source name="@localhost" uuid="521b6701-da00-48a8-bf4f-cf6bbb7d685d">
      <database-info product="MySQL" version="8.0.22" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.22" exact-driver-version="8.0">
        <extra-name-characters>#@</extra-name-characters>
        <identifier-quote-string>`</identifier-quote-string>
@@ -14,8 +14,31 @@
        <introspection-scope>
          <node kind="schema">
            <name qname="@" />
            <name qname="erp_sd" />
            <name qname="erp_user_info" />
            <name qname="mm" />
            <name qname="pp" />
            <name qname="sd" />
          </node>
        </introspection-scope>
      </schema-mapping>
    </data-source>
    <data-source name="@10.153.19.150" uuid="2f24a638-142d-4401-9e71-359f1be8d502">
      <database-info product="MySQL" version="8.0.19" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.19" exact-driver-version="8.0">
        <extra-name-characters>#@</extra-name-characters>
        <identifier-quote-string>`</identifier-quote-string>
        <jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
      </database-info>
      <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
      <secret-storage>master_key</secret-storage>
      <user-name>root</user-name>
      <schema-mapping>
        <introspection-scope>
          <node kind="schema">
            <name qname="@" />
            <name qname="erp_user_info" />
            <name qname="mm" />
            <name qname="pp" />
            <name qname="sd" />
          </node>
        </introspection-scope>
      </schema-mapping>

 north-glass-erp/.idea/dataSources.xml

@@ -1,12 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
    <data-source source="LOCAL" name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
    <data-source source="LOCAL" name="@localhost" uuid="521b6701-da00-48a8-bf4f-cf6bbb7d685d">
      <driver-ref>mysql.8</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
      <jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
      <working-dir>$ProjectFileDir$</working-dir>
    </data-source>
    <data-source source="LOCAL" name="@10.153.19.150" uuid="2f24a638-142d-4401-9e71-359f1be8d502">
      <driver-ref>mysql.8</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
      <jdbc-url>jdbc:mysql://10.153.19.150:3306</jdbc-url>
      <working-dir>$ProjectFileDir$</working-dir>
    </data-source>
  </component>
</project>

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml

@@ -1,2037 +1,1808 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataSource name="@localhost [2]">
<dataSource name="@localhost ">
  <database-model serializer="dbm" dbms="MYSQL" family-id="MYSQL" format-version="4.49">
    <root id="1">
      <DefaultCasing>lower/lower</DefaultCasing>
      <DefaultEngine>InnoDB</DefaultEngine>
      <DefaultTmpEngine>InnoDB</DefaultTmpEngine>
      <Grants>|root||root||ALTER|G
|root||root||ALTER ROUTINE|G
|root||mysql.session|localhost|BACKUP_ADMIN|G
|root||mysql.session|localhost|CLONE_ADMIN|G
|root||mysql.session|localhost|CONNECTION_ADMIN|G
|root||root||CREATE|G
|root||root||CREATE ROLE|G
|root||root||CREATE ROUTINE|G
|root||root||CREATE TABLESPACE|G
|root||root||CREATE TEMPORARY TABLES|G
|root||root||CREATE USER|G
|root||root||CREATE VIEW|G
|root||root||DELETE|G
|root||root||DROP|G
|root||root||DROP ROLE|G
|root||root||EVENT|G
|root||root||EXECUTE|G
|root||root||FILE|G
|root||root||INDEX|G
|root||root||INSERT|G
|root||root||LOCK TABLES|G
|root||mysql.session|localhost|PERSIST_RO_VARIABLES_ADMIN|G
|root||root||PROCESS|G
|root||root||REFERENCES|G
|root||root||RELOAD|G
|root||root||REPLICATION CLIENT|G
|root||root||REPLICATION SLAVE|G
|root||mysql.infoschema|localhost|SELECT|G
|root||root||SELECT|G
|root||mysql.session|localhost|SESSION_VARIABLES_ADMIN|G
|root||root||SHOW DATABASES|G
|root||root||SHOW VIEW|G
|root||mysql.session|localhost|SHUTDOWN|G
|root||root||SHUTDOWN|G
|root||mysql.session|localhost|SUPER|G
|root||root||SUPER|G
|root||mysql.infoschema|localhost|SYSTEM_USER|G
|root||mysql.session|localhost|SYSTEM_USER|G
|root||mysql.sys|localhost|SYSTEM_USER|G
|root||mysql.session|localhost|SYSTEM_VARIABLES_ADMIN|G
|root||root||TRIGGER|G
|root||root||UPDATE|G
|root||root||grant option|G
performance_schema|schema||mysql.session|localhost|SELECT|G
sys|schema||mysql.sys|localhost|TRIGGER|G</Grants>
      <ServerVersion>8.0.22</ServerVersion>
    </root>
    <collation id="2" parent="1" name="armscii8_general_ci">
    <collation id="2" parent="1" name="armscii8_bin">
      <Charset>armscii8</Charset>
    </collation>
    <collation id="3" parent="1" name="armscii8_general_ci">
      <Charset>armscii8</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="3" parent="1" name="armscii8_bin">
      <Charset>armscii8</Charset>
    <collation id="4" parent="1" name="ascii_bin">
      <Charset>ascii</Charset>
    </collation>
    <collation id="4" parent="1" name="ascii_general_ci">
    <collation id="5" parent="1" name="ascii_general_ci">
      <Charset>ascii</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="5" parent="1" name="ascii_bin">
      <Charset>ascii</Charset>
    <collation id="6" parent="1" name="big5_bin">
      <Charset>big5</Charset>
    </collation>
    <collation id="6" parent="1" name="big5_chinese_ci">
    <collation id="7" parent="1" name="big5_chinese_ci">
      <Charset>big5</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="7" parent="1" name="big5_bin">
      <Charset>big5</Charset>
    </collation>
    <collation id="8" parent="1" name="binary">
      <Charset>binary</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="9" parent="1" name="cp1250_general_ci">
    <collation id="9" parent="1" name="cp1250_bin">
      <Charset>cp1250</Charset>
    </collation>
    <collation id="10" parent="1" name="cp1250_croatian_ci">
      <Charset>cp1250</Charset>
    </collation>
    <collation id="11" parent="1" name="cp1250_czech_cs">
      <Charset>cp1250</Charset>
    </collation>
    <collation id="12" parent="1" name="cp1250_general_ci">
      <Charset>cp1250</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="10" parent="1" name="cp1250_czech_cs">
      <Charset>cp1250</Charset>
    </collation>
    <collation id="11" parent="1" name="cp1250_croatian_ci">
      <Charset>cp1250</Charset>
    </collation>
    <collation id="12" parent="1" name="cp1250_bin">
      <Charset>cp1250</Charset>
    </collation>
    <collation id="13" parent="1" name="cp1250_polish_ci">
      <Charset>cp1250</Charset>
    </collation>
    <collation id="14" parent="1" name="cp1251_bulgarian_ci">
    <collation id="14" parent="1" name="cp1251_bin">
      <Charset>cp1251</Charset>
    </collation>
    <collation id="15" parent="1" name="cp1251_ukrainian_ci">
    <collation id="15" parent="1" name="cp1251_bulgarian_ci">
      <Charset>cp1251</Charset>
    </collation>
    <collation id="16" parent="1" name="cp1251_bin">
      <Charset>cp1251</Charset>
    </collation>
    <collation id="17" parent="1" name="cp1251_general_ci">
    <collation id="16" parent="1" name="cp1251_general_ci">
      <Charset>cp1251</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="18" parent="1" name="cp1251_general_cs">
    <collation id="17" parent="1" name="cp1251_general_cs">
      <Charset>cp1251</Charset>
    </collation>
    <collation id="19" parent="1" name="cp1256_general_ci">
    <collation id="18" parent="1" name="cp1251_ukrainian_ci">
      <Charset>cp1251</Charset>
    </collation>
    <collation id="19" parent="1" name="cp1256_bin">
      <Charset>cp1256</Charset>
    </collation>
    <collation id="20" parent="1" name="cp1256_general_ci">
      <Charset>cp1256</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="20" parent="1" name="cp1256_bin">
      <Charset>cp1256</Charset>
    </collation>
    <collation id="21" parent="1" name="cp1257_lithuanian_ci">
    <collation id="21" parent="1" name="cp1257_bin">
      <Charset>cp1257</Charset>
    </collation>
    <collation id="22" parent="1" name="cp1257_bin">
      <Charset>cp1257</Charset>
    </collation>
    <collation id="23" parent="1" name="cp1257_general_ci">
    <collation id="22" parent="1" name="cp1257_general_ci">
      <Charset>cp1257</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="24" parent="1" name="cp850_general_ci">
    <collation id="23" parent="1" name="cp1257_lithuanian_ci">
      <Charset>cp1257</Charset>
    </collation>
    <collation id="24" parent="1" name="cp850_bin">
      <Charset>cp850</Charset>
    </collation>
    <collation id="25" parent="1" name="cp850_general_ci">
      <Charset>cp850</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="25" parent="1" name="cp850_bin">
      <Charset>cp850</Charset>
    <collation id="26" parent="1" name="cp852_bin">
      <Charset>cp852</Charset>
    </collation>
    <collation id="26" parent="1" name="cp852_general_ci">
    <collation id="27" parent="1" name="cp852_general_ci">
      <Charset>cp852</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="27" parent="1" name="cp852_bin">
      <Charset>cp852</Charset>
    <collation id="28" parent="1" name="cp866_bin">
      <Charset>cp866</Charset>
    </collation>
    <collation id="28" parent="1" name="cp866_general_ci">
    <collation id="29" parent="1" name="cp866_general_ci">
      <Charset>cp866</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="29" parent="1" name="cp866_bin">
      <Charset>cp866</Charset>
    <collation id="30" parent="1" name="cp932_bin">
      <Charset>cp932</Charset>
    </collation>
    <collation id="30" parent="1" name="cp932_japanese_ci">
    <collation id="31" parent="1" name="cp932_japanese_ci">
      <Charset>cp932</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="31" parent="1" name="cp932_bin">
      <Charset>cp932</Charset>
    <collation id="32" parent="1" name="dec8_bin">
      <Charset>dec8</Charset>
    </collation>
    <collation id="32" parent="1" name="dec8_swedish_ci">
    <collation id="33" parent="1" name="dec8_swedish_ci">
      <Charset>dec8</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="33" parent="1" name="dec8_bin">
      <Charset>dec8</Charset>
    <collation id="34" parent="1" name="eucjpms_bin">
      <Charset>eucjpms</Charset>
    </collation>
    <collation id="34" parent="1" name="eucjpms_japanese_ci">
    <collation id="35" parent="1" name="eucjpms_japanese_ci">
      <Charset>eucjpms</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="35" parent="1" name="eucjpms_bin">
      <Charset>eucjpms</Charset>
    <collation id="36" parent="1" name="euckr_bin">
      <Charset>euckr</Charset>
    </collation>
    <collation id="36" parent="1" name="euckr_korean_ci">
    <collation id="37" parent="1" name="euckr_korean_ci">
      <Charset>euckr</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="37" parent="1" name="euckr_bin">
      <Charset>euckr</Charset>
    <collation id="38" parent="1" name="gb18030_bin">
      <Charset>gb18030</Charset>
    </collation>
    <collation id="38" parent="1" name="gb18030_chinese_ci">
    <collation id="39" parent="1" name="gb18030_chinese_ci">
      <Charset>gb18030</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="39" parent="1" name="gb18030_bin">
      <Charset>gb18030</Charset>
    </collation>
    <collation id="40" parent="1" name="gb18030_unicode_520_ci">
      <Charset>gb18030</Charset>
    </collation>
    <collation id="41" parent="1" name="gb2312_chinese_ci">
    <collation id="41" parent="1" name="gb2312_bin">
      <Charset>gb2312</Charset>
    </collation>
    <collation id="42" parent="1" name="gb2312_chinese_ci">
      <Charset>gb2312</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="42" parent="1" name="gb2312_bin">
      <Charset>gb2312</Charset>
    <collation id="43" parent="1" name="gbk_bin">
      <Charset>gbk</Charset>
    </collation>
    <collation id="43" parent="1" name="gbk_chinese_ci">
    <collation id="44" parent="1" name="gbk_chinese_ci">
      <Charset>gbk</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="44" parent="1" name="gbk_bin">
      <Charset>gbk</Charset>
    <collation id="45" parent="1" name="geostd8_bin">
      <Charset>geostd8</Charset>
    </collation>
    <collation id="45" parent="1" name="geostd8_general_ci">
    <collation id="46" parent="1" name="geostd8_general_ci">
      <Charset>geostd8</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="46" parent="1" name="geostd8_bin">
      <Charset>geostd8</Charset>
    <collation id="47" parent="1" name="greek_bin">
      <Charset>greek</Charset>
    </collation>
    <collation id="47" parent="1" name="greek_general_ci">
    <collation id="48" parent="1" name="greek_general_ci">
      <Charset>greek</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="48" parent="1" name="greek_bin">
      <Charset>greek</Charset>
    <collation id="49" parent="1" name="hebrew_bin">
      <Charset>hebrew</Charset>
    </collation>
    <collation id="49" parent="1" name="hebrew_general_ci">
    <collation id="50" parent="1" name="hebrew_general_ci">
      <Charset>hebrew</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="50" parent="1" name="hebrew_bin">
      <Charset>hebrew</Charset>
    <collation id="51" parent="1" name="hp8_bin">
      <Charset>hp8</Charset>
    </collation>
    <collation id="51" parent="1" name="hp8_english_ci">
    <collation id="52" parent="1" name="hp8_english_ci">
      <Charset>hp8</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="52" parent="1" name="hp8_bin">
      <Charset>hp8</Charset>
    <collation id="53" parent="1" name="keybcs2_bin">
      <Charset>keybcs2</Charset>
    </collation>
    <collation id="53" parent="1" name="keybcs2_general_ci">
    <collation id="54" parent="1" name="keybcs2_general_ci">
      <Charset>keybcs2</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="54" parent="1" name="keybcs2_bin">
      <Charset>keybcs2</Charset>
    <collation id="55" parent="1" name="koi8r_bin">
      <Charset>koi8r</Charset>
    </collation>
    <collation id="55" parent="1" name="koi8r_general_ci">
    <collation id="56" parent="1" name="koi8r_general_ci">
      <Charset>koi8r</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="56" parent="1" name="koi8r_bin">
      <Charset>koi8r</Charset>
    <collation id="57" parent="1" name="koi8u_bin">
      <Charset>koi8u</Charset>
    </collation>
    <collation id="57" parent="1" name="koi8u_general_ci">
    <collation id="58" parent="1" name="koi8u_general_ci">
      <Charset>koi8u</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="58" parent="1" name="koi8u_bin">
      <Charset>koi8u</Charset>
    </collation>
    <collation id="59" parent="1" name="latin1_german1_ci">
    <collation id="59" parent="1" name="latin1_bin">
      <Charset>latin1</Charset>
    </collation>
    <collation id="60" parent="1" name="latin1_swedish_ci">
    <collation id="60" parent="1" name="latin1_danish_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="61" parent="1" name="latin1_general_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="62" parent="1" name="latin1_general_cs">
      <Charset>latin1</Charset>
    </collation>
    <collation id="63" parent="1" name="latin1_german1_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="64" parent="1" name="latin1_german2_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="65" parent="1" name="latin1_spanish_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="66" parent="1" name="latin1_swedish_ci">
      <Charset>latin1</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="61" parent="1" name="latin1_danish_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="62" parent="1" name="latin1_german2_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="63" parent="1" name="latin1_bin">
      <Charset>latin1</Charset>
    </collation>
    <collation id="64" parent="1" name="latin1_general_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="65" parent="1" name="latin1_general_cs">
      <Charset>latin1</Charset>
    </collation>
    <collation id="66" parent="1" name="latin1_spanish_ci">
      <Charset>latin1</Charset>
    </collation>
    <collation id="67" parent="1" name="latin2_czech_cs">
    <collation id="67" parent="1" name="latin2_bin">
      <Charset>latin2</Charset>
    </collation>
    <collation id="68" parent="1" name="latin2_general_ci">
    <collation id="68" parent="1" name="latin2_croatian_ci">
      <Charset>latin2</Charset>
    </collation>
    <collation id="69" parent="1" name="latin2_czech_cs">
      <Charset>latin2</Charset>
    </collation>
    <collation id="70" parent="1" name="latin2_general_ci">
      <Charset>latin2</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="69" parent="1" name="latin2_hungarian_ci">
    <collation id="71" parent="1" name="latin2_hungarian_ci">
      <Charset>latin2</Charset>
    </collation>
    <collation id="70" parent="1" name="latin2_croatian_ci">
      <Charset>latin2</Charset>
    <collation id="72" parent="1" name="latin5_bin">
      <Charset>latin5</Charset>
    </collation>
    <collation id="71" parent="1" name="latin2_bin">
      <Charset>latin2</Charset>
    </collation>
    <collation id="72" parent="1" name="latin5_turkish_ci">
    <collation id="73" parent="1" name="latin5_turkish_ci">
      <Charset>latin5</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="73" parent="1" name="latin5_bin">
      <Charset>latin5</Charset>
    </collation>
    <collation id="74" parent="1" name="latin7_estonian_cs">
    <collation id="74" parent="1" name="latin7_bin">
      <Charset>latin7</Charset>
    </collation>
    <collation id="75" parent="1" name="latin7_general_ci">
    <collation id="75" parent="1" name="latin7_estonian_cs">
      <Charset>latin7</Charset>
    </collation>
    <collation id="76" parent="1" name="latin7_general_ci">
      <Charset>latin7</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="76" parent="1" name="latin7_general_cs">
    <collation id="77" parent="1" name="latin7_general_cs">
      <Charset>latin7</Charset>
    </collation>
    <collation id="77" parent="1" name="latin7_bin">
      <Charset>latin7</Charset>
    <collation id="78" parent="1" name="macce_bin">
      <Charset>macce</Charset>
    </collation>
    <collation id="78" parent="1" name="macce_general_ci">
    <collation id="79" parent="1" name="macce_general_ci">
      <Charset>macce</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="79" parent="1" name="macce_bin">
      <Charset>macce</Charset>
    <collation id="80" parent="1" name="macroman_bin">
      <Charset>macroman</Charset>
    </collation>
    <collation id="80" parent="1" name="macroman_general_ci">
    <collation id="81" parent="1" name="macroman_general_ci">
      <Charset>macroman</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="81" parent="1" name="macroman_bin">
      <Charset>macroman</Charset>
    <collation id="82" parent="1" name="sjis_bin">
      <Charset>sjis</Charset>
    </collation>
    <collation id="82" parent="1" name="sjis_japanese_ci">
    <collation id="83" parent="1" name="sjis_japanese_ci">
      <Charset>sjis</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="83" parent="1" name="sjis_bin">
      <Charset>sjis</Charset>
    <collation id="84" parent="1" name="swe7_bin">
      <Charset>swe7</Charset>
    </collation>
    <collation id="84" parent="1" name="swe7_swedish_ci">
    <collation id="85" parent="1" name="swe7_swedish_ci">
      <Charset>swe7</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="85" parent="1" name="swe7_bin">
      <Charset>swe7</Charset>
    <collation id="86" parent="1" name="tis620_bin">
      <Charset>tis620</Charset>
    </collation>
    <collation id="86" parent="1" name="tis620_thai_ci">
    <collation id="87" parent="1" name="tis620_thai_ci">
      <Charset>tis620</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="87" parent="1" name="tis620_bin">
      <Charset>tis620</Charset>
    <collation id="88" parent="1" name="ucs2_bin">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="88" parent="1" name="ucs2_general_ci">
    <collation id="89" parent="1" name="ucs2_croatian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="90" parent="1" name="ucs2_czech_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="91" parent="1" name="ucs2_danish_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="92" parent="1" name="ucs2_esperanto_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="93" parent="1" name="ucs2_estonian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="94" parent="1" name="ucs2_general_ci">
      <Charset>ucs2</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="89" parent="1" name="ucs2_bin">
    <collation id="95" parent="1" name="ucs2_general_mysql500_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="90" parent="1" name="ucs2_unicode_ci">
    <collation id="96" parent="1" name="ucs2_german2_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="91" parent="1" name="ucs2_icelandic_ci">
    <collation id="97" parent="1" name="ucs2_hungarian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="92" parent="1" name="ucs2_latvian_ci">
    <collation id="98" parent="1" name="ucs2_icelandic_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="93" parent="1" name="ucs2_romanian_ci">
    <collation id="99" parent="1" name="ucs2_latvian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="94" parent="1" name="ucs2_slovenian_ci">
    <collation id="100" parent="1" name="ucs2_lithuanian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="95" parent="1" name="ucs2_polish_ci">
    <collation id="101" parent="1" name="ucs2_persian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="96" parent="1" name="ucs2_estonian_ci">
    <collation id="102" parent="1" name="ucs2_polish_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="97" parent="1" name="ucs2_spanish_ci">
    <collation id="103" parent="1" name="ucs2_roman_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="98" parent="1" name="ucs2_swedish_ci">
    <collation id="104" parent="1" name="ucs2_romanian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="99" parent="1" name="ucs2_turkish_ci">
    <collation id="105" parent="1" name="ucs2_sinhala_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="100" parent="1" name="ucs2_czech_ci">
    <collation id="106" parent="1" name="ucs2_slovak_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="101" parent="1" name="ucs2_danish_ci">
    <collation id="107" parent="1" name="ucs2_slovenian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="102" parent="1" name="ucs2_lithuanian_ci">
    <collation id="108" parent="1" name="ucs2_spanish2_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="103" parent="1" name="ucs2_slovak_ci">
    <collation id="109" parent="1" name="ucs2_spanish_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="104" parent="1" name="ucs2_spanish2_ci">
    <collation id="110" parent="1" name="ucs2_swedish_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="105" parent="1" name="ucs2_roman_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="106" parent="1" name="ucs2_persian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="107" parent="1" name="ucs2_esperanto_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="108" parent="1" name="ucs2_hungarian_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="109" parent="1" name="ucs2_sinhala_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="110" parent="1" name="ucs2_german2_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="111" parent="1" name="ucs2_croatian_ci">
    <collation id="111" parent="1" name="ucs2_turkish_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="112" parent="1" name="ucs2_unicode_520_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="113" parent="1" name="ucs2_vietnamese_ci">
    <collation id="113" parent="1" name="ucs2_unicode_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="114" parent="1" name="ucs2_general_mysql500_ci">
    <collation id="114" parent="1" name="ucs2_vietnamese_ci">
      <Charset>ucs2</Charset>
    </collation>
    <collation id="115" parent="1" name="ujis_japanese_ci">
    <collation id="115" parent="1" name="ujis_bin">
      <Charset>ujis</Charset>
    </collation>
    <collation id="116" parent="1" name="ujis_japanese_ci">
      <Charset>ujis</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="116" parent="1" name="ujis_bin">
      <Charset>ujis</Charset>
    <collation id="117" parent="1" name="utf16_bin">
      <Charset>utf16</Charset>
    </collation>
    <collation id="117" parent="1" name="utf16_general_ci">
    <collation id="118" parent="1" name="utf16_croatian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="119" parent="1" name="utf16_czech_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="120" parent="1" name="utf16_danish_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="121" parent="1" name="utf16_esperanto_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="122" parent="1" name="utf16_estonian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="123" parent="1" name="utf16_general_ci">
      <Charset>utf16</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="118" parent="1" name="utf16_bin">
    <collation id="124" parent="1" name="utf16_german2_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="119" parent="1" name="utf16_unicode_ci">
    <collation id="125" parent="1" name="utf16_hungarian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="120" parent="1" name="utf16_icelandic_ci">
    <collation id="126" parent="1" name="utf16_icelandic_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="121" parent="1" name="utf16_latvian_ci">
    <collation id="127" parent="1" name="utf16_latvian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="122" parent="1" name="utf16_romanian_ci">
    <collation id="128" parent="1" name="utf16_lithuanian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="123" parent="1" name="utf16_slovenian_ci">
    <collation id="129" parent="1" name="utf16_persian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="124" parent="1" name="utf16_polish_ci">
    <collation id="130" parent="1" name="utf16_polish_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="125" parent="1" name="utf16_estonian_ci">
    <collation id="131" parent="1" name="utf16_roman_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="126" parent="1" name="utf16_spanish_ci">
    <collation id="132" parent="1" name="utf16_romanian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="127" parent="1" name="utf16_swedish_ci">
    <collation id="133" parent="1" name="utf16_sinhala_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="128" parent="1" name="utf16_turkish_ci">
    <collation id="134" parent="1" name="utf16_slovak_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="129" parent="1" name="utf16_czech_ci">
    <collation id="135" parent="1" name="utf16_slovenian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="130" parent="1" name="utf16_danish_ci">
    <collation id="136" parent="1" name="utf16_spanish2_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="131" parent="1" name="utf16_lithuanian_ci">
    <collation id="137" parent="1" name="utf16_spanish_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="132" parent="1" name="utf16_slovak_ci">
    <collation id="138" parent="1" name="utf16_swedish_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="133" parent="1" name="utf16_spanish2_ci">
    <collation id="139" parent="1" name="utf16_turkish_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="134" parent="1" name="utf16_roman_ci">
    <collation id="140" parent="1" name="utf16_unicode_520_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="135" parent="1" name="utf16_persian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="136" parent="1" name="utf16_esperanto_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="137" parent="1" name="utf16_hungarian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="138" parent="1" name="utf16_sinhala_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="139" parent="1" name="utf16_german2_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="140" parent="1" name="utf16_croatian_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="141" parent="1" name="utf16_unicode_520_ci">
    <collation id="141" parent="1" name="utf16_unicode_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="142" parent="1" name="utf16_vietnamese_ci">
      <Charset>utf16</Charset>
    </collation>
    <collation id="143" parent="1" name="utf16le_general_ci">
    <collation id="143" parent="1" name="utf16le_bin">
      <Charset>utf16le</Charset>
    </collation>
    <collation id="144" parent="1" name="utf16le_general_ci">
      <Charset>utf16le</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="144" parent="1" name="utf16le_bin">
      <Charset>utf16le</Charset>
    <collation id="145" parent="1" name="utf32_bin">
      <Charset>utf32</Charset>
    </collation>
    <collation id="145" parent="1" name="utf32_general_ci">
    <collation id="146" parent="1" name="utf32_croatian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="147" parent="1" name="utf32_czech_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="148" parent="1" name="utf32_danish_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="149" parent="1" name="utf32_esperanto_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="150" parent="1" name="utf32_estonian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="151" parent="1" name="utf32_general_ci">
      <Charset>utf32</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="146" parent="1" name="utf32_bin">
    <collation id="152" parent="1" name="utf32_german2_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="147" parent="1" name="utf32_unicode_ci">
    <collation id="153" parent="1" name="utf32_hungarian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="148" parent="1" name="utf32_icelandic_ci">
    <collation id="154" parent="1" name="utf32_icelandic_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="149" parent="1" name="utf32_latvian_ci">
    <collation id="155" parent="1" name="utf32_latvian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="150" parent="1" name="utf32_romanian_ci">
    <collation id="156" parent="1" name="utf32_lithuanian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="151" parent="1" name="utf32_slovenian_ci">
    <collation id="157" parent="1" name="utf32_persian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="152" parent="1" name="utf32_polish_ci">
    <collation id="158" parent="1" name="utf32_polish_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="153" parent="1" name="utf32_estonian_ci">
    <collation id="159" parent="1" name="utf32_roman_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="154" parent="1" name="utf32_spanish_ci">
    <collation id="160" parent="1" name="utf32_romanian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="155" parent="1" name="utf32_swedish_ci">
    <collation id="161" parent="1" name="utf32_sinhala_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="156" parent="1" name="utf32_turkish_ci">
    <collation id="162" parent="1" name="utf32_slovak_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="157" parent="1" name="utf32_czech_ci">
    <collation id="163" parent="1" name="utf32_slovenian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="158" parent="1" name="utf32_danish_ci">
    <collation id="164" parent="1" name="utf32_spanish2_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="159" parent="1" name="utf32_lithuanian_ci">
    <collation id="165" parent="1" name="utf32_spanish_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="160" parent="1" name="utf32_slovak_ci">
    <collation id="166" parent="1" name="utf32_swedish_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="161" parent="1" name="utf32_spanish2_ci">
    <collation id="167" parent="1" name="utf32_turkish_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="162" parent="1" name="utf32_roman_ci">
    <collation id="168" parent="1" name="utf32_unicode_520_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="163" parent="1" name="utf32_persian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="164" parent="1" name="utf32_esperanto_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="165" parent="1" name="utf32_hungarian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="166" parent="1" name="utf32_sinhala_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="167" parent="1" name="utf32_german2_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="168" parent="1" name="utf32_croatian_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="169" parent="1" name="utf32_unicode_520_ci">
    <collation id="169" parent="1" name="utf32_unicode_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="170" parent="1" name="utf32_vietnamese_ci">
      <Charset>utf32</Charset>
    </collation>
    <collation id="171" parent="1" name="utf8_general_ci">
    <collation id="171" parent="1" name="utf8_bin">
      <Charset>utf8</Charset>
    </collation>
    <collation id="172" parent="1" name="utf8_croatian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="173" parent="1" name="utf8_czech_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="174" parent="1" name="utf8_danish_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="175" parent="1" name="utf8_esperanto_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="176" parent="1" name="utf8_estonian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="177" parent="1" name="utf8_general_ci">
      <Charset>utf8</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="172" parent="1" name="utf8_tolower_ci">
    <collation id="178" parent="1" name="utf8_general_mysql500_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="173" parent="1" name="utf8_bin">
    <collation id="179" parent="1" name="utf8_german2_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="174" parent="1" name="utf8_unicode_ci">
    <collation id="180" parent="1" name="utf8_hungarian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="175" parent="1" name="utf8_icelandic_ci">
    <collation id="181" parent="1" name="utf8_icelandic_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="176" parent="1" name="utf8_latvian_ci">
    <collation id="182" parent="1" name="utf8_latvian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="177" parent="1" name="utf8_romanian_ci">
    <collation id="183" parent="1" name="utf8_lithuanian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="178" parent="1" name="utf8_slovenian_ci">
    <collation id="184" parent="1" name="utf8_persian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="179" parent="1" name="utf8_polish_ci">
    <collation id="185" parent="1" name="utf8_polish_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="180" parent="1" name="utf8_estonian_ci">
    <collation id="186" parent="1" name="utf8_roman_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="181" parent="1" name="utf8_spanish_ci">
    <collation id="187" parent="1" name="utf8_romanian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="182" parent="1" name="utf8_swedish_ci">
    <collation id="188" parent="1" name="utf8_sinhala_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="183" parent="1" name="utf8_turkish_ci">
    <collation id="189" parent="1" name="utf8_slovak_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="184" parent="1" name="utf8_czech_ci">
    <collation id="190" parent="1" name="utf8_slovenian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="185" parent="1" name="utf8_danish_ci">
    <collation id="191" parent="1" name="utf8_spanish2_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="186" parent="1" name="utf8_lithuanian_ci">
    <collation id="192" parent="1" name="utf8_spanish_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="187" parent="1" name="utf8_slovak_ci">
    <collation id="193" parent="1" name="utf8_swedish_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="188" parent="1" name="utf8_spanish2_ci">
    <collation id="194" parent="1" name="utf8_tolower_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="189" parent="1" name="utf8_roman_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="190" parent="1" name="utf8_persian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="191" parent="1" name="utf8_esperanto_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="192" parent="1" name="utf8_hungarian_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="193" parent="1" name="utf8_sinhala_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="194" parent="1" name="utf8_german2_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="195" parent="1" name="utf8_croatian_ci">
    <collation id="195" parent="1" name="utf8_turkish_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="196" parent="1" name="utf8_unicode_520_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="197" parent="1" name="utf8_vietnamese_ci">
    <collation id="197" parent="1" name="utf8_unicode_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="198" parent="1" name="utf8_general_mysql500_ci">
    <collation id="198" parent="1" name="utf8_vietnamese_ci">
      <Charset>utf8</Charset>
    </collation>
    <collation id="199" parent="1" name="utf8mb4_general_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="200" parent="1" name="utf8mb4_bin">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="201" parent="1" name="utf8mb4_unicode_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="202" parent="1" name="utf8mb4_icelandic_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="203" parent="1" name="utf8mb4_latvian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="204" parent="1" name="utf8mb4_romanian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="205" parent="1" name="utf8mb4_slovenian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="206" parent="1" name="utf8mb4_polish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="207" parent="1" name="utf8mb4_estonian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="208" parent="1" name="utf8mb4_spanish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="209" parent="1" name="utf8mb4_swedish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="210" parent="1" name="utf8mb4_turkish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="211" parent="1" name="utf8mb4_czech_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="212" parent="1" name="utf8mb4_danish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="213" parent="1" name="utf8mb4_lithuanian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="214" parent="1" name="utf8mb4_slovak_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="215" parent="1" name="utf8mb4_spanish2_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="216" parent="1" name="utf8mb4_roman_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="217" parent="1" name="utf8mb4_persian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="218" parent="1" name="utf8mb4_esperanto_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="219" parent="1" name="utf8mb4_hungarian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="220" parent="1" name="utf8mb4_sinhala_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="221" parent="1" name="utf8mb4_german2_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="222" parent="1" name="utf8mb4_croatian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="223" parent="1" name="utf8mb4_unicode_520_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="224" parent="1" name="utf8mb4_vietnamese_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="225" parent="1" name="utf8mb4_0900_ai_ci">
    <collation id="199" parent="1" name="utf8mb4_0900_ai_ci">
      <Charset>utf8mb4</Charset>
      <DefaultForCharset>1</DefaultForCharset>
    </collation>
    <collation id="226" parent="1" name="utf8mb4_de_pb_0900_ai_ci">
    <collation id="200" parent="1" name="utf8mb4_0900_as_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="227" parent="1" name="utf8mb4_is_0900_ai_ci">
    <collation id="201" parent="1" name="utf8mb4_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="228" parent="1" name="utf8mb4_lv_0900_ai_ci">
    <collation id="202" parent="1" name="utf8mb4_0900_bin">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="229" parent="1" name="utf8mb4_ro_0900_ai_ci">
    <collation id="203" parent="1" name="utf8mb4_bin">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="230" parent="1" name="utf8mb4_sl_0900_ai_ci">
    <collation id="204" parent="1" name="utf8mb4_croatian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="231" parent="1" name="utf8mb4_pl_0900_ai_ci">
    <collation id="205" parent="1" name="utf8mb4_cs_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="232" parent="1" name="utf8mb4_et_0900_ai_ci">
    <collation id="206" parent="1" name="utf8mb4_cs_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="233" parent="1" name="utf8mb4_es_0900_ai_ci">
    <collation id="207" parent="1" name="utf8mb4_czech_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="234" parent="1" name="utf8mb4_sv_0900_ai_ci">
    <collation id="208" parent="1" name="utf8mb4_da_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="235" parent="1" name="utf8mb4_tr_0900_ai_ci">
    <collation id="209" parent="1" name="utf8mb4_da_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="236" parent="1" name="utf8mb4_cs_0900_ai_ci">
    <collation id="210" parent="1" name="utf8mb4_danish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="237" parent="1" name="utf8mb4_da_0900_ai_ci">
    <collation id="211" parent="1" name="utf8mb4_de_pb_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="238" parent="1" name="utf8mb4_lt_0900_ai_ci">
    <collation id="212" parent="1" name="utf8mb4_de_pb_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="239" parent="1" name="utf8mb4_sk_0900_ai_ci">
    <collation id="213" parent="1" name="utf8mb4_eo_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="240" parent="1" name="utf8mb4_es_trad_0900_ai_ci">
    <collation id="214" parent="1" name="utf8mb4_eo_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="241" parent="1" name="utf8mb4_la_0900_ai_ci">
    <collation id="215" parent="1" name="utf8mb4_es_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="242" parent="1" name="utf8mb4_eo_0900_ai_ci">
    <collation id="216" parent="1" name="utf8mb4_es_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="243" parent="1" name="utf8mb4_hu_0900_ai_ci">
    <collation id="217" parent="1" name="utf8mb4_es_trad_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="244" parent="1" name="utf8mb4_hr_0900_ai_ci">
    <collation id="218" parent="1" name="utf8mb4_es_trad_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="245" parent="1" name="utf8mb4_vi_0900_ai_ci">
    <collation id="219" parent="1" name="utf8mb4_esperanto_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="246" parent="1" name="utf8mb4_0900_as_cs">
    <collation id="220" parent="1" name="utf8mb4_estonian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="247" parent="1" name="utf8mb4_de_pb_0900_as_cs">
    <collation id="221" parent="1" name="utf8mb4_et_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="248" parent="1" name="utf8mb4_is_0900_as_cs">
    <collation id="222" parent="1" name="utf8mb4_et_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="249" parent="1" name="utf8mb4_lv_0900_as_cs">
    <collation id="223" parent="1" name="utf8mb4_general_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="250" parent="1" name="utf8mb4_ro_0900_as_cs">
    <collation id="224" parent="1" name="utf8mb4_german2_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="251" parent="1" name="utf8mb4_sl_0900_as_cs">
    <collation id="225" parent="1" name="utf8mb4_hr_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="252" parent="1" name="utf8mb4_pl_0900_as_cs">
    <collation id="226" parent="1" name="utf8mb4_hr_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="253" parent="1" name="utf8mb4_et_0900_as_cs">
    <collation id="227" parent="1" name="utf8mb4_hu_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="254" parent="1" name="utf8mb4_es_0900_as_cs">
    <collation id="228" parent="1" name="utf8mb4_hu_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="255" parent="1" name="utf8mb4_sv_0900_as_cs">
    <collation id="229" parent="1" name="utf8mb4_hungarian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="256" parent="1" name="utf8mb4_tr_0900_as_cs">
    <collation id="230" parent="1" name="utf8mb4_icelandic_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="257" parent="1" name="utf8mb4_cs_0900_as_cs">
    <collation id="231" parent="1" name="utf8mb4_is_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="258" parent="1" name="utf8mb4_da_0900_as_cs">
    <collation id="232" parent="1" name="utf8mb4_is_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="259" parent="1" name="utf8mb4_lt_0900_as_cs">
    <collation id="233" parent="1" name="utf8mb4_ja_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="260" parent="1" name="utf8mb4_sk_0900_as_cs">
    <collation id="234" parent="1" name="utf8mb4_ja_0900_as_cs_ks">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="261" parent="1" name="utf8mb4_es_trad_0900_as_cs">
    <collation id="235" parent="1" name="utf8mb4_la_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="262" parent="1" name="utf8mb4_la_0900_as_cs">
    <collation id="236" parent="1" name="utf8mb4_la_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="263" parent="1" name="utf8mb4_eo_0900_as_cs">
    <collation id="237" parent="1" name="utf8mb4_latvian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="264" parent="1" name="utf8mb4_hu_0900_as_cs">
    <collation id="238" parent="1" name="utf8mb4_lithuanian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="265" parent="1" name="utf8mb4_hr_0900_as_cs">
    <collation id="239" parent="1" name="utf8mb4_lt_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="266" parent="1" name="utf8mb4_vi_0900_as_cs">
    <collation id="240" parent="1" name="utf8mb4_lt_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="267" parent="1" name="utf8mb4_ja_0900_as_cs">
    <collation id="241" parent="1" name="utf8mb4_lv_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="268" parent="1" name="utf8mb4_ja_0900_as_cs_ks">
    <collation id="242" parent="1" name="utf8mb4_lv_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="269" parent="1" name="utf8mb4_0900_as_ci">
    <collation id="243" parent="1" name="utf8mb4_persian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="270" parent="1" name="utf8mb4_ru_0900_ai_ci">
    <collation id="244" parent="1" name="utf8mb4_pl_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="271" parent="1" name="utf8mb4_ru_0900_as_cs">
    <collation id="245" parent="1" name="utf8mb4_pl_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="272" parent="1" name="utf8mb4_zh_0900_as_cs">
    <collation id="246" parent="1" name="utf8mb4_polish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="273" parent="1" name="utf8mb4_0900_bin">
    <collation id="247" parent="1" name="utf8mb4_ro_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <schema id="274" parent="1" name="mysql">
    <collation id="248" parent="1" name="utf8mb4_ro_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="249" parent="1" name="utf8mb4_roman_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="250" parent="1" name="utf8mb4_romanian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="251" parent="1" name="utf8mb4_ru_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="252" parent="1" name="utf8mb4_ru_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="253" parent="1" name="utf8mb4_sinhala_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="254" parent="1" name="utf8mb4_sk_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="255" parent="1" name="utf8mb4_sk_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="256" parent="1" name="utf8mb4_sl_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="257" parent="1" name="utf8mb4_sl_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="258" parent="1" name="utf8mb4_slovak_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="259" parent="1" name="utf8mb4_slovenian_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="260" parent="1" name="utf8mb4_spanish2_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="261" parent="1" name="utf8mb4_spanish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="262" parent="1" name="utf8mb4_sv_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="263" parent="1" name="utf8mb4_sv_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="264" parent="1" name="utf8mb4_swedish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="265" parent="1" name="utf8mb4_tr_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="266" parent="1" name="utf8mb4_tr_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="267" parent="1" name="utf8mb4_turkish_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="268" parent="1" name="utf8mb4_unicode_520_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="269" parent="1" name="utf8mb4_unicode_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="270" parent="1" name="utf8mb4_vi_0900_ai_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="271" parent="1" name="utf8mb4_vi_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="272" parent="1" name="utf8mb4_vietnamese_ci">
      <Charset>utf8mb4</Charset>
    </collation>
    <collation id="273" parent="1" name="utf8mb4_zh_0900_as_cs">
      <Charset>utf8mb4</Charset>
    </collation>
    <schema id="274" parent="1" name="erp_user_info">
      <IntrospectionTimestamp>2024-01-22.17:05:18</IntrospectionTimestamp>
      <LocalIntrospectionTimestamp>2024-01-22.01:05:18</LocalIntrospectionTimestamp>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="275" parent="1" name="information_schema">
    <schema id="275" parent="1" name="gglass">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="276" parent="1" name="glog">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="277" parent="1" name="gmms">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="278" parent="1" name="hr">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="279" parent="1" name="information_schema">
      <CollationName>utf8_general_ci</CollationName>
    </schema>
    <schema id="276" parent="1" name="performance_schema">
    <schema id="280" parent="1" name="mesgglass">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="277" parent="1" name="sys">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="278" parent="1" name="gglass">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="279" parent="1" name="glog">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="280" parent="1" name="sapsd">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="281" parent="1" name="sappp">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="282" parent="1" name="sd">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="283" parent="1" name="pp">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="284" parent="1" name="sapglass">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="285" parent="1" name="sapglog">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="286" parent="1" name="hr">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="287" parent="1" name="mm">
    <schema id="281" parent="1" name="mm">
      <CollationName>utf8_general_ci</CollationName>
    </schema>
    <schema id="288" parent="1" name="mesgglass">
    <schema id="282" parent="1" name="mysql">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="289" parent="1" name="gmms">
    <schema id="283" parent="1" name="performance_schema">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="290" parent="1" name="erp_user_info">
      <IntrospectionTimestamp>2023-11-23.19:52:30</IntrospectionTimestamp>
      <LocalIntrospectionTimestamp>2023-11-23.03:52:30</LocalIntrospectionTimestamp>
    <schema id="284" parent="1" name="pp">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="291" parent="1" name="erp_sd">
      <IntrospectionTimestamp>2024-01-18.00:30:01</IntrospectionTimestamp>
      <LocalIntrospectionTimestamp>2024-01-17.08:30:01</LocalIntrospectionTimestamp>
    <schema id="285" parent="1" name="sapglass">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <user id="292" parent="1" name="root"/>
    <user id="293" parent="1" name="mysql.infoschema">
    <schema id="286" parent="1" name="sapglog">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="287" parent="1" name="sappp">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="288" parent="1" name="sapsd">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="289" parent="1" name="sd">
      <IntrospectionTimestamp>2024-01-22.17:05:10</IntrospectionTimestamp>
      <LocalIntrospectionTimestamp>2024-01-22.01:05:10</LocalIntrospectionTimestamp>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="290" parent="1" name="sd_ly">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <schema id="291" parent="1" name="sys">
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <user id="292" parent="1" name="mysql.infoschema">
      <CanLogin>0</CanLogin>
      <Host>localhost</Host>
      <Plugin>caching_sha2_password</Plugin>
    </user>
    <user id="294" parent="1" name="mysql.session">
    <user id="293" parent="1" name="mysql.session">
      <CanLogin>0</CanLogin>
      <Host>localhost</Host>
      <Plugin>caching_sha2_password</Plugin>
    </user>
    <user id="295" parent="1" name="mysql.sys">
    <user id="294" parent="1" name="mysql.sys">
      <CanLogin>0</CanLogin>
      <Host>localhost</Host>
      <Plugin>caching_sha2_password</Plugin>
    </user>
    <routine id="296" parent="290" name="02">
    <user id="295" parent="1" name="root"/>
    <routine id="296" parent="274" name="02">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>443</SourceTextLength>
    </routine>
    <routine id="297" parent="290" name="aa">
    <routine id="297" parent="274" name="aa">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>458</SourceTextLength>
    </routine>
    <routine id="298" parent="290" name="anquan">
    <routine id="298" parent="274" name="anquan">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>1536</SourceTextLength>
    </routine>
    <routine id="299" parent="290" name="app_denglu">
    <routine id="299" parent="274" name="app_denglu">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>826</SourceTextLength>
    </routine>
    <routine id="300" parent="290" name="app_version">
    <routine id="300" parent="274" name="app_version">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>73</SourceTextLength>
    </routine>
    <routine id="301" parent="290" name="banzuchaxun">
    <routine id="301" parent="274" name="banzuchaxun">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>87</SourceTextLength>
    </routine>
    <routine id="302" parent="290" name="bumenchaxun">
    <routine id="302" parent="274" name="bumenchaxun">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>85</SourceTextLength>
    </routine>
    <routine id="303" parent="290" name="caiDanQuanXian">
    <routine id="303" parent="274" name="caiDanQuanXian">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>143</SourceTextLength>
    </routine>
    <routine id="304" parent="290" name="caidan">
    <routine id="304" parent="274" name="caidan">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>629</SourceTextLength>
    </routine>
    <routine id="305" parent="290" name="chaxungongneng">
    <routine id="305" parent="274" name="chaxungongneng">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>72</SourceTextLength>
    </routine>
    <routine id="306" parent="290" name="chaxunmima">
    <routine id="306" parent="274" name="chaxunmima">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>66</SourceTextLength>
    </routine>
    <routine id="307" parent="290" name="denglu">
    <routine id="307" parent="274" name="denglu">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>957</SourceTextLength>
    </routine>
    <routine id="308" parent="290" name="dingdan_yewuyuan_chaxun1">
    <routine id="308" parent="274" name="dingdan_yewuyuan_chaxun1">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>115</SourceTextLength>
    </routine>
    <routine id="309" parent="290" name="exitsys">
    <routine id="309" parent="274" name="exitsys">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>559</SourceTextLength>
    </routine>
    <routine id="310" parent="290" name="fahuobaobiao">
    <routine id="310" parent="274" name="fahuobaobiao">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>6549</SourceTextLength>
    </routine>
    <routine id="311" parent="290" name="fenzuquanxian">
    <routine id="311" parent="274" name="fenzuquanxian">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>2097</SourceTextLength>
    </routine>
    <routine id="312" parent="290" name="gongneng">
    <routine id="312" parent="274" name="gongneng">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>192</SourceTextLength>
    </routine>
    <routine id="313" parent="290" name="mimachongzhi">
    <routine id="313" parent="274" name="mimachongzhi">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>108</SourceTextLength>
    </routine>
    <routine id="314" parent="290" name="mm">
    <routine id="314" parent="274" name="mm">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>345</SourceTextLength>
    </routine>
    <routine id="315" parent="290" name="mokuai">
    <routine id="315" parent="274" name="mokuai">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>507</SourceTextLength>
    </routine>
    <routine id="316" parent="290" name="mokuaichaxun">
    <routine id="316" parent="274" name="mokuaichaxun">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>77</SourceTextLength>
    </routine>
    <routine id="317" parent="290" name="quanxian_test">
    <routine id="317" parent="274" name="quanxian_test">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>241</SourceTextLength>
    </routine>
    <routine id="318" parent="290" name="quanxiancaidanchaxun">
    <routine id="318" parent="274" name="quanxiancaidanchaxun">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>179</SourceTextLength>
    </routine>
    <routine id="319" parent="290" name="quanxiangongengchaxun">
    <routine id="319" parent="274" name="quanxiangongengchaxun">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>645</SourceTextLength>
    </routine>
    <routine id="320" parent="290" name="quanxiangongneng">
    <routine id="320" parent="274" name="quanxiangongneng">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>234</SourceTextLength>
    </routine>
    <routine id="321" parent="290" name="quanxiantianjia">
    <routine id="321" parent="274" name="quanxiantianjia">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>238</SourceTextLength>
    </routine>
    <routine id="322" parent="290" name="renzichaxun">
    <routine id="322" parent="274" name="renzichaxun">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>85</SourceTextLength>
    </routine>
    <routine id="323" parent="290" name="shezhiquanxian">
    <routine id="323" parent="274" name="shezhiquanxian">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>2221</SourceTextLength>
    </routine>
    <routine id="324" parent="290" name="tianJiaGongNeng_Test">
    <routine id="324" parent="274" name="tianJiaGongNeng_Test">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>250</SourceTextLength>
    </routine>
    <routine id="325" parent="290" name="yonghuchaxun">
    <routine id="325" parent="274" name="yonghuchaxun">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>690</SourceTextLength>
    </routine>
    <routine id="326" parent="290" name="yuyan">
    <routine id="326" parent="274" name="yuyan">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>123</SourceTextLength>
    </routine>
    <routine id="327" parent="290" name="zhuce">
    <routine id="327" parent="274" name="zhuce">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>1231</SourceTextLength>
    </routine>
    <routine id="328" parent="290" name="zj">
    <routine id="328" parent="274" name="zj">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>216</SourceTextLength>
    </routine>
    <table id="329" parent="290" name="sys_menu">
    <table id="329" parent="274" name="sys_menu">
      <Engine>InnoDB</Engine>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </table>
    <table id="330" parent="290" name="sys_menu_item">
    <table id="330" parent="274" name="sys_menu_item">
      <Engine>InnoDB</Engine>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </table>
    <table id="331" parent="290" name="user">
    <table id="331" parent="274" name="user">
      <Engine>InnoDB</Engine>
      <Options>row_format
DYNAMIC</Options>
      <CollationName>utf8_general_ci</CollationName>
    </table>
    <routine id="332" parent="291" name="test">
      <Definer>root@%</Definer>
      <RoutineKind>procedure</RoutineKind>
      <SourceTextLength>341</SourceTextLength>
    </routine>
    <table id="333" parent="291" name="basic_glass_type">
      <Engine>InnoDB</Engine>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </table>
    <table id="334" parent="291" name="order">
      <Engine>InnoDB</Engine>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </table>
    <table id="335" parent="291" name="product">
      <Engine>InnoDB</Engine>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </table>
    <table id="336" parent="291" name="student">
      <Engine>InnoDB</Engine>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </table>
    <table id="337" parent="291" name="teacher">
      <Engine>InnoDB</Engine>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </table>
    <argument id="338" parent="296" name="cishu">
    <argument id="332" parent="296" name="cishu">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="339" parent="296" name="yuyanleixing1">
    <argument id="333" parent="296" name="yuyanleixing1">
      <DasType>varchar(50)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="340" parent="296" name="mokuainame1">
    <argument id="334" parent="296" name="mokuainame1">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="341" parent="296" name="caidanname1">
    <argument id="335" parent="296" name="caidanname1">
      <DasType>varchar(50)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="342" parent="296" name="yemian1">
    <argument id="336" parent="296" name="yemian1">
      <DasType>varchar(50)|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="343" parent="296" name="yuyanneirong1">
    <argument id="337" parent="296" name="yuyanneirong1">
      <DasType>varchar(50)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="344" parent="297" name="cishu">
    <argument id="338" parent="297" name="cishu">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="345" parent="297" name="yuyanid1">
    <argument id="339" parent="297" name="yuyanid1">
      <DasType>varchar(50)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="346" parent="297" name="yuyanleixing1">
    <argument id="340" parent="297" name="yuyanleixing1">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="347" parent="297" name="mokuainame1">
    <argument id="341" parent="297" name="mokuainame1">
      <DasType>varchar(50)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="348" parent="297" name="caidanname1">
    <argument id="342" parent="297" name="caidanname1">
      <DasType>varchar(50)|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="349" parent="297" name="yemian1">
    <argument id="343" parent="297" name="yemian1">
      <DasType>varchar(50)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="350" parent="297" name="yuyanneirong1">
    <argument id="344" parent="297" name="yuyanneirong1">
      <DasType>varchar(50)|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="351" parent="298" name="id">
    <argument id="345" parent="298" name="id">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="352" parent="298" name="tip">
    <argument id="346" parent="298" name="tip">
      <DasType>varchar(32)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="353" parent="298" name="ym">
    <argument id="347" parent="298" name="ym">
      <DasType>varchar(200)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="354" parent="298" name="fanhui">
    <argument id="348" parent="298" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="355" parent="298" name="aqkey">
    <argument id="349" parent="298" name="aqkey">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>varchar(30)|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="356" parent="298" name="usetime">
    <argument id="350" parent="298" name="usetime">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="357" parent="299" name="username">
    <argument id="351" parent="299" name="username">
      <DasType>varchar(20)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="358" parent="299" name="upwd">
    <argument id="352" parent="299" name="upwd">
      <DasType>varchar(20)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="359" parent="299" name="ym">
    <argument id="353" parent="299" name="ym">
      <DasType>varchar(200)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="360" parent="299" name="tip">
    <argument id="354" parent="299" name="tip">
      <DasType>varchar(32)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="361" parent="299" name="fanhui">
    <argument id="355" parent="299" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="362" parent="299" name="mingzi">
    <argument id="356" parent="299" name="mingzi">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>varchar(30)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="363" parent="299" name="aid">
    <argument id="357" parent="299" name="aid">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>varchar(15)|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="364" parent="303" name="adminid1">
    <argument id="358" parent="303" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="365" parent="303" name="mokuaiid1">
    <argument id="359" parent="303" name="mokuaiid1">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="366" parent="303" name="caidanid1">
    <argument id="360" parent="303" name="caidanid1">
      <DasType>int|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="367" parent="304" name="id">
    <argument id="361" parent="304" name="id">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="368" parent="304" name="mid">
    <argument id="362" parent="304" name="mid">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="369" parent="304" name="yuyan">
    <argument id="363" parent="304" name="yuyan">
      <DasType>varchar(20)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="370" parent="304" name="ip">
    <argument id="364" parent="304" name="ip">
      <DasType>varchar(100)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="371" parent="305" name="caidanid1">
    <argument id="365" parent="305" name="caidanid1">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="372" parent="306" name="adminid1">
    <argument id="366" parent="306" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="373" parent="307" name="username">
    <argument id="367" parent="307" name="username">
      <DasType>varchar(50)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="374" parent="307" name="upwd">
    <argument id="368" parent="307" name="upwd">
      <DasType>varchar(20)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="375" parent="307" name="ym">
    <argument id="369" parent="307" name="ym">
      <DasType>varchar(200)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="376" parent="307" name="tip">
    <argument id="370" parent="307" name="tip">
      <DasType>varchar(32)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="377" parent="307" name="fanhui">
    <argument id="371" parent="307" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="378" parent="307" name="mingzi">
    <argument id="372" parent="307" name="mingzi">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>varchar(30)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="379" parent="307" name="aid">
    <argument id="373" parent="307" name="aid">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>varchar(50)|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="380" parent="307" name="bumen1">
    <argument id="374" parent="307" name="bumen1">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>varchar(50)|0s</DasType>
      <Position>8</Position>
    </argument>
    <argument id="381" parent="309" name="adid">
    <argument id="375" parent="309" name="adid">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="382" parent="309" name="aqkey">
    <argument id="376" parent="309" name="aqkey">
      <DasType>varchar(30)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="383" parent="309" name="fanhui">
    <argument id="377" parent="309" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="384" parent="310" name="kaishi">
    <argument id="378" parent="310" name="kaishi">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="385" parent="310" name="jieshu">
    <argument id="379" parent="310" name="jieshu">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="386" parent="310" name="xianghao1">
    <argument id="380" parent="310" name="xianghao1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="387" parent="310" name="kuan1">
    <argument id="381" parent="310" name="kuan1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="388" parent="310" name="gao1">
    <argument id="382" parent="310" name="gao1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="389" parent="310" name="kehumingcheng1">
    <argument id="383" parent="310" name="kehumingcheng1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="390" parent="310" name="xiangmu1">
    <argument id="384" parent="310" name="xiangmu1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="391" parent="310" name="adminid1">
    <argument id="385" parent="310" name="adminid1">
      <DasType>varchar(20)|0s</DasType>
      <Position>8</Position>
    </argument>
    <argument id="392" parent="310" name="ip">
    <argument id="386" parent="310" name="ip">
      <DasType>varchar(20)|0s</DasType>
      <Position>9</Position>
    </argument>
    <argument id="393" parent="311" name="adminid1">
    <argument id="387" parent="311" name="adminid1">
      <DasType>text|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="394" parent="311" name="zhuangtai">
    <argument id="388" parent="311" name="zhuangtai">
      <DasType>text|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="395" parent="311" name="ip">
    <argument id="389" parent="311" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="396" parent="311" name="adminid3">
    <argument id="390" parent="311" name="adminid3">
      <DasType>varchar(50)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="397" parent="311" name="fanhui">
    <argument id="391" parent="311" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="398" parent="312" name="id">
    <argument id="392" parent="312" name="id">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="399" parent="312" name="cid">
    <argument id="393" parent="312" name="cid">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="400" parent="312" name="yuyan">
    <argument id="394" parent="312" name="yuyan">
      <DasType>varchar(20)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="401" parent="313" name="adminid1">
    <argument id="395" parent="313" name="adminid1">
      <DasType>varchar(20)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="402" parent="313" name="fanhui">
    <argument id="396" parent="313" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="403" parent="314" name="adminid1">
    <argument id="397" parent="314" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="404" parent="314" name="loginpwd1">
    <argument id="398" parent="314" name="loginpwd1">
      <DasType>varchar(15)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="405" parent="314" name="ip">
    <argument id="399" parent="314" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="406" parent="314" name="fanhui">
    <argument id="400" parent="314" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="407" parent="315" name="userid">
    <argument id="401" parent="315" name="userid">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="408" parent="315" name="yuyan">
    <argument id="402" parent="315" name="yuyan">
      <DasType>varchar(20)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="409" parent="315" name="ip">
    <argument id="403" parent="315" name="ip">
      <DasType>varchar(100)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="410" parent="317" name="cishu">
    <argument id="404" parent="317" name="cishu">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="411" parent="317" name="id">
    <argument id="405" parent="317" name="id">
      <DasType>varchar(10)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="412" parent="317" name="mokuai">
    <argument id="406" parent="317" name="mokuai">
      <DasType>int|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="413" parent="317" name="caidan">
    <argument id="407" parent="317" name="caidan">
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="414" parent="317" name="gongneng">
    <argument id="408" parent="317" name="gongneng">
      <DasType>int|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="415" parent="318" name="mid">
    <argument id="409" parent="318" name="mid">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="416" parent="318" name="yuyan">
    <argument id="410" parent="318" name="yuyan">
      <DasType>varchar(20)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="417" parent="319" name="adminid1">
    <argument id="411" parent="319" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="418" parent="319" name="caidanid1">
    <argument id="412" parent="319" name="caidanid1">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="419" parent="320" name="adminid1">
    <argument id="413" parent="320" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="420" parent="320" name="caidanid1">
    <argument id="414" parent="320" name="caidanid1">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="421" parent="322" name="gonghao1">
    <argument id="415" parent="322" name="gonghao1">
      <DasType>varchar(10)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="422" parent="323" name="adminid">
    <argument id="416" parent="323" name="adminid">
      <DasType>text|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="423" parent="323" name="mokuaiid">
    <argument id="417" parent="323" name="mokuaiid">
      <DasType>text|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="424" parent="323" name="caidanid">
    <argument id="418" parent="323" name="caidanid">
      <DasType>text|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="425" parent="323" name="gongnengid">
    <argument id="419" parent="323" name="gongnengid">
      <DasType>text|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="426" parent="323" name="zhuangtai">
    <argument id="420" parent="323" name="zhuangtai">
      <DasType>text|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="427" parent="323" name="ip">
    <argument id="421" parent="323" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="428" parent="323" name="adminid3">
    <argument id="422" parent="323" name="adminid3">
      <DasType>varchar(50)|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="429" parent="323" name="fanhui">
    <argument id="423" parent="323" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>8</Position>
    </argument>
    <argument id="430" parent="324" name="cishu">
    <argument id="424" parent="324" name="cishu">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="431" parent="324" name="kaishiId">
    <argument id="425" parent="324" name="kaishiId">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="432" parent="324" name="yemian1">
    <argument id="426" parent="324" name="yemian1">
      <DasType>varchar(200)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="433" parent="324" name="caidanId">
    <argument id="427" parent="324" name="caidanId">
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="434" parent="325" name="loginname1">
    <argument id="428" parent="325" name="loginname1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="435" parent="325" name="adminid">
    <argument id="429" parent="325" name="adminid">
      <DasType>varchar(10)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="436" parent="325" name="ip">
    <argument id="430" parent="325" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="437" parent="326" name="id">
    <argument id="431" parent="326" name="id">
      <DasType>varchar(50)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="438" parent="326" name="leixing">
    <argument id="432" parent="326" name="leixing">
      <DasType>varchar(50)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="439" parent="327" name="username">
    <argument id="433" parent="327" name="username">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="440" parent="327" name="upwd">
    <argument id="434" parent="327" name="upwd">
      <DasType>varchar(15)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="441" parent="327" name="xingming">
    <argument id="435" parent="327" name="xingming">
      <DasType>varchar(30)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="442" parent="327" name="bumenbianhao">
    <argument id="436" parent="327" name="bumenbianhao">
      <DasType>varchar(10)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="443" parent="327" name="bumen">
    <argument id="437" parent="327" name="bumen">
      <DasType>varchar(50)|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="444" parent="327" name="banzu">
    <argument id="438" parent="327" name="banzu">
      <DasType>varchar(50)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="445" parent="327" name="ip">
    <argument id="439" parent="327" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="446" parent="327" name="banzubianhao">
    <argument id="440" parent="327" name="banzubianhao">
      <DasType>varchar(50)|0s</DasType>
      <Position>8</Position>
    </argument>
    <argument id="447" parent="327" name="fanhui">
    <argument id="441" parent="327" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>9</Position>
    </argument>
    <argument id="448" parent="328" name="adminid1">
    <argument id="442" parent="328" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <column id="449" parent="329" name="id">
    <column id="443" parent="329" name="id">
      <AutoIncrement>4</AutoIncrement>
      <Comment>自增id</Comment>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="450" parent="329" name="menuName">
    <column id="444" parent="329" name="menuName">
      <Comment>模块名称</Comment>
      <DasType>varchar(255)|0s</DasType>
      <Position>2</Position>
    </column>
    <column id="451" parent="329" name="languageType">
      <Comment>语言类型</Comment>
      <DasType>varchar(10)|0s</DasType>
    <column id="445" parent="329" name="icon">
      <DasType>varchar(255)|0s</DasType>
      <Position>3</Position>
    </column>
    <column id="452" parent="329" name="state">
      <Comment>状态</Comment>
      <DasType>int|0s</DasType>
    <column id="446" parent="329" name="languageType">
      <Comment>语言类型</Comment>
      <DasType>varchar(10)|0s</DasType>
      <Position>4</Position>
    </column>
    <column id="453" parent="329" name="listSort">
      <Comment>排序</Comment>
      <DasType>varchar(255)|0s</DasType>
    <column id="447" parent="329" name="state">
      <Comment>状态</Comment>
      <DasType>int|0s</DasType>
      <Position>5</Position>
    </column>
    <column id="454" parent="329" name="createTime">
    <column id="448" parent="329" name="listSort">
      <Comment>排序</Comment>
      <DasType>varchar(255)|0s</DasType>
      <Position>6</Position>
    </column>
    <column id="449" parent="329" name="createTime">
      <Comment>创建时间</Comment>
      <DasType>datetime|0s</DasType>
      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
      <NotNull>1</NotNull>
      <Position>6</Position>
      <Position>7</Position>
    </column>
    <index id="455" parent="329" name="PRIMARY">
    <index id="450" parent="329" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <key id="456" parent="329" name="PRIMARY">
    <key id="451" parent="329" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <column id="457" parent="330" name="id">
      <AutoIncrement>1</AutoIncrement>
    <column id="452" parent="330" name="id">
      <AutoIncrement>22</AutoIncrement>
      <Comment>自增id</Comment>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="458" parent="330" name="menuID">
    <column id="453" parent="330" name="menuID">
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>2</Position>
    </column>
    <column id="459" parent="330" name="itemName">
    <column id="454" parent="330" name="itemName">
      <Comment>菜单名称</Comment>
      <DasType>varchar(255)|0s</DasType>
      <NotNull>1</NotNull>
      <Position>3</Position>
    </column>
    <column id="460" parent="330" name="url">
    <column id="455" parent="330" name="url">
      <Comment>地址</Comment>
      <DasType>varchar(255)|0s</DasType>
      <NotNull>1</NotNull>
      <Position>4</Position>
    </column>
    <column id="461" parent="330" name="languageType">
    <column id="456" parent="330" name="languageType">
      <Comment>语言类型</Comment>
      <DasType>varchar(255)|0s</DasType>
      <NotNull>1</NotNull>
      <Position>5</Position>
    </column>
    <column id="462" parent="330" name="state">
    <column id="457" parent="330" name="state">
      <Comment>状态</Comment>
      <DasType>int|0s</DasType>
      <DefaultExpression>1</DefaultExpression>
      <NotNull>1</NotNull>
      <Position>6</Position>
    </column>
    <column id="463" parent="330" name="listSort">
    <column id="458" parent="330" name="listSort">
      <Comment>排序</Comment>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>7</Position>
    </column>
    <column id="464" parent="330" name="createTime">
    <column id="459" parent="330" name="createTime">
      <Comment>创建时间</Comment>
      <DasType>datetime|0s</DasType>
      <NotNull>1</NotNull>
      <Position>8</Position>
    </column>
    <foreign-key id="465" parent="330" name="menuid">
    <foreign-key id="460" parent="330" name="menuid">
      <ColNames>menuID</ColNames>
      <RefColNames>id</RefColNames>
      <RefTableName>sys_menu</RefTableName>
    </foreign-key>
    <index id="466" parent="330" name="PRIMARY">
    <index id="461" parent="330" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <index id="467" parent="330" name="menuid">
    <index id="462" parent="330" name="menuid">
      <ColNames>menuID</ColNames>
      <Type>btree</Type>
    </index>
    <key id="468" parent="330" name="PRIMARY">
    <key id="463" parent="330" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <column id="469" parent="331" name="id">
      <AutoIncrement>39</AutoIncrement>
    <column id="464" parent="331" name="id">
      <AutoIncrement>40</AutoIncrement>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="470" parent="331" name="login_name">
    <column id="465" parent="331" name="login_name">
      <DasType>varchar(15)|0s</DasType>
      <NotNull>1</NotNull>
      <Position>2</Position>
    </column>
    <column id="471" parent="331" name="password">
    <column id="466" parent="331" name="password">
      <DasType>varchar(15)|0s</DasType>
      <NotNull>1</NotNull>
      <Position>3</Position>
    </column>
    <column id="472" parent="331" name="user_name">
    <column id="467" parent="331" name="user_name">
      <DasType>varchar(30)|0s</DasType>
      <NotNull>1</NotNull>
      <Position>4</Position>
    </column>
    <column id="473" parent="331" name="address">
    <column id="468" parent="331" name="address">
      <DasType>varchar(50)|0s</DasType>
      <Position>5</Position>
    </column>
    <column id="474" parent="331" name="phone">
    <column id="469" parent="331" name="phone">
      <DasType>varchar(20)|0s</DasType>
      <Position>6</Position>
    </column>
    <column id="475" parent="331" name="create_time">
    <column id="470" parent="331" name="create_time">
      <DasType>datetime|0s</DasType>
      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
      <Position>7</Position>
    </column>
    <column id="476" parent="331" name="update_time">
    <column id="471" parent="331" name="update_time">
      <DasType>datetime|0s</DasType>
      <Position>8</Position>
    </column>
    <column id="477" parent="331" name="state">
    <column id="472" parent="331" name="state">
      <DasType>int|0s</DasType>
      <DefaultExpression>1</DefaultExpression>
      <Position>9</Position>
    </column>
    <index id="478" parent="331" name="PRIMARY">
    <index id="473" parent="331" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <key id="479" parent="331" name="PRIMARY">
    <key id="474" parent="331" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <trigger id="480" parent="331" name="logName">
    <trigger id="475" parent="331" name="logName">
      <Definer>root@%</Definer>
      <Events>I</Events>
      <SourceTextLength>77</SourceTextLength>
      <Turn>before-row</Turn>
    </trigger>
    <column id="481" parent="333" name="id">
      <AutoIncrement>4</AutoIncrement>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="482" parent="333" name="level">
      <Comment>玻璃类别等级</Comment>
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </column>
    <column id="483" parent="333" name="belong">
      <Comment>二级类别所属一级类比</Comment>
      <DasType>varchar(4)|0s</DasType>
      <Position>3</Position>
    </column>
    <column id="484" parent="333" name="typeID">
      <Comment>类别id</Comment>
      <DasType>varchar(4)|0s</DasType>
      <Position>4</Position>
    </column>
    <column id="485" parent="333" name="typeName">
      <Comment>类别名称</Comment>
      <DasType>varchar(20)|0s</DasType>
      <Position>5</Position>
    </column>
    <column id="486" parent="333" name="createTime">
      <Comment>创建时间</Comment>
      <DasType>datetime|0s</DasType>
      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
      <Position>6</Position>
    </column>
    <index id="487" parent="333" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <index id="488" parent="333" name="typeID">
      <ColNames>typeID</ColNames>
      <Type>btree</Type>
    </index>
    <key id="489" parent="333" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <column id="490" parent="334" name="id">
      <AutoIncrement>51</AutoIncrement>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="491" parent="334" name="order_id">
      <Comment>订单号</Comment>
      <DasType>varchar(255)|0s</DasType>
      <NotNull>1</NotNull>
      <Position>2</Position>
    </column>
    <column id="492" parent="334" name="recipe_no">
      <Comment>配方号</Comment>
      <DasType>varchar(255)|0s</DasType>
      <Position>3</Position>
    </column>
    <column id="493" parent="334" name="largeglass_no">
      <Comment>大片总数量</Comment>
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </column>
    <column id="494" parent="334" name="largeglass_completed">
      <Comment>大片已完成</Comment>
      <DasType>int|0s</DasType>
      <DefaultExpression>0</DefaultExpression>
      <Position>5</Position>
    </column>
    <column id="495" parent="334" name="smallglass_no">
      <Comment>小片总量</Comment>
      <DasType>int|0s</DasType>
      <Position>6</Position>
    </column>
    <column id="496" parent="334" name="smallglass_completed">
      <Comment>小片已完成</Comment>
      <DasType>int|0s</DasType>
      <DefaultExpression>0</DefaultExpression>
      <Position>7</Position>
    </column>
    <column id="497" parent="334" name="smallglass_processing">
      <Comment>小片待加工</Comment>
      <DasType>int|0s</DasType>
      <Position>8</Position>
    </column>
    <column id="498" parent="334" name="smallglass_worn">
      <Comment>小片次破</Comment>
      <DasType>int|0s</DasType>
      <DefaultExpression>0</DefaultExpression>
      <Position>9</Position>
    </column>
    <column id="499" parent="334" name="order_status">
      <Comment>订单状态&#xd;
(0：创建&#xd;
1：审核&#xd;
2.下发领取&#xd;
3.完成&#xd;
)&#xd;
</Comment>
      <DasType>int|0s</DasType>
      <DefaultExpression>0</DefaultExpression>
      <Position>10</Position>
    </column>
    <column id="500" parent="334" name="order_maker">
      <Comment>制单员</Comment>
      <DasType>varchar(255)|0s</DasType>
      <Position>11</Position>
    </column>
    <column id="501" parent="334" name="make_time">
      <Comment>制单时间</Comment>
      <DasType>datetime|0s</DasType>
      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
      <Position>12</Position>
    </column>
    <column id="502" parent="334" name="update_time">
      <Comment>修改时间</Comment>
      <DasType>datetime|0s</DasType>
      <Position>13</Position>
    </column>
    <index id="503" parent="334" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <index id="504" parent="334" name="order_id">
      <ColNames>order_id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <key id="505" parent="334" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <key id="506" parent="334" name="order_id">
      <UnderlyingIndexName>order_id</UnderlyingIndexName>
    </key>
    <column id="507" parent="335" name="id">
      <AutoIncrement>46975</AutoIncrement>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="508" parent="335" name="prodID">
      <DasType>varchar(10)|0s</DasType>
      <Position>2</Position>
    </column>
    <column id="509" parent="335" name="product">
      <DasType>varchar(100)|0s</DasType>
      <Position>3</Position>
    </column>
    <column id="510" parent="335" name="glassType">
      <DasType>varchar(10)|0s</DasType>
      <Position>4</Position>
    </column>
    <column id="511" parent="335" name="totalThickness">
      <DasType>decimal(5,2 digit)|0s</DasType>
      <Position>5</Position>
    </column>
    <column id="512" parent="335" name="thickness">
      <DasType>decimal(5,2 digit)|0s</DasType>
      <Position>6</Position>
    </column>
    <column id="513" parent="335" name="Query">
      <DasType>varchar(30)|0s</DasType>
      <Position>7</Position>
    </column>
    <column id="514" parent="335" name="remarks">
      <DasType>varchar(255)|0s</DasType>
      <Position>8</Position>
    </column>
    <column id="515" parent="335" name="state">
      <DasType>int|0s</DasType>
      <DefaultExpression>0</DefaultExpression>
      <Position>9</Position>
    </column>
    <column id="516" parent="335" name="creator">
      <DasType>varchar(10)|0s</DasType>
      <Position>10</Position>
    </column>
    <column id="517" parent="335" name="createTime">
      <DasType>datetime|0s</DasType>
      <Position>11</Position>
    </column>
    <column id="518" parent="335" name="updateTime">
      <DasType>datetime|0s</DasType>
      <Position>12</Position>
    </column>
    <foreign-key id="519" parent="335" name="glassType">
      <ColNames>glassType</ColNames>
      <RefColNames>typeID</RefColNames>
      <RefTableName>basic_glass_type</RefTableName>
    </foreign-key>
    <index id="520" parent="335" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <index id="521" parent="335" name="glassType">
      <ColNames>glassType</ColNames>
      <Type>btree</Type>
    </index>
    <key id="522" parent="335" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <column id="523" parent="336" name="id">
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="524" parent="336" name="name">
      <DasType>varchar(255)|0s</DasType>
      <Position>2</Position>
    </column>
    <column id="525" parent="336" name="teacherid">
      <DasType>int|0s</DasType>
      <Position>3</Position>
    </column>
    <index id="526" parent="336" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <key id="527" parent="336" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <column id="528" parent="337" name="id">
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="529" parent="337" name="teacher_name">
      <DasType>varchar(255)|0s</DasType>
      <Position>2</Position>
    </column>
    <index id="530" parent="337" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <key id="531" parent="337" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
  </database-model>
</dataSource>

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta

@@ -1,2 +1,2 @@
#n:erp_sd
!<md> [1705509001000, 0, null, null, -2147483648, -2147483648]
!<md> [1705914095000, 0, null, null, -2147483648, -2147483648]

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta

@@ -1,2 +1,2 @@
#n:erp_user_info
!<md> [null, 0, null, null, -2147483648, -2147483648]
!<md> [1705914318000, 0, null, null, -2147483648, -2147483648]

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip

Binary files differ

 north-glass-erp/.idea/workspace.xml

@@ -5,28 +5,25 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="402214ec-6c93-4a9d-b589-f17dc90f718e" name="更改" comment="11.24提交">
      <change afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProcessCardProgress.vue" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/service/IOrderService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/erp/service/IOrderServiceTest.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/package-lock.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/package.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/layout/MainErpView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/layout/MainErpView.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/router/index.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProductionSchedule.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProductionSchedule.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/Report.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/Report.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/order/SelectOrder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/order/SelectOrder.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Product.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Product.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/controller/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/controller/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/Order.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/Order.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/mapper/OrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/mapper/OrderMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/stores/sd/product/productGlassType.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/stores/sd/product/productGlassType.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/controller/sd/ProductController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/controller/sd/ProductController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/sd/Product.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/sd/Product.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/mapper/sd/ProductMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/mapper/sd/ProductMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/service/sd/BasicGlassTypeServise.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/service/sd/BasicGlassTypeServise.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/service/sd/ProductService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/service/sd/ProductService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/sd/Product.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/sd/Product.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/test/java/com/example/erp/service/IOrderServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/erp/service/IOrderServiceTest.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/target/classes/mapper/sd/Product.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/sd/Product.xml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -42,6 +39,7 @@
        <option value="JUnit5 Test Class" />
        <option value="Class" />
        <option value="Interface" />
        <option value="JavaScript File" />
      </list>
    </option>
  </component>
@@ -73,50 +71,53 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
    &quot;com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary&quot;: &quot;JUnit5&quot;,
    &quot;com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5&quot;: &quot;&quot;,
    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/components/pp/processCard&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
    &quot;spring.configuration.checksum&quot;: &quot;def6d90e829e50c63f98c387daecd138&quot;,
    &quot;ts.external.directory.path&quot;: &quot;D:\\file\\IntelliJ IDEA 2023.2.1\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "RequestMappingsPanelOrder0": "0",
    "RequestMappingsPanelOrder1": "1",
    "RequestMappingsPanelWidth0": "75",
    "RequestMappingsPanelWidth1": "75",
    "RunOnceActivity.OpenProjectViewOnStart": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
    "WebServerToolWindowFactoryState": "false",
    "com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary": "JUnit5",
    "com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5": "",
    "git-widget-placeholder": "master",
    "last_opened_file_path": "D:/Documents/ERP_override/north-glass-erp/northglass-erp/src/views/sd/product",
    "node.js.detected.package.eslint": "true",
    "node.js.detected.package.tslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "nodejs_package_manager_path": "npm",
    "project.structure.last.edited": "模块",
    "project.structure.proportion": "0.0",
    "project.structure.side.proportion": "0.0",
    "settings.editor.selected.configurable": "MavenSettings",
    "spring.configuration.checksum": "def6d90e829e50c63f98c387daecd138",
    "ts.external.directory.path": "D:\\file\\IntelliJ IDEA 2023.2.1\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
    "vue.rearranger.settings.migration": "true"
  },
  &quot;keyToStringList&quot;: {
    &quot;vue.recent.templates&quot;: [
      &quot;Vue Composition API Component&quot;
  "keyToStringList": {
    "DatabaseDriversLRU": [
      "mysql"
    ],
    "vue.recent.templates": [
      "Vue Composition API Component"
    ]
  }
}</component>
}]]></component>
  <component name="RecentsManager">
    <key name="CreateClassDialog.RecentsKey">
      <recent name="com.example.erp.tools" />
      <recent name="com.example.erp.config" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="D:\Documents\ERP_override\north-glass-erp\northglass-erp\src\views\sd\product" />
      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\components\pp\processCard" />
      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\components\pp\workorder" />
      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\views\pp\workOrder" />
      <recent name="D:\Documents\north-glass-erp\src\main\resources\mapper\userInfo" />
      <recent name="D:\projct\document\north-glass-erp\src\main\java\com\example\erp\service\userInfo" />
    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="D:\EPR-Refactoring\north-glass-erp\northglass-erp\src\views" />
@@ -152,6 +153,12 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="generated-requests | #2" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http" index="2" requestIdentifier="#2" runType="运行单个请求">
      <method v="2" />
    </configuration>
    <configuration name="generated-requests中的所有" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http">
      <method v="2" />
    </configuration>
    <configuration name="IOrderServiceTest.testGetOrderList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
      <module name="erp" />
      <extension name="coverage">
@@ -186,12 +193,16 @@
      <method v="2" />
    </configuration>
    <list>
      <item itemvalue="HTTP 请求.generated-requests | #2" />
      <item itemvalue="HTTP 请求.generated-requests中的所有" />
      <item itemvalue="JUnit.IOrderServiceTest.testGetOrderList" />
      <item itemvalue="npm.dev" />
      <item itemvalue="Spring Boot.ErpApplication" />
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="HTTP 请求.generated-requests中的所有" />
        <item itemvalue="HTTP 请求.generated-requests | #2" />
        <item itemvalue="JUnit.IOrderServiceTest.testGetOrderList" />
      </list>
    </recent_temporary>
@@ -262,6 +273,8 @@
      <workItem from="1704934272962" duration="24370000" />
      <workItem from="1705472069182" duration="421000" />
      <workItem from="1705472543537" duration="15202000" />
      <workItem from="1705884104780" duration="598000" />
      <workItem from="1705884720189" duration="21268000" />
    </task>
    <task id="LOCAL-00001" summary="第一次推送">
      <option name="closed" value="true" />
@@ -426,19 +439,28 @@
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
          <line>38</line>
          <option name="timeStamp" value="4" />
          <url>file://$PROJECT_DIR$/northglass-erp/src/components/basic/BasicTable.vue</url>
          <line>1</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="9" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
          <line>254</line>
          <option name="timeStamp" value="7" />
          <line>178</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="12" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
          <line>179</line>
          <option name="timeStamp" value="8" />
          <line>291</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="13" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
          <line>148</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="14" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>

 north-glass-erp/northglass-erp/src/layout/MainErpView.vue

@@ -12,7 +12,6 @@
const router = useRouter()
const userStore = useUserInfoStore()
const user = userStore.user.userName
console.log(userStore.user)
store.createWebSocket();
function quit(){
  userStore.$patch({

 north-glass-erp/northglass-erp/src/router/index.js

@@ -52,6 +52,7 @@
              component: () => import('../views/sd/product/testSort.vue')
            },
            {
              name: 'product',
              path: '',
              redirect:'/main/product/selectProduct'
            }

 north-glass-erp/northglass-erp/src/stores/sd/product/productGlassType.js

@@ -3,7 +3,7 @@

export  default defineStore("productGlassType",{
    state: () =>{
        let GlassType=$ref('')
        let GlassType=$ref(['',''])
        return {
            GlassType
        }

 north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue

@@ -13,10 +13,19 @@
let productGlassTypeStore = useProductGlassTypeStore()
let router=useRouter()
//监听玻璃类型改变
let productList = ref([])

let glassType = ref([])
watch(productGlassTypeStore,(newVal,oldVal) => {
  let list = productList.filter( product=>{
    return  product.glassType==newVal.GlassType
  request.post("/product/1/100/"+productGlassTypeStore.GlassType,filterData.value).then((res) => {
    if(res.code==200){
      xGrid.value.loadData(res.data)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
    }
  })

})

let scrollTop =ref(null)
@@ -28,7 +37,11 @@
  scrollHeight.value = row.$event.target.scrollHeight
  clientHeight.value = row.$event.target.clientHeight
}

let filterData = ref({
  basicGlassType:{
    typeName:''
  }
})

let produceList = ref([])
let pageNum=$ref(1)
@@ -67,7 +80,7 @@
  }
  if(pageState!==null){
    gridOptions.loading=true
    request.get(`/product/${pageNum}/100`).then((res) => {
    request.post(`/product/${pageNum}/100`,filterData.value).then((res) => {
      try{
        if(res.code==200){
          if(pageState){
@@ -100,15 +113,13 @@
    }*/

})
request.get("/product/1/100").then((res) => {
request.post("/product/1/100/"+productGlassTypeStore.GlassType,filterData.value).then((res) => {
  if(res.code==200){
    produceList = produceList.value.concat(deepClone(res.data))

    xGrid.value.reloadData(produceList)
    gridOptions.loading=false
  }else{
    ElMessage.warning(res.msg)
    router.push("/login")
  }
})

@@ -169,14 +180,15 @@
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {type: 'seq',fixed:"left", title: '自序', width: 80 },
    {title: '操作', width: 110, slots: { default: 'button_slot' },fixed:"left"},
    {field: 'prodID', title: '编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'product', title: '名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'typeName', title: '所属类别',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'query', title: '快速查询',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'remarks', title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'creator', title: '创建人',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'createTime', title: '创建时间',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
    {field: 'id', title: '编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'productName', title: '名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'basicGlassType.typeName', title: '所属类别',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'query', title: '快速查询',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'remarks', title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'creator', title: '创建人',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'createTime', title: '创建时间',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false}
  ],//表头参数
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    import: false,
@@ -198,7 +210,7 @@

})


//表格拖拽
let sortable2: any

const columnDrop2 = () => {
@@ -249,6 +261,39 @@
  }
})

const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}
function filterChanged(column){
  gridOptions.loading=true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0]!=undefined?column.datas[0]:''
  value = value.trim()
  //判断是否存在外键
  if (column.property.indexOf('.')>-1){
    const  columnArr = column.property.split('.')
    filterData.value[columnArr[0]] = {
      [columnArr[1]]:value
    }
  }else{
    filterData.value[column.property] = value
  }
  request.post("/product/1/100/"+productGlassTypeStore.GlassType,filterData.value).then((res) => {
    if(res.code==200){
      produceList = deepClone(res.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
    }
  })
}
const hasDecimal = (value) => {
  const regex = /\./; // 定义正则表达式，查找小数点
  return regex.test(value); // 返回true/false
  }


</script>

@@ -263,6 +308,7 @@


    <vxe-grid
        @filter-change="filterChanged"
        max-height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -277,7 +323,9 @@
        <ul class="expand-wrapper">
          <li  v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{item.title+':  '}}</span>
            <span>{{ row[item.field] }}</span>
            <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
            <span v-else>{{ row[item.field] }}</span>

          </li>
        </ul>
      </template>

 north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java

@@ -1,9 +1,13 @@
package com.example.erp.controller.sd;

import com.example.erp.common.Result;
import com.example.erp.entity.sd.Product;
import com.example.erp.service.sd.ProductService;
import org.apache.ibatis.annotations.Delete;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("/product")
@@ -11,8 +15,9 @@
    @Autowired
    ProductService productService;

    @GetMapping("/{pageNum}/{pageSize}")
    public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(productService.defaultDateProduct(pageNum,pageSize));
    @PostMapping  ("/{pageNum}/{pageSize}/{glassType}")
    public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> glassType, @RequestBody Product product){
        
        return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product));
    }
}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java

@@ -4,21 +4,22 @@
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.time.LocalDate;

@Data
public class Product {
    @TableId(type = IdType.AUTO)
    private Integer id;
    private String prodID;
    private String product;
    private String glassType;
    private Long id;
    private String productName;
    private String typeName;
    private Double totalThickness;
    private Double thickness;
    private String Query;
    private String query;
    private String remarks;
    private Integer state;
    private String creator;
    private String createTime;
    private String updateTime;
    private LocalDate createTime;
    private LocalDate updateTime;
    private BasicGlassType basicGlassType;

}

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java

@@ -8,5 +8,8 @@

@Mapper
public interface ProductMapper {
    List<Product> defaultProduct(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
    List<Product> defaultProduct(@Param("offset") Integer offset,
                                 @Param("pageSize") Integer pageSiz,
                                 @Param("glassTypeId") String glassTypeId,
                                 @Param("product") Product product);
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeServise.java

@@ -10,7 +10,7 @@
import java.util.*;

@Service
@DS("erp_sd")
@DS("sd")
public class BasicGlassTypeServise {
    @Autowired
    BasicGlassTypeMapper basicGlassTypeMapper;

 north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java

@@ -9,12 +9,16 @@
import java.util.List;

@Service
@DS("erp_sd")
@DS("sd")
public class ProductService {
    @Autowired
    ProductMapper productMapper;
    public List<Product> defaultDateProduct(Integer pageNum,Integer pageSize) {
    public List<Product> defaultDateProduct(Integer pageNum,Integer pageSize,List<String> glassType,Product product) {
        Integer offset = (pageNum-1)*pageSize;
        return productMapper.defaultProduct(offset,pageSize);
        String glassTypeId = null;
        if(glassType.size()>1){
            glassTypeId = glassType.get(1);
        }
        return productMapper.defaultProduct(offset,pageSize,glassTypeId,product);
    }
}

 north-glass-erp/src/main/resources/mapper/sd/Product.xml

@@ -3,24 +3,64 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
    <select id="defaultProduct">
        select
            a.id,
            prodID,
            product,
            glassType,
            typeName,
            totalThickness,
            thickness,
            Query,
            remarks,
            state,
            creator,
            date(a.createTime) as 'createTime',
            updateTime
        from
            product as a
        left join basic_glass_type bgt on bgt.typeID = a.glassType
    <resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
        <id column="id" property="id"/>
        <result column="product_name" property="productName"/>
        <result column="total_thickness" property="totalThickness"/>
        <result column="thickness" property="thickness"/>
        <result column="query" property="query"/>
        <result column="remarks" property="remarks"/>
        <result column="state" property="state"/>
        <result column="creator" property="creator"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
            <result column="type_id" property="typeID"/>
            <result column="type_name" property="typeName"/>
        </association>
        <!--<result column="g_typeId" property="glassTypes.typeId"/>
        <result column="g_type" property="glassTypes.type"/>-->

    </resultMap>

    <select id="defaultProduct" resultMap="productmap">
        select a.id as id,
        a.product_name,
        a.total_thickness,
        a.thickness,
        a.query,
        a.remarks,
        a.state,
        a.creator,
        date(a.create_time) as create_time,
        a.update_time       as update_time,
        a.type_id         as type_id,
        bgt.type_name
        from product as a
        left join basic_glass_type bgt on bgt.type_id = a.type_id
        <where>
            <if test="glassTypeId != null and glassTypeId != ''">
                and a.type_id regexp #{glassTypeId}
            </if>
            <if test="product.id != null and product.id != ''">
                and a.id regexp #{product.id}
            </if>
            <if test="product.productName != null and product.productName != ''">
                and a.product_name regexp #{product.productName}
            </if>
            <if test="product.basicGlassType.typeName != null and product.basicGlassType.typeName!= ''">
                and bgt.type_name regexp #{product.basicGlassType.typeName}
            </if>
            <if test="product.query != null and product.query != ''">
                and a.query regexp #{product.query}
            </if>
            <if test="product.creator != null and product.creator != ''">
                and a.creator regexp #{product.creator}
            </if>
            <if test="product.createTime != null and product.createTime != ''">
                and date(a.create_time) regexp #{product.createTime}
            </if>
        </where>

        order by id desc
        limit #{offset},#{pageSize}

 north-glass-erp/src/test/java/com/example/erp/service/IOrderServiceTest.java

@@ -8,12 +8,9 @@
class IOrderServiceTest {
    @Autowired
    private IOrderService iOrderService;
    private StudentMapper studentMapper;

    @Test
    void  testGetOrderList() {
        // 测试获取订单列表的方法
        //System.out.println(iOrderService.getById(2));
        System.out.println(studentMapper.getStudentTeacher());
    }
}

 north-glass-erp/target/classes/mapper/sd/Product.xml

@@ -3,24 +3,64 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
    <select id="defaultProduct">
        select
            a.id,
            prodID,
            product,
            glassType,
            typeName,
            totalThickness,
            thickness,
            Query,
            remarks,
            state,
            creator,
            date(a.createTime) as 'createTime',
            updateTime
        from
            product as a
        left join basic_glass_type bgt on bgt.typeID = a.glassType
    <resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
        <id column="id" property="id"/>
        <result column="product_name" property="productName"/>
        <result column="total_thickness" property="totalThickness"/>
        <result column="thickness" property="thickness"/>
        <result column="query" property="query"/>
        <result column="remarks" property="remarks"/>
        <result column="state" property="state"/>
        <result column="creator" property="creator"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
            <result column="type_id" property="typeID"/>
            <result column="type_name" property="typeName"/>
        </association>
        <!--<result column="g_typeId" property="glassTypes.typeId"/>
        <result column="g_type" property="glassTypes.type"/>-->

    </resultMap>

    <select id="defaultProduct" resultMap="productmap">
        select a.id as id,
        a.product_name,
        a.total_thickness,
        a.thickness,
        a.query,
        a.remarks,
        a.state,
        a.creator,
        date(a.create_time) as create_time,
        a.update_time       as update_time,
        a.type_id         as type_id,
        bgt.type_name
        from product as a
        left join basic_glass_type bgt on bgt.type_id = a.type_id
        <where>
            <if test="glassTypeId != null and glassTypeId != ''">
                and a.type_id regexp #{glassTypeId}
            </if>
            <if test="product.id != null and product.id != ''">
                and a.id regexp #{product.id}
            </if>
            <if test="product.productName != null and product.productName != ''">
                and a.product_name regexp #{product.productName}
            </if>
            <if test="product.basicGlassType.typeName != null and product.basicGlassType.typeName!= ''">
                and bgt.type_name regexp #{product.basicGlassType.typeName}
            </if>
            <if test="product.query != null and product.query != ''">
                and a.query regexp #{product.query}
            </if>
            <if test="product.creator != null and product.creator != ''">
                and a.creator regexp #{product.creator}
            </if>
            <if test="product.createTime != null and product.createTime != ''">
                and date(a.create_time) regexp #{product.createTime}
            </if>
        </where>

        order by id desc
        limit #{offset},#{pageSize}