部分界面修改

guoyuji

2024-01-22 bee470b90e31c1d22bebfc085e829034e7268f0f

部分界面修改

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

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

 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> [1701073490000, 0, null, null, -2147483648, -2147483648]
!<md> [1705509001000, 0, null, null, -2147483648, -2147483648]

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

@@ -5,21 +5,26 @@
  </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/sd/product/testSort.vue" afterDir="false" />
      <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/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/sd/customer/SelectCustomer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/customer/SelectCustomer.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectDelivery.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectDelivery.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectOrderList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectOrderList.vue" 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$/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$/northglass-erp/src/views/sd/product/Test.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Test.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectDeliveryList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectDeliveryList.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectReturns.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectReturns.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/vite.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/vite.config.js" 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" />
    </list>
@@ -33,14 +38,19 @@
      <list>
        <option value="Vue Options API Component" />
        <option value="FxmlFile" />
        <option value="Vue Composition API Component" />
        <option value="JUnit5 Test Class" />
        <option value="Class" />
        <option value="Interface" />
        <option value="Vue Composition API Component" />
      </list>
    </option>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  </component>
  <component name="HighlightingSettingsPerFile">
    <setting file="file://$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProcessCardProgress.vue" root0="FORCE_HIGHLIGHTING" />
    <setting file="file://$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProductionSchedule.vue" root0="FORCE_HIGHLIGHTING" />
  </component>
  <component name="MarkdownSettingsMigration">
    <option name="stateVersion" value="1" />
@@ -73,6 +83,8 @@
    &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;,
@@ -83,7 +95,7 @@
    &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;preferences.pluginManager&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;
@@ -113,8 +125,14 @@
      <recent name="D:\Documents\north-glass-erp\src\main\resources\mapper\userInfo" />
      <recent name="D:\Documents\north-glass-erp\src\main\resources\mapper" />
    </key>
    <key name="CreateTestDialog.Recents.Supers">
      <recent name="" />
    </key>
    <key name="ExtractSuperBase.RECENT_KEYS">
      <recent name="com.example.erp.common.interceptor" />
    </key>
    <key name="CreateTestDialog.RecentsKey">
      <recent name="com.example.erp.service" />
    </key>
  </component>
  <component name="RunAnythingCache">
@@ -134,10 +152,18 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="erp中的所有" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
    <configuration name="IOrderServiceTest.testGetOrderList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
      <module name="erp" />
      <option name="PACKAGE_NAME" value="" />
      <option name="TEST_OBJECT" value="package" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.example.erp.service.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
      <option name="PACKAGE_NAME" value="com.example.erp.service" />
      <option name="MAIN_CLASS_NAME" value="com.example.erp.service.IOrderServiceTest" />
      <option name="METHOD_NAME" value="testGetOrderList" />
      <option name="TEST_OBJECT" value="method" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
@@ -160,13 +186,13 @@
      <method v="2" />
    </configuration>
    <list>
      <item itemvalue="JUnit.erp中的所有" />
      <item itemvalue="JUnit.IOrderServiceTest.testGetOrderList" />
      <item itemvalue="npm.dev" />
      <item itemvalue="Spring Boot.ErpApplication" />
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="JUnit.erp中的所有" />
        <item itemvalue="JUnit.IOrderServiceTest.testGetOrderList" />
      </list>
    </recent_temporary>
  </component>
@@ -231,7 +257,11 @@
      <workItem from="1702858329054" duration="9016000" />
      <workItem from="1703031064839" duration="55055000" />
      <workItem from="1703463546867" duration="16447000" />
      <workItem from="1703811064202" duration="29032000" />
      <workItem from="1703811064202" duration="30107000" />
      <workItem from="1704444390960" duration="8065000" />
      <workItem from="1704934272962" duration="24370000" />
      <workItem from="1705472069182" duration="421000" />
      <workItem from="1705472543537" duration="15202000" />
    </task>
    <task id="LOCAL-00001" summary="第一次推送">
      <option name="closed" value="true" />
