修改实体

廖井涛

2024-01-22 2bf272a9d41a2b6c67910b23371af9537a9153a5

修改实体

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

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="dataSourceStorageLocal" created-in="IU-232.9559.62">
  <component name="dataSourceStorageLocal" created-in="IU-232.8660.185">
    <data-source name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
      <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>
        <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>

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

@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataSource name="@localhost [2]">
  <database-model serializer="dbm" dbms="MYSQL" family-id="MYSQL" format-version="4.49">
    <root id="1">
      <DefaultEngine>InnoDB</DefaultEngine>
      <DefaultTmpEngine>InnoDB</DefaultTmpEngine>
      <ServerVersion>8.0.22</ServerVersion>
    </root>
    <root id="1"/>
    <collation id="2" parent="1" name="armscii8_general_ci">
      <Charset>armscii8</Charset>
      <DefaultForCharset>1</DefaultForCharset>
@@ -917,8 +913,8 @@
      <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>
      <IntrospectionTimestamp>2023-11-27.16:24:50</IntrospectionTimestamp>
      <LocalIntrospectionTimestamp>2023-11-27.00:24:50</LocalIntrospectionTimestamp>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </schema>
    <user id="292" parent="1" name="root"/>
@@ -1116,919 +1112,768 @@
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">
    <table id="332" parent="291" name="basic_glass_type">
      <Engine>InnoDB</Engine>
      <CollationName>utf8mb4_0900_ai_ci</CollationName>
    </table>
    <table id="334" parent="291" name="order">
    <table id="333" parent="291" name="product">
      <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="334" parent="296" name="cishu">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="339" parent="296" name="yuyanleixing1">
    <argument id="335" parent="296" name="yuyanleixing1">
      <DasType>varchar(50)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="340" parent="296" name="mokuainame1">
    <argument id="336" parent="296" name="mokuainame1">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="341" parent="296" name="caidanname1">
    <argument id="337" parent="296" name="caidanname1">
      <DasType>varchar(50)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="342" parent="296" name="yemian1">
    <argument id="338" parent="296" name="yemian1">
      <DasType>varchar(50)|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="343" parent="296" name="yuyanneirong1">
    <argument id="339" parent="296" name="yuyanneirong1">
      <DasType>varchar(50)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="344" parent="297" name="cishu">
    <argument id="340" parent="297" name="cishu">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="345" parent="297" name="yuyanid1">
    <argument id="341" parent="297" name="yuyanid1">
      <DasType>varchar(50)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="346" parent="297" name="yuyanleixing1">
    <argument id="342" parent="297" name="yuyanleixing1">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="347" parent="297" name="mokuainame1">
    <argument id="343" parent="297" name="mokuainame1">
      <DasType>varchar(50)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="348" parent="297" name="caidanname1">
    <argument id="344" parent="297" name="caidanname1">
      <DasType>varchar(50)|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="349" parent="297" name="yemian1">
    <argument id="345" parent="297" name="yemian1">
      <DasType>varchar(50)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="350" parent="297" name="yuyanneirong1">
    <argument id="346" parent="297" name="yuyanneirong1">
      <DasType>varchar(50)|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="351" parent="298" name="id">
    <argument id="347" parent="298" name="id">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="352" parent="298" name="tip">
    <argument id="348" parent="298" name="tip">
      <DasType>varchar(32)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="353" parent="298" name="ym">
    <argument id="349" parent="298" name="ym">
      <DasType>varchar(200)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="354" parent="298" name="fanhui">
    <argument id="350" parent="298" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="355" parent="298" name="aqkey">
    <argument id="351" 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="352" parent="298" name="usetime">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="357" parent="299" name="username">
    <argument id="353" parent="299" name="username">
      <DasType>varchar(20)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="358" parent="299" name="upwd">
    <argument id="354" parent="299" name="upwd">
      <DasType>varchar(20)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="359" parent="299" name="ym">
    <argument id="355" parent="299" name="ym">
      <DasType>varchar(200)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="360" parent="299" name="tip">
    <argument id="356" parent="299" name="tip">
      <DasType>varchar(32)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="361" parent="299" name="fanhui">
    <argument id="357" parent="299" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="362" parent="299" name="mingzi">
    <argument id="358" 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="359" 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="360" parent="303" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="365" parent="303" name="mokuaiid1">
    <argument id="361" parent="303" name="mokuaiid1">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="366" parent="303" name="caidanid1">
    <argument id="362" parent="303" name="caidanid1">
      <DasType>int|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="367" parent="304" name="id">
    <argument id="363" parent="304" name="id">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="368" parent="304" name="mid">
    <argument id="364" parent="304" name="mid">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="369" parent="304" name="yuyan">
    <argument id="365" parent="304" name="yuyan">
      <DasType>varchar(20)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="370" parent="304" name="ip">
    <argument id="366" parent="304" name="ip">
      <DasType>varchar(100)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="371" parent="305" name="caidanid1">
    <argument id="367" parent="305" name="caidanid1">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="372" parent="306" name="adminid1">
    <argument id="368" parent="306" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="373" parent="307" name="username">
    <argument id="369" parent="307" name="username">
      <DasType>varchar(50)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="374" parent="307" name="upwd">
    <argument id="370" parent="307" name="upwd">
      <DasType>varchar(20)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="375" parent="307" name="ym">
    <argument id="371" parent="307" name="ym">
      <DasType>varchar(200)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="376" parent="307" name="tip">
    <argument id="372" parent="307" name="tip">
      <DasType>varchar(32)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="377" parent="307" name="fanhui">
    <argument id="373" parent="307" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="378" parent="307" name="mingzi">
    <argument id="374" 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="375" 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="376" 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="377" parent="309" name="adid">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="382" parent="309" name="aqkey">
    <argument id="378" parent="309" name="aqkey">
      <DasType>varchar(30)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="383" parent="309" name="fanhui">
    <argument id="379" parent="309" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="384" parent="310" name="kaishi">
    <argument id="380" parent="310" name="kaishi">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="385" parent="310" name="jieshu">
    <argument id="381" parent="310" name="jieshu">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="386" parent="310" name="xianghao1">
    <argument id="382" parent="310" name="xianghao1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="387" parent="310" name="kuan1">
    <argument id="383" parent="310" name="kuan1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="388" parent="310" name="gao1">
    <argument id="384" parent="310" name="gao1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="389" parent="310" name="kehumingcheng1">
    <argument id="385" parent="310" name="kehumingcheng1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="390" parent="310" name="xiangmu1">
    <argument id="386" parent="310" name="xiangmu1">
      <ArgumentDirection>M</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="391" parent="310" name="adminid1">
    <argument id="387" parent="310" name="adminid1">
      <DasType>varchar(20)|0s</DasType>
      <Position>8</Position>
    </argument>
    <argument id="392" parent="310" name="ip">
    <argument id="388" parent="310" name="ip">
      <DasType>varchar(20)|0s</DasType>
      <Position>9</Position>
    </argument>
    <argument id="393" parent="311" name="adminid1">
    <argument id="389" parent="311" name="adminid1">
      <DasType>text|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="394" parent="311" name="zhuangtai">
    <argument id="390" parent="311" name="zhuangtai">
      <DasType>text|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="395" parent="311" name="ip">
    <argument id="391" parent="311" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="396" parent="311" name="adminid3">
    <argument id="392" parent="311" name="adminid3">
      <DasType>varchar(50)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="397" parent="311" name="fanhui">
    <argument id="393" parent="311" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="398" parent="312" name="id">
    <argument id="394" parent="312" name="id">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="399" parent="312" name="cid">
    <argument id="395" parent="312" name="cid">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="400" parent="312" name="yuyan">
    <argument id="396" parent="312" name="yuyan">
      <DasType>varchar(20)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="401" parent="313" name="adminid1">
    <argument id="397" parent="313" name="adminid1">
      <DasType>varchar(20)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="402" parent="313" name="fanhui">
    <argument id="398" parent="313" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="403" parent="314" name="adminid1">
    <argument id="399" parent="314" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="404" parent="314" name="loginpwd1">
    <argument id="400" parent="314" name="loginpwd1">
      <DasType>varchar(15)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="405" parent="314" name="ip">
    <argument id="401" parent="314" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="406" parent="314" name="fanhui">
    <argument id="402" parent="314" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="407" parent="315" name="userid">
    <argument id="403" parent="315" name="userid">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="408" parent="315" name="yuyan">
    <argument id="404" parent="315" name="yuyan">
      <DasType>varchar(20)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="409" parent="315" name="ip">
    <argument id="405" parent="315" name="ip">
      <DasType>varchar(100)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="410" parent="317" name="cishu">
    <argument id="406" parent="317" name="cishu">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="411" parent="317" name="id">
    <argument id="407" parent="317" name="id">
      <DasType>varchar(10)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="412" parent="317" name="mokuai">
    <argument id="408" parent="317" name="mokuai">
      <DasType>int|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="413" parent="317" name="caidan">
    <argument id="409" parent="317" name="caidan">
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="414" parent="317" name="gongneng">
    <argument id="410" parent="317" name="gongneng">
      <DasType>int|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="415" parent="318" name="mid">
    <argument id="411" parent="318" name="mid">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="416" parent="318" name="yuyan">
    <argument id="412" parent="318" name="yuyan">
      <DasType>varchar(20)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="417" parent="319" name="adminid1">
    <argument id="413" parent="319" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="418" parent="319" name="caidanid1">
    <argument id="414" parent="319" name="caidanid1">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="419" parent="320" name="adminid1">
    <argument id="415" parent="320" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="420" parent="320" name="caidanid1">
    <argument id="416" parent="320" name="caidanid1">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="421" parent="322" name="gonghao1">
    <argument id="417" parent="322" name="gonghao1">
      <DasType>varchar(10)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="422" parent="323" name="adminid">
    <argument id="418" parent="323" name="adminid">
      <DasType>text|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="423" parent="323" name="mokuaiid">
    <argument id="419" parent="323" name="mokuaiid">
      <DasType>text|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="424" parent="323" name="caidanid">
    <argument id="420" parent="323" name="caidanid">
      <DasType>text|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="425" parent="323" name="gongnengid">
    <argument id="421" parent="323" name="gongnengid">
      <DasType>text|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="426" parent="323" name="zhuangtai">
    <argument id="422" parent="323" name="zhuangtai">
      <DasType>text|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="427" parent="323" name="ip">
    <argument id="423" parent="323" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="428" parent="323" name="adminid3">
    <argument id="424" parent="323" name="adminid3">
      <DasType>varchar(50)|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="429" parent="323" name="fanhui">
    <argument id="425" parent="323" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>text|0s</DasType>
      <Position>8</Position>
    </argument>
    <argument id="430" parent="324" name="cishu">
    <argument id="426" parent="324" name="cishu">
      <DasType>int|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="431" parent="324" name="kaishiId">
    <argument id="427" parent="324" name="kaishiId">
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="432" parent="324" name="yemian1">
    <argument id="428" parent="324" name="yemian1">
      <DasType>varchar(200)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="433" parent="324" name="caidanId">
    <argument id="429" parent="324" name="caidanId">
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="434" parent="325" name="loginname1">
    <argument id="430" parent="325" name="loginname1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="435" parent="325" name="adminid">
    <argument id="431" parent="325" name="adminid">
      <DasType>varchar(10)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="436" parent="325" name="ip">
    <argument id="432" parent="325" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="437" parent="326" name="id">
    <argument id="433" parent="326" name="id">
      <DasType>varchar(50)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="438" parent="326" name="leixing">
    <argument id="434" parent="326" name="leixing">
      <DasType>varchar(50)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="439" parent="327" name="username">
    <argument id="435" parent="327" name="username">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <argument id="440" parent="327" name="upwd">
    <argument id="436" parent="327" name="upwd">
      <DasType>varchar(15)|0s</DasType>
      <Position>2</Position>
    </argument>
    <argument id="441" parent="327" name="xingming">
    <argument id="437" parent="327" name="xingming">
      <DasType>varchar(30)|0s</DasType>
      <Position>3</Position>
    </argument>
    <argument id="442" parent="327" name="bumenbianhao">
    <argument id="438" parent="327" name="bumenbianhao">
      <DasType>varchar(10)|0s</DasType>
      <Position>4</Position>
    </argument>
    <argument id="443" parent="327" name="bumen">
    <argument id="439" parent="327" name="bumen">
      <DasType>varchar(50)|0s</DasType>
      <Position>5</Position>
    </argument>
    <argument id="444" parent="327" name="banzu">
    <argument id="440" parent="327" name="banzu">
      <DasType>varchar(50)|0s</DasType>
      <Position>6</Position>
    </argument>
    <argument id="445" parent="327" name="ip">
    <argument id="441" parent="327" name="ip">
      <DasType>varchar(50)|0s</DasType>
      <Position>7</Position>
    </argument>
    <argument id="446" parent="327" name="banzubianhao">
    <argument id="442" parent="327" name="banzubianhao">
      <DasType>varchar(50)|0s</DasType>
      <Position>8</Position>
    </argument>
    <argument id="447" parent="327" name="fanhui">
    <argument id="443" parent="327" name="fanhui">
      <ArgumentDirection>O</ArgumentDirection>
      <DasType>int|0s</DasType>
      <Position>9</Position>
    </argument>
    <argument id="448" parent="328" name="adminid1">
    <argument id="444" parent="328" name="adminid1">
      <DasType>varchar(15)|0s</DasType>
      <Position>1</Position>
    </argument>
    <column id="449" parent="329" name="id">
    <column id="445" 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="446" parent="329" name="menuName">
      <Comment>模块名称</Comment>
      <DasType>varchar(255)|0s</DasType>
      <Position>2</Position>
    </column>
    <column id="451" parent="329" name="languageType">
    <column id="447" parent="329" name="languageType">
      <Comment>语言类型</Comment>
      <DasType>varchar(10)|0s</DasType>
      <Position>3</Position>
    </column>
    <column id="452" parent="329" name="state">
    <column id="448" parent="329" name="state">
      <Comment>状态</Comment>
      <DasType>int|0s</DasType>
      <Position>4</Position>
    </column>
    <column id="453" parent="329" name="listSort">
    <column id="449" parent="329" name="listSort">
      <Comment>排序</Comment>
      <DasType>varchar(255)|0s</DasType>
      <Position>5</Position>
    </column>
    <column id="454" parent="329" name="createTime">
    <column id="450" parent="329" name="createTime">
      <Comment>创建时间</Comment>
      <DasType>datetime|0s</DasType>
      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
      <NotNull>1</NotNull>
      <Position>6</Position>
    </column>
    <index id="455" parent="329" name="PRIMARY">
    <index id="451" parent="329" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <key id="456" parent="329" name="PRIMARY">
    <key id="452" parent="329" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <column id="457" parent="330" name="id">
    <column id="453" parent="330" name="id">
      <AutoIncrement>1</AutoIncrement>
      <Comment>自增id</Comment>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="458" parent="330" name="menuID">
    <column id="454" parent="330" name="menuID">
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>2</Position>
    </column>
    <column id="459" parent="330" name="itemName">
    <column id="455" 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="456" 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="457" 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="458" 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="459" 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="460" 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="461" 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="462" parent="330" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <index id="467" parent="330" name="menuid">
    <index id="463" parent="330" name="menuid">
      <ColNames>menuID</ColNames>
      <Type>btree</Type>
    </index>
    <key id="468" parent="330" name="PRIMARY">
    <key id="464" parent="330" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <column id="469" parent="331" name="id">
    <column id="465" parent="331" name="id">
      <AutoIncrement>39</AutoIncrement>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="470" parent="331" name="login_name">
    <column id="466" 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="467" 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="468" 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="469" parent="331" name="address">
      <DasType>varchar(50)|0s</DasType>
      <Position>5</Position>
    </column>
    <column id="474" parent="331" name="phone">
    <column id="470" parent="331" name="phone">
      <DasType>varchar(20)|0s</DasType>
      <Position>6</Position>
    </column>
    <column id="475" parent="331" name="create_time">
    <column id="471" 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="472" parent="331" name="update_time">
      <DasType>datetime|0s</DasType>
      <Position>8</Position>
    </column>
    <column id="477" parent="331" name="state">
    <column id="473" parent="331" name="state">
      <DasType>int|0s</DasType>
      <DefaultExpression>1</DefaultExpression>
      <Position>9</Position>
    </column>
    <index id="478" parent="331" name="PRIMARY">
    <index id="474" parent="331" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <key id="479" parent="331" name="PRIMARY">
    <key id="475" parent="331" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <trigger id="480" parent="331" name="logName">
    <trigger id="476" 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">
    <column id="477" parent="332" name="id">
      <AutoIncrement>4</AutoIncrement>
      <DasType>int|0s</DasType>
      <NotNull>1</NotNull>
      <Position>1</Position>
    </column>
    <column id="482" parent="333" name="level">
    <column id="478" parent="332" name="level">
      <Comment>玻璃类别等级</Comment>
      <DasType>int|0s</DasType>
      <Position>2</Position>
    </column>
    <column id="483" parent="333" name="belong">
    <column id="479" parent="332" name="belong">
      <Comment>二级类别所属一级类比</Comment>
      <DasType>varchar(4)|0s</DasType>
      <Position>3</Position>
    </column>
    <column id="484" parent="333" name="typeID">
    <column id="480" parent="332" name="typeID">
      <Comment>类别id</Comment>
      <DasType>varchar(4)|0s</DasType>
      <Position>4</Position>
    </column>
    <column id="485" parent="333" name="typeName">
    <column id="481" parent="332" name="typeName">
      <Comment>类别名称</Comment>
      <DasType>varchar(20)|0s</DasType>
      <Position>5</Position>
    </column>
    <column id="486" parent="333" name="createTime">
    <column id="482" parent="332" name="createTime">
      <Comment>创建时间</Comment>
      <DasType>datetime|0s</DasType>
      <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
      <Position>6</Position>
    </column>
    <index id="487" parent="333" name="PRIMARY">
    <index id="483" parent="332" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <index id="488" parent="333" name="typeID">
    <index id="484" parent="332" name="typeID">
      <ColNames>typeID</ColNames>
      <Type>btree</Type>
    </index>
    <key id="489" parent="333" name="PRIMARY">
    <key id="485" parent="332" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
    </key>
    <column id="490" parent="334" name="id">
      <AutoIncrement>51</AutoIncrement>
    <column id="486" parent="333" name="id">
      <AutoIncrement>25</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">
    <column id="487" parent="333" name="prodID">
      <DasType>varchar(10)|0s</DasType>
      <Position>2</Position>
    </column>
    <column id="509" parent="335" name="product">
    <column id="488" parent="333" name="product">
      <DasType>varchar(100)|0s</DasType>
      <Position>3</Position>
    </column>
    <column id="510" parent="335" name="glassType">
      <DasType>varchar(10)|0s</DasType>
    <column id="489" parent="333" name="typeID">
      <DasType>varchar(4)|0s</DasType>
      <Position>4</Position>
    </column>
    <column id="511" parent="335" name="totalThickness">
      <DasType>decimal(5,2 digit)|0s</DasType>
    <column id="490" parent="333" name="glassType">
      <DasType>varchar(10)|0s</DasType>
      <Position>5</Position>
    </column>
    <column id="512" parent="335" name="thickness">
    <column id="491" parent="333" name="totalThickness">
      <DasType>decimal(5,2 digit)|0s</DasType>
      <Position>6</Position>
    </column>
    <column id="513" parent="335" name="Query">
      <DasType>varchar(30)|0s</DasType>
    <column id="492" parent="333" name="thickness">
      <DasType>decimal(5,2 digit)|0s</DasType>
      <Position>7</Position>
    </column>
    <column id="514" parent="335" name="remarks">
      <DasType>varchar(255)|0s</DasType>
    <column id="493" parent="333" name="Query">
      <DasType>varchar(30)|0s</DasType>
      <Position>8</Position>
    </column>
    <column id="515" parent="335" name="state">
      <DasType>int|0s</DasType>
      <DefaultExpression>0</DefaultExpression>
    <column id="494" parent="333" name="remarks">
      <DasType>varchar(255)|0s</DasType>
      <Position>9</Position>
    </column>
    <column id="516" parent="335" name="creator">
      <DasType>varchar(10)|0s</DasType>
    <column id="495" parent="333" name="state">
      <DasType>int|0s</DasType>
      <DefaultExpression>0</DefaultExpression>
      <Position>10</Position>
    </column>
    <column id="517" parent="335" name="createTime">
      <DasType>datetime|0s</DasType>
    <column id="496" parent="333" name="creator">
      <DasType>varchar(10)|0s</DasType>
      <Position>11</Position>
    </column>
    <column id="518" parent="335" name="updateTime">
    <column id="497" parent="333" name="createTime">
      <DasType>datetime|0s</DasType>
      <Position>12</Position>
    </column>
    <foreign-key id="519" parent="335" name="glassType">
      <ColNames>glassType</ColNames>
    <column id="498" parent="333" name="updateTime">
      <DasType>datetime|0s</DasType>
      <Position>13</Position>
    </column>
    <foreign-key id="499" parent="333" name="typeid">
      <ColNames>typeID</ColNames>
      <RefColNames>typeID</RefColNames>
      <RefTableName>basic_glass_type</RefTableName>
    </foreign-key>
    <index id="520" parent="335" name="PRIMARY">
    <index id="500" parent="333" name="PRIMARY">
      <ColNames>id</ColNames>
      <Type>btree</Type>
      <Unique>1</Unique>
    </index>
    <index id="521" parent="335" name="glassType">
      <ColNames>glassType</ColNames>
    <index id="501" parent="333" name="typeid">
      <ColNames>typeID</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">
    <key id="502" parent="333" name="PRIMARY">
      <NameSurrogate>1</NameSurrogate>
      <Primary>1</Primary>
      <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>

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