@@ -403,13 +433,11 @@
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
          <line>254</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="7" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
          <line>179</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="8" />
        </line-breakpoint>
      </breakpoints>

 north-glass-erp/northglass-erp/package-lock.json

@@ -18,7 +18,8 @@
        "vue": "^3.3.4",
        "vue-router": "^4.2.4",
        "vxe-table": "^4.5.15",
        "xe-utils": "^3.5.14"
        "xe-utils": "^3.5.14",
        "xlsx": "^0.18.5"
      },
      "devDependencies": {
        "@types/sortablejs": "^1.15.7",
@@ -778,6 +779,14 @@
        "node": ">=0.4.0"
      }
    },
    "node_modules/adler-32": {
      "version": "1.3.1",
      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
      "engines": {
        "node": ">=0.8"
      }
    },
    "node_modules/anymatch": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -842,6 +851,18 @@
        "node": ">=8"
      }
    },
    "node_modules/cfb": {
      "version": "1.2.2",
      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
      "dependencies": {
        "adler-32": "~1.3.0",
        "crc-32": "~1.2.0"
      },
      "engines": {
        "node": ">=0.8"
      }
    },
    "node_modules/chokidar": {
      "version": "3.5.3",
      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -868,6 +889,14 @@
        "fsevents": "~2.3.2"
      }
    },
    "node_modules/codepage": {
      "version": "1.15.0",
      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
      "engines": {
        "node": ">=0.8"
      }
    },
    "node_modules/combined-stream": {
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -877,6 +906,17 @@
      },
      "engines": {
        "node": ">= 0.8"
      }
    },
    "node_modules/crc-32": {
      "version": "1.2.2",
      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
      "bin": {
        "crc32": "bin/crc32.njs"
      },
      "engines": {
        "node": ">=0.8"
      }
    },
    "node_modules/csstype": {
@@ -1015,6 +1055,14 @@
      },
      "engines": {
        "node": ">= 6"
      }
    },
    "node_modules/frac": {
      "version": "1.1.2",
      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
      "engines": {
        "node": ">=0.8"
      }
    },
    "node_modules/fsevents": {
@@ -1337,6 +1385,17 @@
        "node": ">=0.10.0"
      }
    },
    "node_modules/ssf": {
      "version": "0.11.2",
      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
      "dependencies": {
        "frac": "~1.1.2"
      },
      "engines": {
        "node": ">=0.8"
      }
    },
    "node_modules/to-fast-properties": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -1474,10 +1533,46 @@
      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw=="
    },
    "node_modules/wmf": {
      "version": "1.0.2",
      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
      "engines": {
        "node": ">=0.8"
      }
    },
    "node_modules/word": {
      "version": "0.3.0",
      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
      "engines": {
        "node": ">=0.8"
      }
    },
    "node_modules/xe-utils": {
      "version": "3.5.14",
      "resolved": "https://registry.npmjs.org/xe-utils/-/xe-utils-3.5.14.tgz",
      "integrity": "sha512-Xq6mS8dWwHBQsQUEBXcZYSaBV0KnNLoVWd0vRRDI3nKpbNxfs/LSCK0W21g1edLFnXYfKqg7hh5dakr3RtYY0A=="
    },
    "node_modules/xlsx": {
      "version": "0.18.5",
      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
      "dependencies": {
        "adler-32": "~1.3.0",
        "cfb": "~1.2.1",
        "codepage": "~1.15.0",
        "crc-32": "~1.2.1",
        "ssf": "~0.11.2",
        "wmf": "~1.0.1",
        "word": "~0.3.0"
      },
      "bin": {
        "xlsx": "bin/xlsx.njs"
      },
      "engines": {
        "node": ">=0.8"
      }
    }
  },
  "dependencies": {
@@ -1924,6 +2019,11 @@
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
    },
    "adler-32": {
      "version": "1.3.1",
      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
    },
    "anymatch": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -1976,6 +2076,15 @@
        "fill-range": "^7.0.1"
      }
    },
    "cfb": {
      "version": "1.2.2",
      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
      "requires": {
        "adler-32": "~1.3.0",
        "crc-32": "~1.2.0"
      }
    },
    "chokidar": {
      "version": "3.5.3",
      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -1991,6 +2100,11 @@
        "readdirp": "~3.6.0"
      }
    },
    "codepage": {
      "version": "1.15.0",
      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
    },
    "combined-stream": {
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -1998,6 +2112,11 @@
      "requires": {
        "delayed-stream": "~1.0.0"
      }
    },
    "crc-32": {
      "version": "1.2.2",
      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
    },
    "csstype": {
      "version": "3.1.2",
@@ -2103,6 +2222,11 @@
        "combined-stream": "^1.0.8",
        "mime-types": "^2.1.12"
      }
    },
    "frac": {
      "version": "1.1.2",
      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
    },
    "fsevents": {
      "version": "2.3.3",
@@ -2294,6 +2418,14 @@
      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
    },
    "ssf": {
      "version": "0.11.2",
      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
      "requires": {
        "frac": "~1.1.2"
      }
    },
    "to-fast-properties": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -2369,10 +2501,34 @@
      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw=="
    },
    "wmf": {
      "version": "1.0.2",
      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
    },
    "word": {
      "version": "0.3.0",
      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="
    },
    "xe-utils": {
      "version": "3.5.14",
      "resolved": "https://registry.npmjs.org/xe-utils/-/xe-utils-3.5.14.tgz",
      "integrity": "sha512-Xq6mS8dWwHBQsQUEBXcZYSaBV0KnNLoVWd0vRRDI3nKpbNxfs/LSCK0W21g1edLFnXYfKqg7hh5dakr3RtYY0A=="
    },
    "xlsx": {
      "version": "0.18.5",
      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
      "requires": {
        "adler-32": "~1.3.0",
        "cfb": "~1.2.1",
        "codepage": "~1.15.0",
        "crc-32": "~1.2.1",
        "ssf": "~0.11.2",
        "wmf": "~1.0.1",
        "word": "~0.3.0"
      }
    }
  }
}

 north-glass-erp/northglass-erp/package.json

@@ -18,7 +18,8 @@
    "vue": "^3.3.4",
    "vue-router": "^4.2.4",
    "vxe-table": "^4.5.15",
    "xe-utils": "^3.5.14"
    "xe-utils": "^3.5.14",
    "xlsx": "^0.18.5"
  },
  "devDependencies": {
    "@types/sortablejs": "^1.15.7",

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

@@ -12,7 +12,7 @@
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

@@ -471,6 +471,12 @@
              component: () => import('../views/pp/report/ProductionSchedule.vue'),
            },
            {
              //流程卡进度
              path: 'processCardProgress',
              name: 'processCardProgress',
              component: () => import('../views/pp/report/ProcessCardProgress.vue'),
            },
            {
              //品质报表
              path: 'qualityReport',
              name: 'qualityReport',

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

New file
@@ -0,0 +1,245 @@
<script setup>

import {reactive, ref} from "vue";
import {useRouter} from  'vue-router'
let router=useRouter()
const getTableRow = (row,type) =>{
  switch (type) {
    case 'edit' :{
      //alert('我接收到子组件传送的编辑信息')
      router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
      alert('我接收到子组件传送的反审状态')
      break
    }
  }
}

//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

//子组件接收参数

const gridOptions = reactive({
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true },//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {field: '1', width: 150, title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: '2',width: 130, title: '单片名称', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '3', width: 120,title: '订单类型', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '4',width: 110, title: '流程卡号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '5', width: 90,title: '标记', sortable: true,showOverflow:"ellipsis"},
    {field: '6', width: 90,title: '数量', sortable: true},
    {field: '7',width: 90, title: '次破数量', sortable: true},
    {field: '8',width: 120, title: '切割', sortable: true},
    {field: '9',width: 120, title: '磨边', sortable: true},
    {field: '10',width: 120, title: '钢化', sortable: true},
    {field: '11',width: 120, title: '入库面积', sortable: true},
  ],//表头按钮

  toolbarConfig: {
    // buttons: [{
    //
    // }],
    import: false,
    export: true,
    print: true,
    zoom: true,
    custom: true
  },
  data:  [
    {
      1:'10mm超白UD60平钢(外)+12Ar(结)+10mm超白平钢+12Ar(结)+10mm超白平钢(内)',
      2:'10mm超白UD60平钢(外)',
      3:'普通订单',
      4:'NG23052602A01/1',
      5:'1',
      6:'33',
      7:'1',
      8:'22',
      9:'22',
      10:'22',
      11:'314.13',
    },
    {
      1:'10mm超白UD60平钢(外)+12Ar(结)+10mm超白平钢+12Ar(结)+10mm超白平钢(内)',
      2:'10mm超白平钢+12Ar(结)',
      3:'普通订单',
      4:'NG23052602A01/2',
      5:'2',
      6:'33',
      7:'1',
      8:'22',
      9:'22',
      10:'22',
      11:'314.13',
    },
    {
      1:'10mm超白UD60平钢(外)+12Ar(结)+10mm超白平钢+12Ar(结)+10mm超白平钢(内)',
      2:'10mm超白平钢(内)',
      3:'普通订单',
      4:'NG23052602A01/3',
      5:'3',
      6:'33',
      7:'1',
      8:'22',
      9:'22',
      10:'22',
      11:'314.13',
    },
  ],//table body实际数据
  //脚部求和
  // footerMethod ({ columns, data }) {//页脚函数
  //   let footList=['7','8','9','10']
  //   return[
  //     columns.map((column, columnIndex) => {
  //       if (columnIndex === 0) {
  //         return '合计:'
  //       }
  //       if (footList.includes(column.field)) {
  //         return sumNum(data, column.field)
  //       }
  //       return ''
  //     })
  //   ]
  // }

})