@@ -5,28 +5,14 @@
  </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 afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/mm/FinishedGoodsInventory.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/mm/FinishedOperateLog.xml" 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/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/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$/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.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" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -73,50 +59,50 @@
    <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/src/main/resources/mapper/mm",
    "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": {
    "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\src\main\resources\mapper\mm" />
      <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" />
@@ -134,6 +120,9 @@
    <key name="CreateTestDialog.RecentsKey">
      <recent name="com.example.erp.service" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.example.erp.mapper.mm" />
    </key>
  </component>
  <component name="RunAnythingCache">
    <option name="myCommands">

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -1,5 +1,6 @@
package com.example.erp.mapper.mm;

import com.example.erp.entity.mm.FinishedGoodsInventory;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

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

@Mapper
public interface FinishedGoodsInventoryMapper {
    List<FinishedGoodsInventoryMapper> defaultProduct(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
    List<FinishedGoodsInventory> defaultProduct(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
}

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java

New file
@@ -0,0 +1,12 @@
package com.example.erp.mapper.mm;

import com.example.erp.entity.mm.FinishedOperateLog;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface FinishedOperateLogMapper {
    List<FinishedOperateLog> defaultProduct(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
}

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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

        order by id desc
        limit #{offset},#{pageSize}
        ;
    </select>
</mapper>

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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

        order by id desc
        limit #{offset},#{pageSize}
        ;
    </select>
</mapper>

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

@@ -3,24 +3,41 @@
        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" property="product"/>
        <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="glassType" javaType="com.example.erp.entity.sd.GlassType">
            <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,
               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,
               bgt.type_id         as type_id,
               bgt.type            as type
        from product as a
                 left join glass_type bgt on bgt.type_id = a.type_id

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