const value = ref('')
const options = [
  {
    value: 'Option1',
    label: 'Option1',
  },
  {
    value: 'Option2',
    label: 'Option2',
  },
  {
    value: 'Option3',
    label: 'Option3',
  },
]

const form = reactive({
  name: '',
  region: '',
  date1: '',
  date2: '',
  delivery: false,
  type: [],
  resource: '',
  desc: '',

})

const mergeCells = ref([
  { row: 0, col: 1, rowspan: 3, colspan: 0},
  { row: 3, col: 1, rowspan: 3, colspan: 0},

  { row: 0, col: 6, rowspan: 3, colspan: 0},
  { row: 3, col: 6, rowspan: 3, colspan: 0},

])

</script>

<template>
  <div class="main-div-customer" >
    <div id="selectForm">
      <el-row :gutter="0">
        <el-input placeholder="销售单号" v-model="form.name" value="NG23110102" style="width: 150px"/>
        &nbsp;&nbsp;
        <el-button type="primary">查询</el-button>
      </el-row>

    </div>
    <vxe-grid
       height="400px"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        :merge-cells="mergeCells"

    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <!--      下拉显示所有信息插槽-->
      <template #content="{ row }">
        <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>
          </li>
        </ul>
      </template>

      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>
        <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">反审</el-button>
        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">删除</el-button>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>


    </vxe-grid>
  </div>
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
}
#selectForm {
  width: 60%;
  text-align: center;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue

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

import {reactive, ref} from "vue";
import {useRouter} from  'vue-router'

let router=useRouter()
const getTableRow = (row,type) =>{
  switch (type) {
@@ -62,7 +63,6 @@
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {field: '1', width: 100, title: '序号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: '2',width: 120, title: '楼层编号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '3', width: 100,title: '形状', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -217,7 +217,7 @@
  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['7','11','12','13','14','15','16','17','18']
    let footList=['11','12','13','14','15','16','17','18']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
@@ -262,6 +262,9 @@
})

const mergeCells = ref([
  { row: 0, col: 1, rowspan: 3, colspan: 0},
  { row: 3, col: 1, rowspan: 3, colspan: 0},

  { row: 0, col: 2, rowspan: 3, colspan: 0},
  { row: 3, col: 2, rowspan: 3, colspan: 0},

@@ -271,11 +274,7 @@
  { row: 0, col: 4, rowspan: 3, colspan: 0},
  { row: 3, col: 4, rowspan: 3, colspan: 0},

  { row: 0, col: 5, rowspan: 3, colspan: 0},
  { row: 3, col: 5, rowspan: 3, colspan: 0},

  { row: 0, col: 8, rowspan: 3, colspan: 0},
  { row: 3, col: 8, rowspan: 3, colspan: 0},
])

</script>

 north-glass-erp/northglass-erp/src/views/pp/report/Report.vue

@@ -49,6 +49,7 @@
          <el-menu-item index="/main/report/WorkInProgress">在制品报表</el-menu-item>
          <el-menu-item index="/main/report/ProcessToBeCompleted">工序待完成</el-menu-item>
          <el-menu-item index="/main/report/ProductionSchedule">生产发货进度</el-menu-item>
          <el-menu-item index="/main/report/ProcessCardProgress">流程卡进度</el-menu-item>
          <el-menu-item index="/main/report/OrderPlanDecomposition">订单计划分解</el-menu-item>
        </el-sub-menu>
        <el-sub-menu  index="2" popper-class="test">

 north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue

@@ -1,8 +1,9 @@
<script setup>
  import {Search} from "@element-plus/icons-vue"
  import {useRouter} from "vue-router"
  import {reactive} from "vue";
  import {reactive, ref} from "vue";
  const router = useRouter()
  import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'

  const getTableRow = (row,type) =>{
    switch (type) {
@@ -138,9 +139,11 @@
    }

  })
  const dialogTableVisible = ref(false)



const cellClickEvent =()=>{
    dialogTableVisible.value = true
}



@@ -156,6 +159,7 @@
    />
    <el-button style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>
    <vxe-grid
        @cell-dblclick="cellClickEvent"
        max-height="97%"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -191,7 +195,9 @@
      </template>
    </vxe-grid>


    <el-dialog v-model="dialogTableVisible" title="流程卡进度" style="width: 80%;height:75% ">
      <ProcessCardProgress style="width: 100%;height: 100%" />
    </el-dialog>
  </div>
</template>


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

@@ -21,7 +21,7 @@
       <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/product/selectProduct' }">产品首页</el-breadcrumb-item>
       <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/product/createProduct' }">创建</el-breadcrumb-item>
<!--       <el-breadcrumb-item :to="{ path: '/main/product/test' }">测试</el-breadcrumb-item>-->
       <el-breadcrumb-item :to="{ path: '/main/product/testSort' }">测试</el-breadcrumb-item>
<!--       <el-breadcrumb-item :to="{ path: '/main/product/testSort' }">测试</el-breadcrumb-item>-->
       <el-breadcrumb-item v-show="false" :to="{ path: '/main/product/test1' }">测试</el-breadcrumb-item>
     </el-breadcrumb>


 north-glass-erp/pom.xml

@@ -141,7 +141,7 @@
    </build>


    <repositories>
    <!--<repositories>
        <repository>
            <id>nexus-aliyun</id>
            <name>nexus-aliyun</name>
@@ -167,5 +167,5 @@
                <enabled>false</enabled>
            </snapshots>
        </pluginRepository>
    </pluginRepositories>
    </pluginRepositories>-->
</project>

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

@@ -15,26 +15,26 @@
    @Autowired
    private OrderMapper orderMapper;

    @GetMapping //查询order表结果集
    public Result index(){
        return Result.seccess(orderMapper.findAll());

    }

    @PostMapping  //插入
    public Integer save(@RequestBody Order order) {
        return orderMapper.insert(order);
    }

    @PostMapping("/update")
    public Integer updateOrder(@RequestBody Order order) {
        return orderMapper.update(order.getId(),order.getOrderid());
    }

    @DeleteMapping("/{id}") //删除数据
    public Integer delete(@PathVariable Integer id) {
        return orderMapper.deleteById(id);
    }
//    @GetMapping //查询order表结果集
//    public Result index(){
//        return Result.seccess(orderMapper.findAll());
//
//    }
//
//    @PostMapping  //插入
//    public Integer save(@RequestBody Order order) {
//        return orderMapper.insert(order);
//    }
//
//    @PostMapping("/update")
//    public Integer updateOrder(@RequestBody Order order) {
//        return orderMapper.update(order.getId(),order.getOrderid());
//    }
//
//    @DeleteMapping("/{id}") //删除数据
//    public Integer delete(@PathVariable Integer id) {
//        return orderMapper.deleteById(id);
//    }

    
}

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

@@ -2,23 +2,25 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@Data  //lombok 简写java代码 实体类的get与set
@TableName("`order`")
public class Order {
    @TableId(type = IdType.AUTO)
    private  Integer id;
    private  String orderid;
    private  String recipeno;
    private  String largeglassno;
    private  String largeglasscompleted;
    private  String smallglassno;
    private  String smallglasscompleted;
    private  String smallglassprocessing;
    private  String smallglassworn;
    private  String orderstatus;
    private  String ordermaker;
    private  String maketime;
    private  String updatetime;
    private  String orderId;
    private  String recipeNo;
    private  String largeglassNo;
    private  String largeglassCompleted;
    private  String smallglassNo;
    private  String smallglassCompleted;
    private  String smallglassProcessing;
    private  String smallglassWorn;
    private  String orderStatus;
    private  String orderMaker;
    private  String makeTime;
    private  String updateTime;

}

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

@@ -1,23 +1,23 @@
package com.example.erp.mapper;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.Order;
import org.apache.ibatis.annotations.*;

import java.util.List;
@Mapper
@DS("gmms")
public interface OrderMapper {
public interface OrderMapper extends BaseMapper<Order> {

    @Select("select * from `order`")
    List<Order> findAll();

    @Insert("INSERT `order`(order_id)VALUES(#{order_id})")
    Integer insert(Order order);

    @Delete("delete from `order` where id=#{id}")
    Integer deleteById(@Param("id") Integer id);

    @Update("update `order` set order_id=#{order_id} where id=#{id}")
    Integer update(@Param("id") Integer id,@Param("order_id") String order_id);
//    @Select("select * from `order`")
//    List<Order> findAll();
//
//    @Insert("INSERT `order`(order_id)VALUES(#{order_id})")
//    Integer insert(Order order);
//
//    @Delete("delete from `order` where id=#{id}")
//    Integer deleteById(@Param("id") Integer id);
//
//    @Update("update `order` set order_id=#{order_id} where id=#{id}")
//    Integer update(@Param("id") Integer id,@Param("order_id") String order_id);
}

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

New file
@@ -0,0 +1,2 @@
package com.example.erp.service;public interface IOrderService {
}

 north-glass-erp/src/main/java/com/example/erp/service/impl/OrderServiceImpl.java

New file
@@ -0,0 +1,13 @@
package com.example.erp.service.impl;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.example.erp.entity.Order;
import com.example.erp.mapper.OrderMapper;
import com.example.erp.service.IOrderService;
import org.springframework.stereotype.Service;

@Service
@DS("erp_sd")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
}

 north-glass-erp/src/main/resources/application.yml

@@ -14,8 +14,8 @@
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        erp_sd:
          url: jdbc:mysql://10.153.19.150:3306/erp_sd?serverTimezone=GMT%2b8
        sd:
          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

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

New file
@@ -0,0 +1,19 @@
package com.example.erp.service;

import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest
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/application.yml

@@ -14,8 +14,8 @@
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        erp_sd:
          url: jdbc:mysql://10.153.19.150:3306/erp_sd?serverTimezone=GMT%2b8
        sd:
          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver