From 99bfa55e580535304111fd4dce5c48c850bbecce Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 22 一月 2024 08:47:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 14
north-glass-erp/.idea/google-java-format.xml | 6
north-glass-erp/.idea/compiler.xml | 20
north-glass-erp/.idea/uiDesigner.xml | 124 ++
north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 2
north-glass-erp/src/main/java/com/example/erp/mapper/OrderMapper.java | 26
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta | 2
north-glass-erp/.idea/.gitignore | 8
north-glass-erp/.idea/north-glass-erp.iml | 9
north-glass-erp/.idea/encodings.xml | 6
north-glass-erp/.idea/misc.xml | 14
north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue | 2
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml | 2037 ++++++++++++++++++++++++++++++++++++
north-glass-erp/src/main/java/com/example/erp/service/IOrderService.java | 2
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 2
north-glass-erp/src/main/java/com/example/erp/service/impl/OrderServiceImpl.java | 13
north-glass-erp/.idea/dataSources.local.xml | 24
north-glass-erp/northglass-erp/vite.config.js | 2
north-glass-erp/northglass-erp/src/layout/MainErpView.vue | 2
north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java | 17
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue | 22
north-glass-erp/src/main/resources/application.yml | 2
north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue | 5
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/testpp.Ena3yw.meta | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 2
north-glass-erp/target/classes/application.yml | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue | 13
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/information_schema.FNRwLQ.meta | 2
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 36
north-glass-erp/src/main/java/com/example/erp/controller/OrderController.java | 40
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 2
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sys.zb4BAA.meta | 2
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/mysql.osA4Bg.meta | 2
north-glass-erp/northglass-erp/src/views/sd/product/Product.vue | 2
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta | 2
north-glass-erp/.idea/sqldialects.xml | 6
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 12
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/performance_schema.kIw0nw.meta | 2
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/ztest.DHjtBg.meta | 2
north-glass-erp/northglass-erp/package-lock.json | 158 ++
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue | 2
north-glass-erp/src/main/resources/mapper/sd/Product.xml | 54
north-glass-erp/.idea/dataSources.xml | 12
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip | 0
north-glass-erp/.idea/workspace.xml | 450 ++++++++
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue | 6
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue | 10
north-glass-erp/.idea/vcs.xml | 6
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue | 6
north-glass-erp/src/test/java/com/example/erp/service/IOrderServiceTest.java | 19
north-glass-erp/northglass-erp/package.json | 3
north-glass-erp/src/main/java/com/example/erp/entity/Order.java | 26
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sd_kd.B3aDBg.meta | 2
north-glass-erp/pom.xml | 9
north-glass-erp/.idea/jarRepositories.xml | 30
north-glass-erp/target/classes/mapper/sd/Product.xml | 54
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue | 6
60 files changed, 3,129 insertions(+), 220 deletions(-)
diff --git a/north-glass-erp/.idea/.gitignore b/north-glass-erp/.idea/.gitignore
new file mode 100644
index 0000000..35410ca
--- /dev/null
+++ b/north-glass-erp/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 榛樿蹇界暐鐨勬枃浠�
+/shelf/
+/workspace.xml
+# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹�
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/north-glass-erp/.idea/compiler.xml b/north-glass-erp/.idea/compiler.xml
new file mode 100644
index 0000000..09d0a24
--- /dev/null
+++ b/north-glass-erp/.idea/compiler.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="true" />
+ <profile name="Maven default annotation processors profile" enabled="true">
+ <sourceOutputDir name="target/generated-sources/annotations" />
+ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+ <outputRelativeToContentRoot value="true" />
+ <module name="erp" />
+ </profile>
+ </annotationProcessing>
+ </component>
+ <component name="JavacSettings">
+ <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+ <module name="erp" options="-parameters" />
+ <module name="north-glass-erp" options="-parameters" />
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/dataSources.local.xml b/north-glass-erp/.idea/dataSources.local.xml
new file mode 100644
index 0000000..323130f
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources.local.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="dataSourceStorageLocal" created-in="IU-232.9559.62">
+ <data-source name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
+ <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>
+ <user-name>root</user-name>
+ <schema-mapping>
+ <introspection-scope>
+ <node kind="schema">
+ <name qname="@" />
+ <name qname="erp_sd" />
+ <name qname="erp_user_info" />
+ </node>
+ </introspection-scope>
+ </schema-mapping>
+ </data-source>
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/dataSources.xml b/north-glass-erp/.idea/dataSources.xml
new file mode 100644
index 0000000..5fb506a
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+ <data-source source="LOCAL" name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
+ <driver-ref>mysql.8</driver-ref>
+ <synchronize>true</synchronize>
+ <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+ <jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
+ <working-dir>$ProjectFileDir$</working-dir>
+ </data-source>
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml
new file mode 100644
index 0000000..e16e1d6
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml
@@ -0,0 +1,2037 @@
+<?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>
+ <collation id="2" parent="1" name="armscii8_general_ci">
+ <Charset>armscii8</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="3" parent="1" name="armscii8_bin">
+ <Charset>armscii8</Charset>
+ </collation>
+ <collation id="4" parent="1" name="ascii_general_ci">
+ <Charset>ascii</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="5" parent="1" name="ascii_bin">
+ <Charset>ascii</Charset>
+ </collation>
+ <collation id="6" parent="1" name="big5_chinese_ci">
+ <Charset>big5</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="7" parent="1" name="big5_bin">
+ <Charset>big5</Charset>
+ </collation>
+ <collation id="8" parent="1" name="binary">
+ <Charset>binary</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="9" parent="1" name="cp1250_general_ci">
+ <Charset>cp1250</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="10" parent="1" name="cp1250_czech_cs">
+ <Charset>cp1250</Charset>
+ </collation>
+ <collation id="11" parent="1" name="cp1250_croatian_ci">
+ <Charset>cp1250</Charset>
+ </collation>
+ <collation id="12" parent="1" name="cp1250_bin">
+ <Charset>cp1250</Charset>
+ </collation>
+ <collation id="13" parent="1" name="cp1250_polish_ci">
+ <Charset>cp1250</Charset>
+ </collation>
+ <collation id="14" parent="1" name="cp1251_bulgarian_ci">
+ <Charset>cp1251</Charset>
+ </collation>
+ <collation id="15" parent="1" name="cp1251_ukrainian_ci">
+ <Charset>cp1251</Charset>
+ </collation>
+ <collation id="16" parent="1" name="cp1251_bin">
+ <Charset>cp1251</Charset>
+ </collation>
+ <collation id="17" parent="1" name="cp1251_general_ci">
+ <Charset>cp1251</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="18" parent="1" name="cp1251_general_cs">
+ <Charset>cp1251</Charset>
+ </collation>
+ <collation id="19" parent="1" name="cp1256_general_ci">
+ <Charset>cp1256</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="20" parent="1" name="cp1256_bin">
+ <Charset>cp1256</Charset>
+ </collation>
+ <collation id="21" parent="1" name="cp1257_lithuanian_ci">
+ <Charset>cp1257</Charset>
+ </collation>
+ <collation id="22" parent="1" name="cp1257_bin">
+ <Charset>cp1257</Charset>
+ </collation>
+ <collation id="23" parent="1" name="cp1257_general_ci">
+ <Charset>cp1257</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="24" parent="1" name="cp850_general_ci">
+ <Charset>cp850</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="25" parent="1" name="cp850_bin">
+ <Charset>cp850</Charset>
+ </collation>
+ <collation id="26" parent="1" name="cp852_general_ci">
+ <Charset>cp852</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="27" parent="1" name="cp852_bin">
+ <Charset>cp852</Charset>
+ </collation>
+ <collation id="28" parent="1" name="cp866_general_ci">
+ <Charset>cp866</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="29" parent="1" name="cp866_bin">
+ <Charset>cp866</Charset>
+ </collation>
+ <collation id="30" parent="1" name="cp932_japanese_ci">
+ <Charset>cp932</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="31" parent="1" name="cp932_bin">
+ <Charset>cp932</Charset>
+ </collation>
+ <collation id="32" parent="1" name="dec8_swedish_ci">
+ <Charset>dec8</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="33" parent="1" name="dec8_bin">
+ <Charset>dec8</Charset>
+ </collation>
+ <collation id="34" parent="1" name="eucjpms_japanese_ci">
+ <Charset>eucjpms</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="35" parent="1" name="eucjpms_bin">
+ <Charset>eucjpms</Charset>
+ </collation>
+ <collation id="36" parent="1" name="euckr_korean_ci">
+ <Charset>euckr</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="37" parent="1" name="euckr_bin">
+ <Charset>euckr</Charset>
+ </collation>
+ <collation id="38" parent="1" name="gb18030_chinese_ci">
+ <Charset>gb18030</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="39" parent="1" name="gb18030_bin">
+ <Charset>gb18030</Charset>
+ </collation>
+ <collation id="40" parent="1" name="gb18030_unicode_520_ci">
+ <Charset>gb18030</Charset>
+ </collation>
+ <collation id="41" parent="1" name="gb2312_chinese_ci">
+ <Charset>gb2312</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="42" parent="1" name="gb2312_bin">
+ <Charset>gb2312</Charset>
+ </collation>
+ <collation id="43" parent="1" name="gbk_chinese_ci">
+ <Charset>gbk</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="44" parent="1" name="gbk_bin">
+ <Charset>gbk</Charset>
+ </collation>
+ <collation id="45" parent="1" name="geostd8_general_ci">
+ <Charset>geostd8</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="46" parent="1" name="geostd8_bin">
+ <Charset>geostd8</Charset>
+ </collation>
+ <collation id="47" parent="1" name="greek_general_ci">
+ <Charset>greek</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="48" parent="1" name="greek_bin">
+ <Charset>greek</Charset>
+ </collation>
+ <collation id="49" parent="1" name="hebrew_general_ci">
+ <Charset>hebrew</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="50" parent="1" name="hebrew_bin">
+ <Charset>hebrew</Charset>
+ </collation>
+ <collation id="51" parent="1" name="hp8_english_ci">
+ <Charset>hp8</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="52" parent="1" name="hp8_bin">
+ <Charset>hp8</Charset>
+ </collation>
+ <collation id="53" parent="1" name="keybcs2_general_ci">
+ <Charset>keybcs2</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="54" parent="1" name="keybcs2_bin">
+ <Charset>keybcs2</Charset>
+ </collation>
+ <collation id="55" parent="1" name="koi8r_general_ci">
+ <Charset>koi8r</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="56" parent="1" name="koi8r_bin">
+ <Charset>koi8r</Charset>
+ </collation>
+ <collation id="57" parent="1" name="koi8u_general_ci">
+ <Charset>koi8u</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="58" parent="1" name="koi8u_bin">
+ <Charset>koi8u</Charset>
+ </collation>
+ <collation id="59" parent="1" name="latin1_german1_ci">
+ <Charset>latin1</Charset>
+ </collation>
+ <collation id="60" parent="1" name="latin1_swedish_ci">
+ <Charset>latin1</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="61" parent="1" name="latin1_danish_ci">
+ <Charset>latin1</Charset>
+ </collation>
+ <collation id="62" parent="1" name="latin1_german2_ci">
+ <Charset>latin1</Charset>
+ </collation>
+ <collation id="63" parent="1" name="latin1_bin">
+ <Charset>latin1</Charset>
+ </collation>
+ <collation id="64" parent="1" name="latin1_general_ci">
+ <Charset>latin1</Charset>
+ </collation>
+ <collation id="65" parent="1" name="latin1_general_cs">
+ <Charset>latin1</Charset>
+ </collation>
+ <collation id="66" parent="1" name="latin1_spanish_ci">
+ <Charset>latin1</Charset>
+ </collation>
+ <collation id="67" parent="1" name="latin2_czech_cs">
+ <Charset>latin2</Charset>
+ </collation>
+ <collation id="68" parent="1" name="latin2_general_ci">
+ <Charset>latin2</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="69" parent="1" name="latin2_hungarian_ci">
+ <Charset>latin2</Charset>
+ </collation>
+ <collation id="70" parent="1" name="latin2_croatian_ci">
+ <Charset>latin2</Charset>
+ </collation>
+ <collation id="71" parent="1" name="latin2_bin">
+ <Charset>latin2</Charset>
+ </collation>
+ <collation id="72" parent="1" name="latin5_turkish_ci">
+ <Charset>latin5</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="73" parent="1" name="latin5_bin">
+ <Charset>latin5</Charset>
+ </collation>
+ <collation id="74" parent="1" name="latin7_estonian_cs">
+ <Charset>latin7</Charset>
+ </collation>
+ <collation id="75" parent="1" name="latin7_general_ci">
+ <Charset>latin7</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="76" parent="1" name="latin7_general_cs">
+ <Charset>latin7</Charset>
+ </collation>
+ <collation id="77" parent="1" name="latin7_bin">
+ <Charset>latin7</Charset>
+ </collation>
+ <collation id="78" parent="1" name="macce_general_ci">
+ <Charset>macce</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="79" parent="1" name="macce_bin">
+ <Charset>macce</Charset>
+ </collation>
+ <collation id="80" parent="1" name="macroman_general_ci">
+ <Charset>macroman</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="81" parent="1" name="macroman_bin">
+ <Charset>macroman</Charset>
+ </collation>
+ <collation id="82" parent="1" name="sjis_japanese_ci">
+ <Charset>sjis</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="83" parent="1" name="sjis_bin">
+ <Charset>sjis</Charset>
+ </collation>
+ <collation id="84" parent="1" name="swe7_swedish_ci">
+ <Charset>swe7</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="85" parent="1" name="swe7_bin">
+ <Charset>swe7</Charset>
+ </collation>
+ <collation id="86" parent="1" name="tis620_thai_ci">
+ <Charset>tis620</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="87" parent="1" name="tis620_bin">
+ <Charset>tis620</Charset>
+ </collation>
+ <collation id="88" parent="1" name="ucs2_general_ci">
+ <Charset>ucs2</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="89" parent="1" name="ucs2_bin">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="90" parent="1" name="ucs2_unicode_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="91" parent="1" name="ucs2_icelandic_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="92" parent="1" name="ucs2_latvian_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="93" parent="1" name="ucs2_romanian_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="94" parent="1" name="ucs2_slovenian_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="95" parent="1" name="ucs2_polish_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="96" parent="1" name="ucs2_estonian_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="97" parent="1" name="ucs2_spanish_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="98" parent="1" name="ucs2_swedish_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="99" parent="1" name="ucs2_turkish_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="100" parent="1" name="ucs2_czech_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="101" parent="1" name="ucs2_danish_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="102" parent="1" name="ucs2_lithuanian_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="103" parent="1" name="ucs2_slovak_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="104" parent="1" name="ucs2_spanish2_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="105" parent="1" name="ucs2_roman_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="106" parent="1" name="ucs2_persian_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="107" parent="1" name="ucs2_esperanto_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="108" parent="1" name="ucs2_hungarian_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="109" parent="1" name="ucs2_sinhala_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="110" parent="1" name="ucs2_german2_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="111" parent="1" name="ucs2_croatian_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="112" parent="1" name="ucs2_unicode_520_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="113" parent="1" name="ucs2_vietnamese_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="114" parent="1" name="ucs2_general_mysql500_ci">
+ <Charset>ucs2</Charset>
+ </collation>
+ <collation id="115" parent="1" name="ujis_japanese_ci">
+ <Charset>ujis</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="116" parent="1" name="ujis_bin">
+ <Charset>ujis</Charset>
+ </collation>
+ <collation id="117" parent="1" name="utf16_general_ci">
+ <Charset>utf16</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="118" parent="1" name="utf16_bin">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="119" parent="1" name="utf16_unicode_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="120" parent="1" name="utf16_icelandic_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="121" parent="1" name="utf16_latvian_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="122" parent="1" name="utf16_romanian_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="123" parent="1" name="utf16_slovenian_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="124" parent="1" name="utf16_polish_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="125" parent="1" name="utf16_estonian_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="126" parent="1" name="utf16_spanish_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="127" parent="1" name="utf16_swedish_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="128" parent="1" name="utf16_turkish_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="129" parent="1" name="utf16_czech_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="130" parent="1" name="utf16_danish_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="131" parent="1" name="utf16_lithuanian_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="132" parent="1" name="utf16_slovak_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="133" parent="1" name="utf16_spanish2_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="134" parent="1" name="utf16_roman_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="135" parent="1" name="utf16_persian_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="136" parent="1" name="utf16_esperanto_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="137" parent="1" name="utf16_hungarian_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="138" parent="1" name="utf16_sinhala_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="139" parent="1" name="utf16_german2_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="140" parent="1" name="utf16_croatian_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="141" parent="1" name="utf16_unicode_520_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="142" parent="1" name="utf16_vietnamese_ci">
+ <Charset>utf16</Charset>
+ </collation>
+ <collation id="143" parent="1" name="utf16le_general_ci">
+ <Charset>utf16le</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="144" parent="1" name="utf16le_bin">
+ <Charset>utf16le</Charset>
+ </collation>
+ <collation id="145" parent="1" name="utf32_general_ci">
+ <Charset>utf32</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="146" parent="1" name="utf32_bin">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="147" parent="1" name="utf32_unicode_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="148" parent="1" name="utf32_icelandic_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="149" parent="1" name="utf32_latvian_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="150" parent="1" name="utf32_romanian_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="151" parent="1" name="utf32_slovenian_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="152" parent="1" name="utf32_polish_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="153" parent="1" name="utf32_estonian_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="154" parent="1" name="utf32_spanish_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="155" parent="1" name="utf32_swedish_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="156" parent="1" name="utf32_turkish_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="157" parent="1" name="utf32_czech_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="158" parent="1" name="utf32_danish_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="159" parent="1" name="utf32_lithuanian_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="160" parent="1" name="utf32_slovak_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="161" parent="1" name="utf32_spanish2_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="162" parent="1" name="utf32_roman_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="163" parent="1" name="utf32_persian_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="164" parent="1" name="utf32_esperanto_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="165" parent="1" name="utf32_hungarian_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="166" parent="1" name="utf32_sinhala_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="167" parent="1" name="utf32_german2_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="168" parent="1" name="utf32_croatian_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="169" parent="1" name="utf32_unicode_520_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="170" parent="1" name="utf32_vietnamese_ci">
+ <Charset>utf32</Charset>
+ </collation>
+ <collation id="171" parent="1" name="utf8_general_ci">
+ <Charset>utf8</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="172" parent="1" name="utf8_tolower_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="173" parent="1" name="utf8_bin">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="174" parent="1" name="utf8_unicode_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="175" parent="1" name="utf8_icelandic_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="176" parent="1" name="utf8_latvian_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="177" parent="1" name="utf8_romanian_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="178" parent="1" name="utf8_slovenian_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="179" parent="1" name="utf8_polish_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="180" parent="1" name="utf8_estonian_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="181" parent="1" name="utf8_spanish_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="182" parent="1" name="utf8_swedish_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="183" parent="1" name="utf8_turkish_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="184" parent="1" name="utf8_czech_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="185" parent="1" name="utf8_danish_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="186" parent="1" name="utf8_lithuanian_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="187" parent="1" name="utf8_slovak_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="188" parent="1" name="utf8_spanish2_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="189" parent="1" name="utf8_roman_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="190" parent="1" name="utf8_persian_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="191" parent="1" name="utf8_esperanto_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="192" parent="1" name="utf8_hungarian_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="193" parent="1" name="utf8_sinhala_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="194" parent="1" name="utf8_german2_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="195" parent="1" name="utf8_croatian_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="196" parent="1" name="utf8_unicode_520_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="197" parent="1" name="utf8_vietnamese_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="198" parent="1" name="utf8_general_mysql500_ci">
+ <Charset>utf8</Charset>
+ </collation>
+ <collation id="199" parent="1" name="utf8mb4_general_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="200" parent="1" name="utf8mb4_bin">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="201" parent="1" name="utf8mb4_unicode_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="202" parent="1" name="utf8mb4_icelandic_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="203" parent="1" name="utf8mb4_latvian_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="204" parent="1" name="utf8mb4_romanian_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="205" parent="1" name="utf8mb4_slovenian_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="206" parent="1" name="utf8mb4_polish_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="207" parent="1" name="utf8mb4_estonian_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="208" parent="1" name="utf8mb4_spanish_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="209" parent="1" name="utf8mb4_swedish_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="210" parent="1" name="utf8mb4_turkish_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="211" parent="1" name="utf8mb4_czech_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="212" parent="1" name="utf8mb4_danish_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="213" parent="1" name="utf8mb4_lithuanian_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="214" parent="1" name="utf8mb4_slovak_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="215" parent="1" name="utf8mb4_spanish2_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="216" parent="1" name="utf8mb4_roman_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="217" parent="1" name="utf8mb4_persian_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="218" parent="1" name="utf8mb4_esperanto_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="219" parent="1" name="utf8mb4_hungarian_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="220" parent="1" name="utf8mb4_sinhala_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="221" parent="1" name="utf8mb4_german2_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="222" parent="1" name="utf8mb4_croatian_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="223" parent="1" name="utf8mb4_unicode_520_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="224" parent="1" name="utf8mb4_vietnamese_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="225" parent="1" name="utf8mb4_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ <DefaultForCharset>1</DefaultForCharset>
+ </collation>
+ <collation id="226" parent="1" name="utf8mb4_de_pb_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="227" parent="1" name="utf8mb4_is_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="228" parent="1" name="utf8mb4_lv_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="229" parent="1" name="utf8mb4_ro_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="230" parent="1" name="utf8mb4_sl_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="231" parent="1" name="utf8mb4_pl_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="232" parent="1" name="utf8mb4_et_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="233" parent="1" name="utf8mb4_es_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="234" parent="1" name="utf8mb4_sv_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="235" parent="1" name="utf8mb4_tr_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="236" parent="1" name="utf8mb4_cs_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="237" parent="1" name="utf8mb4_da_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="238" parent="1" name="utf8mb4_lt_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="239" parent="1" name="utf8mb4_sk_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="240" parent="1" name="utf8mb4_es_trad_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="241" parent="1" name="utf8mb4_la_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="242" parent="1" name="utf8mb4_eo_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="243" parent="1" name="utf8mb4_hu_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="244" parent="1" name="utf8mb4_hr_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="245" parent="1" name="utf8mb4_vi_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="246" parent="1" name="utf8mb4_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="247" parent="1" name="utf8mb4_de_pb_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="248" parent="1" name="utf8mb4_is_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="249" parent="1" name="utf8mb4_lv_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="250" parent="1" name="utf8mb4_ro_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="251" parent="1" name="utf8mb4_sl_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="252" parent="1" name="utf8mb4_pl_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="253" parent="1" name="utf8mb4_et_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="254" parent="1" name="utf8mb4_es_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="255" parent="1" name="utf8mb4_sv_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="256" parent="1" name="utf8mb4_tr_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="257" parent="1" name="utf8mb4_cs_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="258" parent="1" name="utf8mb4_da_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="259" parent="1" name="utf8mb4_lt_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="260" parent="1" name="utf8mb4_sk_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="261" parent="1" name="utf8mb4_es_trad_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="262" parent="1" name="utf8mb4_la_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="263" parent="1" name="utf8mb4_eo_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="264" parent="1" name="utf8mb4_hu_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="265" parent="1" name="utf8mb4_hr_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="266" parent="1" name="utf8mb4_vi_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="267" parent="1" name="utf8mb4_ja_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="268" parent="1" name="utf8mb4_ja_0900_as_cs_ks">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="269" parent="1" name="utf8mb4_0900_as_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="270" parent="1" name="utf8mb4_ru_0900_ai_ci">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="271" parent="1" name="utf8mb4_ru_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="272" parent="1" name="utf8mb4_zh_0900_as_cs">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <collation id="273" parent="1" name="utf8mb4_0900_bin">
+ <Charset>utf8mb4</Charset>
+ </collation>
+ <schema id="274" parent="1" name="mysql">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="275" parent="1" name="information_schema">
+ <CollationName>utf8_general_ci</CollationName>
+ </schema>
+ <schema id="276" parent="1" name="performance_schema">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="277" parent="1" name="sys">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="278" parent="1" name="gglass">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="279" parent="1" name="glog">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="280" parent="1" name="sapsd">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="281" parent="1" name="sappp">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="282" parent="1" name="sd">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="283" parent="1" name="pp">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="284" parent="1" name="sapglass">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="285" parent="1" name="sapglog">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="286" parent="1" name="hr">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="287" parent="1" name="mm">
+ <CollationName>utf8_general_ci</CollationName>
+ </schema>
+ <schema id="288" parent="1" name="mesgglass">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="289" parent="1" name="gmms">
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <schema id="290" parent="1" name="erp_user_info">
+ <IntrospectionTimestamp>2023-11-23.19:52:30</IntrospectionTimestamp>
+ <LocalIntrospectionTimestamp>2023-11-23.03:52:30</LocalIntrospectionTimestamp>
+ <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>
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </schema>
+ <user id="292" parent="1" name="root"/>
+ <user id="293" parent="1" name="mysql.infoschema">
+ <CanLogin>0</CanLogin>
+ <Host>localhost</Host>
+ <Plugin>caching_sha2_password</Plugin>
+ </user>
+ <user id="294" parent="1" name="mysql.session">
+ <CanLogin>0</CanLogin>
+ <Host>localhost</Host>
+ <Plugin>caching_sha2_password</Plugin>
+ </user>
+ <user id="295" parent="1" name="mysql.sys">
+ <CanLogin>0</CanLogin>
+ <Host>localhost</Host>
+ <Plugin>caching_sha2_password</Plugin>
+ </user>
+ <routine id="296" parent="290" name="02">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>443</SourceTextLength>
+ </routine>
+ <routine id="297" parent="290" name="aa">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>458</SourceTextLength>
+ </routine>
+ <routine id="298" parent="290" name="anquan">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>1536</SourceTextLength>
+ </routine>
+ <routine id="299" parent="290" name="app_denglu">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>826</SourceTextLength>
+ </routine>
+ <routine id="300" parent="290" name="app_version">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>73</SourceTextLength>
+ </routine>
+ <routine id="301" parent="290" name="banzuchaxun">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>87</SourceTextLength>
+ </routine>
+ <routine id="302" parent="290" name="bumenchaxun">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>85</SourceTextLength>
+ </routine>
+ <routine id="303" parent="290" name="caiDanQuanXian">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>143</SourceTextLength>
+ </routine>
+ <routine id="304" parent="290" name="caidan">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>629</SourceTextLength>
+ </routine>
+ <routine id="305" parent="290" name="chaxungongneng">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>72</SourceTextLength>
+ </routine>
+ <routine id="306" parent="290" name="chaxunmima">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>66</SourceTextLength>
+ </routine>
+ <routine id="307" parent="290" name="denglu">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>957</SourceTextLength>
+ </routine>
+ <routine id="308" parent="290" name="dingdan_yewuyuan_chaxun1">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>115</SourceTextLength>
+ </routine>
+ <routine id="309" parent="290" name="exitsys">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>559</SourceTextLength>
+ </routine>
+ <routine id="310" parent="290" name="fahuobaobiao">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>6549</SourceTextLength>
+ </routine>
+ <routine id="311" parent="290" name="fenzuquanxian">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>2097</SourceTextLength>
+ </routine>
+ <routine id="312" parent="290" name="gongneng">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>192</SourceTextLength>
+ </routine>
+ <routine id="313" parent="290" name="mimachongzhi">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>108</SourceTextLength>
+ </routine>
+ <routine id="314" parent="290" name="mm">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>345</SourceTextLength>
+ </routine>
+ <routine id="315" parent="290" name="mokuai">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>507</SourceTextLength>
+ </routine>
+ <routine id="316" parent="290" name="mokuaichaxun">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>77</SourceTextLength>
+ </routine>
+ <routine id="317" parent="290" name="quanxian_test">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>241</SourceTextLength>
+ </routine>
+ <routine id="318" parent="290" name="quanxiancaidanchaxun">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>179</SourceTextLength>
+ </routine>
+ <routine id="319" parent="290" name="quanxiangongengchaxun">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>645</SourceTextLength>
+ </routine>
+ <routine id="320" parent="290" name="quanxiangongneng">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>234</SourceTextLength>
+ </routine>
+ <routine id="321" parent="290" name="quanxiantianjia">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>238</SourceTextLength>
+ </routine>
+ <routine id="322" parent="290" name="renzichaxun">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>85</SourceTextLength>
+ </routine>
+ <routine id="323" parent="290" name="shezhiquanxian">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>2221</SourceTextLength>
+ </routine>
+ <routine id="324" parent="290" name="tianJiaGongNeng_Test">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>250</SourceTextLength>
+ </routine>
+ <routine id="325" parent="290" name="yonghuchaxun">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>690</SourceTextLength>
+ </routine>
+ <routine id="326" parent="290" name="yuyan">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>123</SourceTextLength>
+ </routine>
+ <routine id="327" parent="290" name="zhuce">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>1231</SourceTextLength>
+ </routine>
+ <routine id="328" parent="290" name="zj">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>216</SourceTextLength>
+ </routine>
+ <table id="329" parent="290" name="sys_menu">
+ <Engine>InnoDB</Engine>
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </table>
+ <table id="330" parent="290" name="sys_menu_item">
+ <Engine>InnoDB</Engine>
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </table>
+ <table id="331" parent="290" name="user">
+ <Engine>InnoDB</Engine>
+ <Options>row_format
+DYNAMIC</Options>
+ <CollationName>utf8_general_ci</CollationName>
+ </table>
+ <routine id="332" parent="291" name="test">
+ <Definer>root@%</Definer>
+ <RoutineKind>procedure</RoutineKind>
+ <SourceTextLength>341</SourceTextLength>
+ </routine>
+ <table id="333" parent="291" name="basic_glass_type">
+ <Engine>InnoDB</Engine>
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </table>
+ <table id="334" parent="291" name="order">
+ <Engine>InnoDB</Engine>
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </table>
+ <table id="335" parent="291" name="product">
+ <Engine>InnoDB</Engine>
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </table>
+ <table id="336" parent="291" name="student">
+ <Engine>InnoDB</Engine>
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </table>
+ <table id="337" parent="291" name="teacher">
+ <Engine>InnoDB</Engine>
+ <CollationName>utf8mb4_0900_ai_ci</CollationName>
+ </table>
+ <argument id="338" parent="296" name="cishu">
+ <DasType>int|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="339" parent="296" name="yuyanleixing1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="340" parent="296" name="mokuainame1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="341" parent="296" name="caidanname1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="342" parent="296" name="yemian1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="343" parent="296" name="yuyanneirong1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>6</Position>
+ </argument>
+ <argument id="344" parent="297" name="cishu">
+ <DasType>int|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="345" parent="297" name="yuyanid1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="346" parent="297" name="yuyanleixing1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="347" parent="297" name="mokuainame1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="348" parent="297" name="caidanname1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="349" parent="297" name="yemian1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>6</Position>
+ </argument>
+ <argument id="350" parent="297" name="yuyanneirong1">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>7</Position>
+ </argument>
+ <argument id="351" parent="298" name="id">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="352" parent="298" name="tip">
+ <DasType>varchar(32)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="353" parent="298" name="ym">
+ <DasType>varchar(200)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="354" parent="298" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>int|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="355" parent="298" name="aqkey">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>varchar(30)|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="356" parent="298" name="usetime">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>int|0s</DasType>
+ <Position>6</Position>
+ </argument>
+ <argument id="357" parent="299" name="username">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="358" parent="299" name="upwd">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="359" parent="299" name="ym">
+ <DasType>varchar(200)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="360" parent="299" name="tip">
+ <DasType>varchar(32)|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="361" parent="299" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>int|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="362" parent="299" name="mingzi">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>varchar(30)|0s</DasType>
+ <Position>6</Position>
+ </argument>
+ <argument id="363" parent="299" name="aid">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>varchar(15)|0s</DasType>
+ <Position>7</Position>
+ </argument>
+ <argument id="364" parent="303" name="adminid1">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="365" parent="303" name="mokuaiid1">
+ <DasType>int|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="366" parent="303" name="caidanid1">
+ <DasType>int|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="367" parent="304" name="id">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="368" parent="304" name="mid">
+ <DasType>int|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="369" parent="304" name="yuyan">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="370" parent="304" name="ip">
+ <DasType>varchar(100)|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="371" parent="305" name="caidanid1">
+ <DasType>int|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="372" parent="306" name="adminid1">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="373" parent="307" name="username">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="374" parent="307" name="upwd">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="375" parent="307" name="ym">
+ <DasType>varchar(200)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="376" parent="307" name="tip">
+ <DasType>varchar(32)|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="377" parent="307" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>int|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="378" parent="307" name="mingzi">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>varchar(30)|0s</DasType>
+ <Position>6</Position>
+ </argument>
+ <argument id="379" parent="307" name="aid">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>varchar(50)|0s</DasType>
+ <Position>7</Position>
+ </argument>
+ <argument id="380" parent="307" name="bumen1">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>varchar(50)|0s</DasType>
+ <Position>8</Position>
+ </argument>
+ <argument id="381" parent="309" name="adid">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="382" parent="309" name="aqkey">
+ <DasType>varchar(30)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="383" parent="309" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>int|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="384" parent="310" name="kaishi">
+ <ArgumentDirection>M</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="385" parent="310" name="jieshu">
+ <ArgumentDirection>M</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="386" parent="310" name="xianghao1">
+ <ArgumentDirection>M</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="387" parent="310" name="kuan1">
+ <ArgumentDirection>M</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="388" parent="310" name="gao1">
+ <ArgumentDirection>M</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="389" parent="310" name="kehumingcheng1">
+ <ArgumentDirection>M</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>6</Position>
+ </argument>
+ <argument id="390" parent="310" name="xiangmu1">
+ <ArgumentDirection>M</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>7</Position>
+ </argument>
+ <argument id="391" parent="310" name="adminid1">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>8</Position>
+ </argument>
+ <argument id="392" parent="310" name="ip">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>9</Position>
+ </argument>
+ <argument id="393" parent="311" name="adminid1">
+ <DasType>text|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="394" parent="311" name="zhuangtai">
+ <DasType>text|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="395" parent="311" name="ip">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="396" parent="311" name="adminid3">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="397" parent="311" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="398" parent="312" name="id">
+ <DasType>int|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="399" parent="312" name="cid">
+ <DasType>int|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="400" parent="312" name="yuyan">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="401" parent="313" name="adminid1">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="402" parent="313" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>int|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="403" parent="314" name="adminid1">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="404" parent="314" name="loginpwd1">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="405" parent="314" name="ip">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="406" parent="314" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>int|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="407" parent="315" name="userid">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="408" parent="315" name="yuyan">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="409" parent="315" name="ip">
+ <DasType>varchar(100)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="410" parent="317" name="cishu">
+ <DasType>int|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="411" parent="317" name="id">
+ <DasType>varchar(10)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="412" parent="317" name="mokuai">
+ <DasType>int|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="413" parent="317" name="caidan">
+ <DasType>int|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="414" parent="317" name="gongneng">
+ <DasType>int|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="415" parent="318" name="mid">
+ <DasType>int|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="416" parent="318" name="yuyan">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="417" parent="319" name="adminid1">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="418" parent="319" name="caidanid1">
+ <DasType>int|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="419" parent="320" name="adminid1">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="420" parent="320" name="caidanid1">
+ <DasType>int|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="421" parent="322" name="gonghao1">
+ <DasType>varchar(10)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="422" parent="323" name="adminid">
+ <DasType>text|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="423" parent="323" name="mokuaiid">
+ <DasType>text|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="424" parent="323" name="caidanid">
+ <DasType>text|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="425" parent="323" name="gongnengid">
+ <DasType>text|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="426" parent="323" name="zhuangtai">
+ <DasType>text|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="427" parent="323" name="ip">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>6</Position>
+ </argument>
+ <argument id="428" parent="323" name="adminid3">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>7</Position>
+ </argument>
+ <argument id="429" parent="323" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>text|0s</DasType>
+ <Position>8</Position>
+ </argument>
+ <argument id="430" parent="324" name="cishu">
+ <DasType>int|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="431" parent="324" name="kaishiId">
+ <DasType>int|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="432" parent="324" name="yemian1">
+ <DasType>varchar(200)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="433" parent="324" name="caidanId">
+ <DasType>int|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="434" parent="325" name="loginname1">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="435" parent="325" name="adminid">
+ <DasType>varchar(10)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="436" parent="325" name="ip">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="437" parent="326" name="id">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="438" parent="326" name="leixing">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="439" parent="327" name="username">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <argument id="440" parent="327" name="upwd">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>2</Position>
+ </argument>
+ <argument id="441" parent="327" name="xingming">
+ <DasType>varchar(30)|0s</DasType>
+ <Position>3</Position>
+ </argument>
+ <argument id="442" parent="327" name="bumenbianhao">
+ <DasType>varchar(10)|0s</DasType>
+ <Position>4</Position>
+ </argument>
+ <argument id="443" parent="327" name="bumen">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>5</Position>
+ </argument>
+ <argument id="444" parent="327" name="banzu">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>6</Position>
+ </argument>
+ <argument id="445" parent="327" name="ip">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>7</Position>
+ </argument>
+ <argument id="446" parent="327" name="banzubianhao">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>8</Position>
+ </argument>
+ <argument id="447" parent="327" name="fanhui">
+ <ArgumentDirection>O</ArgumentDirection>
+ <DasType>int|0s</DasType>
+ <Position>9</Position>
+ </argument>
+ <argument id="448" parent="328" name="adminid1">
+ <DasType>varchar(15)|0s</DasType>
+ <Position>1</Position>
+ </argument>
+ <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="450" parent="329" name="menuName">
+ <Comment>妯″潡鍚嶇О</Comment>
+ <DasType>varchar(255)|0s</DasType>
+ <Position>2</Position>
+ </column>
+ <column id="451" parent="329" name="languageType">
+ <Comment>璇█绫诲瀷</Comment>
+ <DasType>varchar(10)|0s</DasType>
+ <Position>3</Position>
+ </column>
+ <column id="452" parent="329" name="state">
+ <Comment>鐘舵��</Comment>
+ <DasType>int|0s</DasType>
+ <Position>4</Position>
+ </column>
+ <column id="453" parent="329" name="listSort">
+ <Comment>鎺掑簭</Comment>
+ <DasType>varchar(255)|0s</DasType>
+ <Position>5</Position>
+ </column>
+ <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="455" parent="329" name="PRIMARY">
+ <ColNames>id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <key id="456" parent="329" name="PRIMARY">
+ <NameSurrogate>1</NameSurrogate>
+ <Primary>1</Primary>
+ <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
+ </key>
+ <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="458" parent="330" name="menuID">
+ <DasType>int|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>2</Position>
+ </column>
+ <column id="459" 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">
+ <Comment>鍦板潃</Comment>
+ <DasType>varchar(255)|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>4</Position>
+ </column>
+ <column id="461" 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">
+ <Comment>鐘舵��</Comment>
+ <DasType>int|0s</DasType>
+ <DefaultExpression>1</DefaultExpression>
+ <NotNull>1</NotNull>
+ <Position>6</Position>
+ </column>
+ <column id="463" parent="330" name="listSort">
+ <Comment>鎺掑簭</Comment>
+ <DasType>int|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>7</Position>
+ </column>
+ <column id="464" 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">
+ <ColNames>menuID</ColNames>
+ <RefColNames>id</RefColNames>
+ <RefTableName>sys_menu</RefTableName>
+ </foreign-key>
+ <index id="466" parent="330" name="PRIMARY">
+ <ColNames>id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <index id="467" parent="330" name="menuid">
+ <ColNames>menuID</ColNames>
+ <Type>btree</Type>
+ </index>
+ <key id="468" parent="330" name="PRIMARY">
+ <NameSurrogate>1</NameSurrogate>
+ <Primary>1</Primary>
+ <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
+ </key>
+ <column id="469" 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">
+ <DasType>varchar(15)|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>2</Position>
+ </column>
+ <column id="471" parent="331" name="password">
+ <DasType>varchar(15)|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>3</Position>
+ </column>
+ <column id="472" parent="331" name="user_name">
+ <DasType>varchar(30)|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>4</Position>
+ </column>
+ <column id="473" parent="331" name="address">
+ <DasType>varchar(50)|0s</DasType>
+ <Position>5</Position>
+ </column>
+ <column id="474" parent="331" name="phone">
+ <DasType>varchar(20)|0s</DasType>
+ <Position>6</Position>
+ </column>
+ <column id="475" 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">
+ <DasType>datetime|0s</DasType>
+ <Position>8</Position>
+ </column>
+ <column id="477" parent="331" name="state">
+ <DasType>int|0s</DasType>
+ <DefaultExpression>1</DefaultExpression>
+ <Position>9</Position>
+ </column>
+ <index id="478" parent="331" name="PRIMARY">
+ <ColNames>id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <key id="479" parent="331" name="PRIMARY">
+ <NameSurrogate>1</NameSurrogate>
+ <Primary>1</Primary>
+ <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
+ </key>
+ <trigger id="480" parent="331" name="logName">
+ <Definer>root@%</Definer>
+ <Events>I</Events>
+ <SourceTextLength>77</SourceTextLength>
+ <Turn>before-row</Turn>
+ </trigger>
+ <column id="481" parent="333" name="id">
+ <AutoIncrement>4</AutoIncrement>
+ <DasType>int|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>1</Position>
+ </column>
+ <column id="482" parent="333" name="level">
+ <Comment>鐜荤拑绫诲埆绛夌骇</Comment>
+ <DasType>int|0s</DasType>
+ <Position>2</Position>
+ </column>
+ <column id="483" parent="333" name="belong">
+ <Comment>浜岀骇绫诲埆鎵�灞炰竴绾х被姣�</Comment>
+ <DasType>varchar(4)|0s</DasType>
+ <Position>3</Position>
+ </column>
+ <column id="484" parent="333" name="typeID">
+ <Comment>绫诲埆id</Comment>
+ <DasType>varchar(4)|0s</DasType>
+ <Position>4</Position>
+ </column>
+ <column id="485" parent="333" name="typeName">
+ <Comment>绫诲埆鍚嶇О</Comment>
+ <DasType>varchar(20)|0s</DasType>
+ <Position>5</Position>
+ </column>
+ <column id="486" parent="333" name="createTime">
+ <Comment>鍒涘缓鏃堕棿</Comment>
+ <DasType>datetime|0s</DasType>
+ <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
+ <Position>6</Position>
+ </column>
+ <index id="487" parent="333" name="PRIMARY">
+ <ColNames>id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <index id="488" parent="333" name="typeID">
+ <ColNames>typeID</ColNames>
+ <Type>btree</Type>
+ </index>
+ <key id="489" parent="333" name="PRIMARY">
+ <NameSurrogate>1</NameSurrogate>
+ <Primary>1</Primary>
+ <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
+ </key>
+ <column id="490" parent="334" name="id">
+ <AutoIncrement>51</AutoIncrement>
+ <DasType>int|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>1</Position>
+ </column>
+ <column id="491" parent="334" name="order_id">
+ <Comment>璁㈠崟鍙�</Comment>
+ <DasType>varchar(255)|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>2</Position>
+ </column>
+ <column id="492" parent="334" name="recipe_no">
+ <Comment>閰嶆柟鍙�</Comment>
+ <DasType>varchar(255)|0s</DasType>
+ <Position>3</Position>
+ </column>
+ <column id="493" parent="334" name="largeglass_no">
+ <Comment>澶х墖鎬绘暟閲�</Comment>
+ <DasType>int|0s</DasType>
+ <Position>4</Position>
+ </column>
+ <column id="494" parent="334" name="largeglass_completed">
+ <Comment>澶х墖宸插畬鎴�</Comment>
+ <DasType>int|0s</DasType>
+ <DefaultExpression>0</DefaultExpression>
+ <Position>5</Position>
+ </column>
+ <column id="495" parent="334" name="smallglass_no">
+ <Comment>灏忕墖鎬婚噺</Comment>
+ <DasType>int|0s</DasType>
+ <Position>6</Position>
+ </column>
+ <column id="496" parent="334" name="smallglass_completed">
+ <Comment>灏忕墖宸插畬鎴�</Comment>
+ <DasType>int|0s</DasType>
+ <DefaultExpression>0</DefaultExpression>
+ <Position>7</Position>
+ </column>
+ <column id="497" parent="334" name="smallglass_processing">
+ <Comment>灏忕墖寰呭姞宸�</Comment>
+ <DasType>int|0s</DasType>
+ <Position>8</Position>
+ </column>
+ <column id="498" parent="334" name="smallglass_worn">
+ <Comment>灏忕墖娆＄牬</Comment>
+ <DasType>int|0s</DasType>
+ <DefaultExpression>0</DefaultExpression>
+ <Position>9</Position>
+ </column>
+ <column id="499" parent="334" name="order_status">
+ <Comment>璁㈠崟鐘舵��
+(0锛氬垱寤�
+1锛氬鏍�
+2.涓嬪彂棰嗗彇
+3.瀹屾垚
+)
+</Comment>
+ <DasType>int|0s</DasType>
+ <DefaultExpression>0</DefaultExpression>
+ <Position>10</Position>
+ </column>
+ <column id="500" parent="334" name="order_maker">
+ <Comment>鍒跺崟鍛�</Comment>
+ <DasType>varchar(255)|0s</DasType>
+ <Position>11</Position>
+ </column>
+ <column id="501" parent="334" name="make_time">
+ <Comment>鍒跺崟鏃堕棿</Comment>
+ <DasType>datetime|0s</DasType>
+ <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
+ <Position>12</Position>
+ </column>
+ <column id="502" parent="334" name="update_time">
+ <Comment>淇敼鏃堕棿</Comment>
+ <DasType>datetime|0s</DasType>
+ <Position>13</Position>
+ </column>
+ <index id="503" parent="334" name="PRIMARY">
+ <ColNames>id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <index id="504" parent="334" name="order_id">
+ <ColNames>order_id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <key id="505" parent="334" name="PRIMARY">
+ <NameSurrogate>1</NameSurrogate>
+ <Primary>1</Primary>
+ <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
+ </key>
+ <key id="506" parent="334" name="order_id">
+ <UnderlyingIndexName>order_id</UnderlyingIndexName>
+ </key>
+ <column id="507" parent="335" name="id">
+ <AutoIncrement>46975</AutoIncrement>
+ <DasType>int|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>1</Position>
+ </column>
+ <column id="508" parent="335" name="prodID">
+ <DasType>varchar(10)|0s</DasType>
+ <Position>2</Position>
+ </column>
+ <column id="509" parent="335" name="product">
+ <DasType>varchar(100)|0s</DasType>
+ <Position>3</Position>
+ </column>
+ <column id="510" parent="335" name="glassType">
+ <DasType>varchar(10)|0s</DasType>
+ <Position>4</Position>
+ </column>
+ <column id="511" parent="335" name="totalThickness">
+ <DasType>decimal(5,2 digit)|0s</DasType>
+ <Position>5</Position>
+ </column>
+ <column id="512" parent="335" name="thickness">
+ <DasType>decimal(5,2 digit)|0s</DasType>
+ <Position>6</Position>
+ </column>
+ <column id="513" parent="335" name="Query">
+ <DasType>varchar(30)|0s</DasType>
+ <Position>7</Position>
+ </column>
+ <column id="514" parent="335" name="remarks">
+ <DasType>varchar(255)|0s</DasType>
+ <Position>8</Position>
+ </column>
+ <column id="515" parent="335" name="state">
+ <DasType>int|0s</DasType>
+ <DefaultExpression>0</DefaultExpression>
+ <Position>9</Position>
+ </column>
+ <column id="516" parent="335" name="creator">
+ <DasType>varchar(10)|0s</DasType>
+ <Position>10</Position>
+ </column>
+ <column id="517" parent="335" name="createTime">
+ <DasType>datetime|0s</DasType>
+ <Position>11</Position>
+ </column>
+ <column id="518" parent="335" name="updateTime">
+ <DasType>datetime|0s</DasType>
+ <Position>12</Position>
+ </column>
+ <foreign-key id="519" parent="335" name="glassType">
+ <ColNames>glassType</ColNames>
+ <RefColNames>typeID</RefColNames>
+ <RefTableName>basic_glass_type</RefTableName>
+ </foreign-key>
+ <index id="520" parent="335" name="PRIMARY">
+ <ColNames>id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <index id="521" parent="335" name="glassType">
+ <ColNames>glassType</ColNames>
+ <Type>btree</Type>
+ </index>
+ <key id="522" parent="335" name="PRIMARY">
+ <NameSurrogate>1</NameSurrogate>
+ <Primary>1</Primary>
+ <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
+ </key>
+ <column id="523" parent="336" name="id">
+ <DasType>int|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>1</Position>
+ </column>
+ <column id="524" parent="336" name="name">
+ <DasType>varchar(255)|0s</DasType>
+ <Position>2</Position>
+ </column>
+ <column id="525" parent="336" name="teacherid">
+ <DasType>int|0s</DasType>
+ <Position>3</Position>
+ </column>
+ <index id="526" parent="336" name="PRIMARY">
+ <ColNames>id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <key id="527" parent="336" name="PRIMARY">
+ <NameSurrogate>1</NameSurrogate>
+ <Primary>1</Primary>
+ <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
+ </key>
+ <column id="528" parent="337" name="id">
+ <DasType>int|0s</DasType>
+ <NotNull>1</NotNull>
+ <Position>1</Position>
+ </column>
+ <column id="529" parent="337" name="teacher_name">
+ <DasType>varchar(255)|0s</DasType>
+ <Position>2</Position>
+ </column>
+ <index id="530" parent="337" name="PRIMARY">
+ <ColNames>id</ColNames>
+ <Type>btree</Type>
+ <Unique>1</Unique>
+ </index>
+ <key id="531" parent="337" name="PRIMARY">
+ <NameSurrogate>1</NameSurrogate>
+ <Primary>1</Primary>
+ <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
+ </key>
+ </database-model>
+</dataSource>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta
new file mode 100644
index 0000000..06757e8
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta
@@ -0,0 +1,2 @@
+#n:erp_sd
+!<md> [1705509001000, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta
new file mode 100644
index 0000000..4e63edb
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta
@@ -0,0 +1,2 @@
+#n:erp_user_info
+!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip
new file mode 100644
index 0000000..c2625a1
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip
Binary files differ
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/information_schema.FNRwLQ.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/information_schema.FNRwLQ.meta
new file mode 100644
index 0000000..1ff3db2
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/information_schema.FNRwLQ.meta
@@ -0,0 +1,2 @@
+#n:information_schema
+!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/mysql.osA4Bg.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/mysql.osA4Bg.meta
new file mode 100644
index 0000000..86a53f1
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/mysql.osA4Bg.meta
@@ -0,0 +1,2 @@
+#n:mysql
+!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/performance_schema.kIw0nw.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/performance_schema.kIw0nw.meta
new file mode 100644
index 0000000..9394db1
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/performance_schema.kIw0nw.meta
@@ -0,0 +1,2 @@
+#n:performance_schema
+!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sd_kd.B3aDBg.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sd_kd.B3aDBg.meta
new file mode 100644
index 0000000..4a1ef11
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sd_kd.B3aDBg.meta
@@ -0,0 +1,2 @@
+#n:sd_kd
+!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sys.zb4BAA.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sys.zb4BAA.meta
new file mode 100644
index 0000000..2f4470b
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sys.zb4BAA.meta
@@ -0,0 +1,2 @@
+#n:sys
+!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/testpp.Ena3yw.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/testpp.Ena3yw.meta
new file mode 100644
index 0000000..1bf2ef7
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/testpp.Ena3yw.meta
@@ -0,0 +1,2 @@
+#n:testpp
+!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/ztest.DHjtBg.meta b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/ztest.DHjtBg.meta
new file mode 100644
index 0000000..b736f03
--- /dev/null
+++ b/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/ztest.DHjtBg.meta
@@ -0,0 +1,2 @@
+#n:ztest
+!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/encodings.xml b/north-glass-erp/.idea/encodings.xml
new file mode 100644
index 0000000..63e9001
--- /dev/null
+++ b/north-glass-erp/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding">
+ <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/google-java-format.xml b/north-glass-erp/.idea/google-java-format.xml
new file mode 100644
index 0000000..2aa056d
--- /dev/null
+++ b/north-glass-erp/.idea/google-java-format.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GoogleJavaFormatSettings">
+ <option name="enabled" value="false" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/jarRepositories.xml b/north-glass-erp/.idea/jarRepositories.xml
new file mode 100644
index 0000000..229fa57
--- /dev/null
+++ b/north-glass-erp/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RemoteRepositoriesConfiguration">
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Central Repository" />
+ <option name="url" value="https://repo.maven.apache.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Central Repository" />
+ <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="nexus-aliyun" />
+ <option name="name" value="nexus-aliyun" />
+ <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Maven Central repository" />
+ <option name="url" value="https://repo1.maven.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="jboss.community" />
+ <option name="name" value="JBoss Community repository" />
+ <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+ </remote-repository>
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/misc.xml b/north-glass-erp/.idea/misc.xml
new file mode 100644
index 0000000..2fcd7eb
--- /dev/null
+++ b/north-glass-erp/.idea/misc.xml
@@ -0,0 +1,14 @@
+<project version="4">
+ <component name="ExternalStorageConfigurationManager" enabled="true" />
+ <component name="JavaScriptSettings">
+ <option name="languageLevel" value="FLOW" />
+ </component>
+ <component name="MavenProjectsManager">
+ <option name="originalFiles">
+ <list>
+ <option value="$PROJECT_DIR$/pom.xml" />
+ </list>
+ </option>
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/north-glass-erp.iml b/north-glass-erp/.idea/north-glass-erp.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/north-glass-erp/.idea/north-glass-erp.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/sqldialects.xml b/north-glass-erp/.idea/sqldialects.xml
new file mode 100644
index 0000000..56782ca
--- /dev/null
+++ b/north-glass-erp/.idea/sqldialects.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="SqlDialectMappings">
+ <file url="PROJECT" dialect="MySQL" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/uiDesigner.xml b/north-glass-erp/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/north-glass-erp/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/vcs.xml b/north-glass-erp/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/north-glass-erp/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/.idea/workspace.xml b/north-glass-erp/.idea/workspace.xml
new file mode 100644
index 0000000..f2a38f1
--- /dev/null
+++ b/north-glass-erp/.idea/workspace.xml
@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="AutoImportSettings">
+ <option name="autoReloadType" value="SELECTIVE" />
+ </component>
+ <component name="ChangeListManager">
+ <list default="true" id="402214ec-6c93-4a9d-b589-f17dc90f718e" name="鏇存敼" comment="11.24鎻愪氦">
+ <change afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProcessCardProgress.vue" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/service/IOrderService.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/service/impl/OrderServiceImpl.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/test/java/com/example/erp/service/IOrderServiceTest.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/dataSources/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" />
+ </list>
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="FileTemplateManagerImpl">
+ <option name="RECENT_TEMPLATES">
+ <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" />
+ </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" />
+ </component>
+ <component name="MavenImportPreferences">
+ <option name="generalSettings">
+ <MavenGeneralSettings>
+ <option name="userSettingsFile" value="C:\Users\閮璡.m2\setting.xml" />
+ </MavenGeneralSettings>
+ </option>
+ </component>
+ <component name="ProjectColorInfo">{
+ "associatedIndex": 3
+}</component>
+ <component name="ProjectId" id="2WqmfjhkKWXDFcYSDMbuyvTulCp" />
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+ <ConfirmationsSetting value="2" id="Add" />
+ </component>
+ <component name="ProjectViewState">
+ <option name="hideEmptyMiddlePackages" value="true" />
+ <option name="showLibraryContents" value="true" />
+ </component>
+ <component name="PropertiesComponent">{
+ "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:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/components/pp/processCard",
+ "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"
+ },
+ "keyToStringList": {
+ "vue.recent.templates": [
+ "Vue Composition API 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:\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" />
+ <recent name="D:\Documents\north-glass-erp\northglass-erp\src\views\sd\productManage" />
+ <recent name="D:\Documents\north-glass-erp\src\main\resources\mapper\sd" />
+ <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">
+ <option name="myCommands">
+ <command value="length" />
+ </option>
+ </component>
+ <component name="RunManager" selected="Spring Boot.ErpApplication">
+ <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+ <option name="arquillianRunConfiguration">
+ <value>
+ <option name="containerStateName" value="" />
+ </value>
+ </option>
+ <option name="TEST_OBJECT" value="class" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="IOrderServiceTest.testGetOrderList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+ <module name="erp" />
+ <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>
+ </configuration>
+ <configuration name="ErpApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+ <module name="erp" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.example.erp.ErpApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="dev" type="js.build_tools.npm" nameIsGenerated="true">
+ <package-json value="$PROJECT_DIR$/northglass-erp/package.json" />
+ <command value="run" />
+ <scripts>
+ <script value="dev" />
+ </scripts>
+ <node-interpreter value="project" />
+ <envs />
+ <method v="2" />
+ </configuration>
+ <list>
+ <item itemvalue="JUnit.IOrderServiceTest.testGetOrderList" />
+ <item itemvalue="npm.dev" />
+ <item itemvalue="Spring Boot.ErpApplication" />
+ </list>
+ <recent_temporary>
+ <list>
+ <item itemvalue="JUnit.IOrderServiceTest.testGetOrderList" />
+ </list>
+ </recent_temporary>
+ </component>
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="搴旂敤绋嬪簭绾�" UseSingleDictionary="true" transferred="true" />
+ <component name="TaskManager">
+ <task active="true" id="Default" summary="榛樿浠诲姟">
+ <changelist id="402214ec-6c93-4a9d-b589-f17dc90f718e" name="鏇存敼" comment="" />
+ <created>1697468590520</created>
+ <option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
+ <updated>1697468590520</updated>
+ <workItem from="1697468591856" duration="615000" />
+ <workItem from="1697471278802" duration="481000" />
+ <workItem from="1697471769995" duration="86000" />
+ <workItem from="1697471863704" duration="10000" />
+ <workItem from="1697471931787" duration="2170000" />
+ <workItem from="1697709162563" duration="7755000" />
+ <workItem from="1697861921999" duration="3091000" />
+ <workItem from="1697913671504" duration="4581000" />
+ <workItem from="1697952862711" duration="255000" />
+ <workItem from="1697953125809" duration="465000" />
+ <workItem from="1697953600861" duration="254000" />
+ <workItem from="1697953955642" duration="1837000" />
+ <workItem from="1697955813287" duration="28000" />
+ <workItem from="1697955848654" duration="254000" />
+ <workItem from="1697956112262" duration="5131000" />
+ <workItem from="1697962716198" duration="15661000" />
+ <workItem from="1697986744239" duration="470000" />
+ <workItem from="1698028907332" duration="13162000" />
+ <workItem from="1698197623546" duration="4985000" />
+ <workItem from="1698215909297" duration="3273000" />
+ <workItem from="1698219198366" duration="5191000" />
+ <workItem from="1698280646310" duration="8152000" />
+ <workItem from="1698627305013" duration="601000" />
+ <workItem from="1698629645528" duration="538000" />
+ <workItem from="1698632724850" duration="3196000" />
+ <workItem from="1698823498227" duration="4953000" />
+ <workItem from="1698834610157" duration="6276000" />
+ <workItem from="1699499569189" duration="4051000" />
+ <workItem from="1699581871357" duration="28597000" />
+ <workItem from="1701158711511" duration="8788000" />
+ <workItem from="1701391512754" duration="3288000" />
+ <workItem from="1701420496110" duration="3271000" />
+ <workItem from="1701669751622" duration="1416000" />
+ <workItem from="1701738277209" duration="1182000" />
+ <workItem from="1701739824218" duration="214000" />
+ <workItem from="1701740058524" duration="212000" />
+ <workItem from="1701740293916" duration="1846000" />
+ <workItem from="1701742713025" duration="305000" />
+ <workItem from="1701743968174" duration="29000" />
+ <workItem from="1701744007750" duration="58000" />
+ <workItem from="1701744074423" duration="35330000" />
+ <workItem from="1701910768762" duration="19157000" />
+ <workItem from="1701939822883" duration="20000" />
+ <workItem from="1701994104282" duration="18574000" />
+ <workItem from="1702253353629" duration="4535000" />
+ <workItem from="1702260368238" duration="4000" />
+ <workItem from="1702260752353" duration="67000" />
+ <workItem from="1702260830343" duration="31471000" />
+ <workItem from="1702426354510" duration="34981000" />
+ <workItem from="1702631535326" duration="205000" />
+ <workItem from="1702858329054" duration="9016000" />
+ <workItem from="1703031064839" duration="55055000" />
+ <workItem from="1703463546867" duration="16447000" />
+ <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" />
+ <created>1697471372444</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
+ <option name="project" value="LOCAL" />
+ <updated>1697471372445</updated>
+ </task>
+ <task id="LOCAL-00002" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1697471497874</created>
+ <option name="number" value="00002" />
+ <option name="presentableId" value="LOCAL-00002" />
+ <option name="project" value="LOCAL" />
+ <updated>1697471497874</updated>
+ </task>
+ <task id="LOCAL-00003" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1697472420788</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
+ <option name="project" value="LOCAL" />
+ <updated>1697472420788</updated>
+ </task>
+ <task id="LOCAL-00004" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1697472454035</created>
+ <option name="number" value="00004" />
+ <option name="presentableId" value="LOCAL-00004" />
+ <option name="project" value="LOCAL" />
+ <updated>1697472454035</updated>
+ </task>
+ <task id="LOCAL-00005" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1697976470632</created>
+ <option name="number" value="00005" />
+ <option name="presentableId" value="LOCAL-00005" />
+ <option name="project" value="LOCAL" />
+ <updated>1697976470632</updated>
+ </task>
+ <task id="LOCAL-00006" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1697977947581</created>
+ <option name="number" value="00006" />
+ <option name="presentableId" value="LOCAL-00006" />
+ <option name="project" value="LOCAL" />
+ <updated>1697977947581</updated>
+ </task>
+ <task id="LOCAL-00007" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1698070928863</created>
+ <option name="number" value="00007" />
+ <option name="presentableId" value="LOCAL-00007" />
+ <option name="project" value="LOCAL" />
+ <updated>1698070928863</updated>
+ </task>
+ <task id="LOCAL-00008" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1698070950071</created>
+ <option name="number" value="00008" />
+ <option name="presentableId" value="LOCAL-00008" />
+ <option name="project" value="LOCAL" />
+ <updated>1698070950071</updated>
+ </task>
+ <task id="LOCAL-00009" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1698155449740</created>
+ <option name="number" value="00009" />
+ <option name="presentableId" value="LOCAL-00009" />
+ <option name="project" value="LOCAL" />
+ <updated>1698155449740</updated>
+ </task>
+ <task id="LOCAL-00010" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1698160599574</created>
+ <option name="number" value="00010" />
+ <option name="presentableId" value="LOCAL-00010" />
+ <option name="project" value="LOCAL" />
+ <updated>1698160599574</updated>
+ </task>
+ <task id="LOCAL-00011" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1699002088623</created>
+ <option name="number" value="00011" />
+ <option name="presentableId" value="LOCAL-00011" />
+ <option name="project" value="LOCAL" />
+ <updated>1699002088623</updated>
+ </task>
+ <task id="LOCAL-00012" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1699600840886</created>
+ <option name="number" value="00012" />
+ <option name="presentableId" value="LOCAL-00012" />
+ <option name="project" value="LOCAL" />
+ <updated>1699600840886</updated>
+ </task>
+ <task id="LOCAL-00013" summary="绗竴娆℃帹閫�">
+ <option name="closed" value="true" />
+ <created>1699600891700</created>
+ <option name="number" value="00013" />
+ <option name="presentableId" value="LOCAL-00013" />
+ <option name="project" value="LOCAL" />
+ <updated>1699600891700</updated>
+ </task>
+ <task id="LOCAL-00014" summary="11.24鎻愪氦">
+ <option name="closed" value="true" />
+ <created>1700816443339</created>
+ <option name="number" value="00014" />
+ <option name="presentableId" value="LOCAL-00014" />
+ <option name="project" value="LOCAL" />
+ <updated>1700816443339</updated>
+ </task>
+ <task id="LOCAL-00015" summary="11.24鎻愪氦">
+ <option name="closed" value="true" />
+ <created>1701502564307</created>
+ <option name="number" value="00015" />
+ <option name="presentableId" value="LOCAL-00015" />
+ <option name="project" value="LOCAL" />
+ <updated>1701502564307</updated>
+ </task>
+ <option name="localTasksCounter" value="16" />
+ <servers />
+ </component>
+ <component name="TypeScriptGeneratedFilesManager">
+ <option name="version" value="3" />
+ </component>
+ <component name="Vcs.Log.Tabs.Properties">
+ <option name="TAB_STATES">
+ <map>
+ <entry key="MAIN">
+ <value>
+ <State>
+ <option name="FILTERS">
+ <map>
+ <entry key="branch">
+ <value>
+ <list>
+ <option value="master" />
+ </list>
+ </value>
+ </entry>
+ </map>
+ </option>
+ <option name="SHOW_ROOT_NAMES" value="true" />
+ </State>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </component>
+ <component name="VcsManagerConfiguration">
+ <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+ <MESSAGE value="Merge remote-tracking branch 'origin/master' # Conflicts: #	.idea/workspace.xml #	northglass-erp/src/App.vue #	northglass-erp/src/assets/main.css" />
+ <MESSAGE value="10/22鎻愪氦swaggerui" />
+ <MESSAGE value="123" />
+ <MESSAGE value="绗竴娆℃帹閫�" />
+ <MESSAGE value="11.24鎻愪氦" />
+ <option name="LAST_COMMIT_MESSAGE" value="11.24鎻愪氦" />
+ </component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager>
+ <breakpoints>
+ <line-breakpoint enabled="true" type="javascript">
+ <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
+ <line>38</line>
+ <option name="timeStamp" value="4" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="javascript">
+ <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
+ <line>254</line>
+ <option name="timeStamp" value="7" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="javascript">
+ <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
+ <line>179</line>
+ <option name="timeStamp" value="8" />
+ </line-breakpoint>
+ </breakpoints>
+ </breakpoint-manager>
+ </component>
+ <component name="XSLT-Support.FileAssociations.UIState">
+ <expand />
+ <select />
+ </component>
+</project>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/package-lock.json b/north-glass-erp/northglass-erp/package-lock.json
index 1df6e78..1e299e8 100644
--- a/north-glass-erp/northglass-erp/package-lock.json
+++ b/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"
+ }
}
}
}
diff --git a/north-glass-erp/northglass-erp/package.json b/north-glass-erp/northglass-erp/package.json
index dd1d18c..86cc4d8 100644
--- a/north-glass-erp/northglass-erp/package.json
+++ b/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",
diff --git a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
index 56c836b..d36607d 100644
--- a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
+++ b/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({
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
index b00ce2d..006feae 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
@@ -56,16 +56,6 @@
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {
- 'name': '娓呴櫎',
- 'code':'add',
- status: 'primary',
- },
- {
- 'name': '纭畾',
- 'code':'add',
- status: 'primary',
- },
],
import: false,
export: true,
@@ -144,15 +134,14 @@
</el-select>
</el-col>
<el-col :span="2"><el-text>璁㈠崟缂栧彿锛�</el-text></el-col>
- <el-col :span="4"><el-input/></el-col>
+ <el-col :span="4"><el-text /></el-col>
<el-col :span="2"><el-text>椤圭洰鍚嶇О锛�</el-text></el-col>
- <el-col :span="4"><el-input/></el-col>
+ <el-col :span="4"><el-text /></el-col>
<el-col :span="2"><el-text>鎵规鍙凤細</el-text></el-col>
- <el-col :span="4"><el-input/></el-col>
+ <el-col :span="4"><el-text /></el-col>
</el-row>
</div>
<div class="order-detail">
-
<vxe-grid
max-height="97%"
class="mytable-scrollbar"
@@ -160,7 +149,6 @@
v-bind="gridOptions"
v-on="gridEvents"
>
-
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
@@ -171,6 +159,10 @@
</vxe-grid>
+ <el-row justify="center">
+ <el-button id="searchButton" type="primary" :icon="Search" style="margin-right:20px;">娓呴櫎</el-button>
+ <el-button id="searchButton" type="primary" :icon="save" style="margin-left:20px;">纭畾</el-button>
+ </el-row>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
index 6c9f983..8a7f575 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
@@ -5,9 +5,9 @@
let router=useRouter()
const getTableRow = (row,type) =>{
switch (type) {
- case 'add' :{
- alert('鍏ュ簱鎴愬姛鍚庯紝璺宠浆鍒板簱瀛樻煡璇㈤〉闈�,搴撳瓨鏁版嵁澧炲姞涓�鏉★紒锛侊紒')
- router.push({path: '/main/productStock/ProductStockList', query: { id: row.id }})
+ case 'edit' :{
+ //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ router.push({path: '/main/productStock/OrderAllocation', query: { id: row.id }})
break
}
case 'back':{
@@ -201,10 +201,8 @@
if ($grid) {
switch (code) {
case 'add': {
- alert('鍏ュ簱鎴愬姛鍚庯紝璺宠浆鍒板簱瀛樻煡璇㈤〉闈紝搴撳瓨鏁版嵁澧炲姞涓�鏉★紒锛侊紒')
- router.push({path: '/main/productStock/ProductStockList'})
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
return;
- break
}
}
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
index 249fd05..b2e72fe 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
@@ -31,9 +31,9 @@
if($grid){
switch (code){
case 'verify':{
- alert('棰嗗嚭鎴愬姛锛岃繑鍥炲簱瀛樻煡璇㈤〉闈紝搴撳瓨鏁版嵁鍑忓皯涓�鏉★紒锛侊紒')
- router.push({path: '/main/productStock/ProductStockList'});
- return;
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ // router.push({path: '/main/productStock/OrderAllocation'});
+ // return;
break
}
case 'out':{
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
index 3e6f2dc..d7e1fcc 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -29,9 +29,9 @@
if($grid){
switch (code){
case 'ver':{
- alert('鍑哄簱鎴愬姛鍚庯紝璺宠浆鍒板簱瀛樻煡璇㈤〉闈�,鏁版嵁鍑忓皯涓�鏉★紒锛侊紒')
- router.push({path: '/main/productStock/ProductStockList'});
- return;
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ // router.push({path: '/main/productStock/OrderAllocation'});
+ // return;
break
}
case 'record':{
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
index 5b46807..19209e7 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
@@ -32,9 +32,9 @@
if($grid){
switch (code){
case 'ver':{
- alert('杩斿伐鎴愬姛锛侊紒锛�')
- // router.push({path: '/main/productStock/ProductStockList'});
- return;
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ // router.push({path: '/main/productStock/OrderAllocation'});
+ // return;
break
}
case 'record':{
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
index fc8837e..ca5b462 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
@@ -9,20 +9,17 @@
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
- alert('璋冩嫧鎴愬姛鍚庯紝璺宠浆鍥炲簱瀛樻煡璇㈤〉闈�')
- router.push({path: '/main/productStock/ProductStockList'});
- return;
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ // router.push({path: '/main/productStock/OrderAllocation', query: { id: row.id }})
break
}
case 'back':{
router.push({path: '/main/productStock/FinishedProductRework', query: { id: row.id }})
- return;
break
}
case 'out' :{
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/productStock/FinishedGoodsIssue', query: { id: row.id }})
- return;
break
}
}
@@ -177,9 +174,9 @@
if($grid){
switch (code){
case 'edit':{
- alert('璋冩嫧鎴愬姛鍚庯紝璺宠浆鍥炲簱瀛樻煡璇㈤〉闈�')
- router.push({path: '/main/productStock/ProductStockList'});
- return;
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ // router.push({path: '/main/productStock/OrderAllocation'});
+ // return;
break
}
case 'record':{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index 266412f..e5ca6ad 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -67,13 +67,13 @@
{ type: 'checkbox',fixed:"left", title: '閫夋嫨', width: 80 },
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{field: '鎺掍骇缂栧彿', title: '鎺掍骇缂栧彿', sortable: true, width: 120 },
- {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 100 },
- {field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 110},
- {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 120},
+ {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',slots: { filter: 'num1_filter' }, sortable: true, width: 100 },
+ {field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О', sortable: true, width: 110},
+ {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', sortable: true , width: 100},
{field: '搴忓彿', title: '搴忓彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90},
- {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 140},
- {field: '瀹�', title: '瀹�', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 90},
- {field: '楂�', title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true , width: 90},
+ {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sortable: true, width: 140},
+ {field: '瀹�', title: '瀹�', sortable: true , width: 70},
+ {field: '楂�', title: '楂�', sortable: true , width: 70},
{field: '鏁伴噺', title: '鏁伴噺', sortable: true , width: 70},
{field: '闈㈢Н', title: '闈㈢Н', sortable: true , width: 90},
{field: '鎺掍骇鏁伴噺' , width: 120,editRender: { name: 'input', attrs: { placeholder: '' } }, title: '鎺掍骇鏁伴噺', sortable: true},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index dffb0ef..f298d8b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -68,7 +68,7 @@
{field: '娴佺▼鍗″彿', width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '浜у搧缂栧彿', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
{field: '鎬绘暟閲�', title: '鎬绘暟閲�', sortable: true},
{field: '鎬婚潰绉�', title: '鎬婚潰绉�', sortable: true},
{field: '鍒嗙鏁�', title: '鍒嗙鏁�', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
index 849a725..38a20fd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
@@ -69,7 +69,7 @@
{field: '4',width: 120, title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: '5', width: 100,title: '闈㈢Н', sortable: true,showOverflow:"ellipsis"},
{field: '6', width: 100,title: '璁㈠崟浜ゆ帴鏃堕棿', sortable: true},
- {field: '7',width: 100, title: '閿�鍞崟鍙�', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '7',width: 100, title: '閿�鍞崟鍙�', sortable: true},
{field: '8',width: 120, title: '寮�濮嬪垏鍓叉椂闂�', sortable: true,showOverflow:"ellipsis"},
{field: '9', width: 120,title: '娴佽浆宸ュ簭', sortable: true},
{field: '10', width: 120,title: '瀹屽伐鏁伴噺', sortable: true},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 62cec04..f2b4c5b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -37,7 +37,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -127,20 +127,20 @@
},
],//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 ''
- })
- ]
- }
+ // 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 ''
+ // })
+ // ]
+ // }
})
@@ -184,17 +184,17 @@
</script>
<template>
- <div class="main-div-customer">
+ <div class="main-div-customer" >
<div id="selectForm">
<el-row :gutter="0">
- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>
+ <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" value="NG23110102" style="width: 150px"/>
<el-button type="primary">鏌ヨ</el-button>
</el-row>
</div>
<vxe-grid
- max-height="100%"
+ height="400px"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
index b9d9d7b..051e8c4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
+++ b/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) {
@@ -272,7 +273,6 @@
{ row: 0, col: 4, rowspan: 3, colspan: 0},
{ row: 3, col: 4, rowspan: 3, colspan: 0},
-
])
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue b/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
index d66aad4..a675c4a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
@@ -67,7 +67,7 @@
{field: '2',width: 100, title: '搴忓彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '3', width: 100,title: '钀芥灦椤哄簭', sortable: true,},
{field: '4',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5', width: 100,title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '5', width: 100,title: '鎵规', sortable: true,showOverflow:"ellipsis"},
{field: '6', width: 100,title: '妤煎眰缂栧彿', sortable: true},
{field: '7',width: 90, title: '瀹�', sortable: true},
{field: '8',width: 90, title: '楂�', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index 6e3103f..e07d22a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -67,7 +67,7 @@
{field: '2',width: 120, title: '宸ュ簭', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '3', width: 130,title: '鐝粍鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '4',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5', width: 100,title: '娴佺▼鍗″彿', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '5', width: 100,title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis"},
{field: '6', width: 100,title: '浜у搧澶х被', sortable: true},
{field: '7',width: 100, title: '浜у搧灏忕被', sortable: true},
{field: '8',width: 120, title: '鍦ㄥ埗鍝佸悕绉�', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index dee16ff..710fd3c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -67,7 +67,7 @@
{field: '2',width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '3', width: 130,title: '瀹㈡埛鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: '4',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5', width: 100,title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '5', width: 100,title: '鎵规', sortable: true,showOverflow:"ellipsis"},
{field: '6', width: 100,title: '搴忓彿', sortable: true},
{field: '7',width: 100, title: '褰㈢姸', sortable: true},
{field: '8',width: 120, title: '妤煎眰缂栧彿', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 8a62ae0..3d58161 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -68,7 +68,7 @@
{field: 'reportingWorkTime',width: 120, title: '鎶ュ伐鏃堕棿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'processCard', width: 130,title: '娴佺▼鍗″彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'entryName',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch', width: 100,title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'batch', width: 100,title: '鎵规', sortable: true,showOverflow:"ellipsis"},
{field: 'device', width: 100,title: '璁惧', sortable: true},
{field: 'thisProcess',width: 100, title: '鏈伐搴�', sortable: true},
{field: 'finishedNumber',width: 120, title: '鏈伐搴忓畬宸�', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
index ef5a882..e7b4593 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -70,7 +70,7 @@
{field: 'salesOrderNo',width: 120, title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'processCardNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'entryName', width: 120,title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch',width: 100, title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'batch',width: 80, title: '鎵规', sortable: true,showOverflow:"ellipsis"},
{field: 'serialNumber',width: 80, title: '搴忓彿', sortable: true},
{field: 'singlePieceName',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
{field: 'marking',width: 80, title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
index 80a0380..28caba4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -83,7 +83,7 @@
{field: 'salesOrderNo',width: 120, title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'processCardNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'entryName', width: 120,title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch',width: 100, title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'batch',width: 80, title: '鎵规', sortable: true,showOverflow:"ellipsis"},
{field: 'serialNumber',width: 80, title: '搴忓彿', sortable: true},
{field: 'singlePieceName',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
{field: 'marking',width: 80, title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index bb7570d..201e2c6 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/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>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/Product.vue b/north-glass-erp/northglass-erp/src/views/sd/product/Product.vue
index c9d96da..95552b9 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/Product.vue
+++ b/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>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue b/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
index 4d08d16..8e7266a 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
@@ -102,7 +102,6 @@
})
request.get("/product/1/100").then((res) => {
if(res.code==200){
- console.log(res.data)
produceList = produceList.value.concat(deepClone(res.data))
xGrid.value.reloadData(produceList)
@@ -170,9 +169,9 @@
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
{title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left"},
- {field: 'id', title: '缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'prodID', title: '缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'product', title: '鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'glassTypes.typeName', title: '鎵�灞炵被鍒�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'typeName', title: '鎵�灞炵被鍒�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'query', title: '蹇�熸煡璇�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'remarks', title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'creator', title: '鍒涘缓浜�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
diff --git a/north-glass-erp/northglass-erp/vite.config.js b/north-glass-erp/northglass-erp/vite.config.js
index 12e2238..103a78f 100644
--- a/north-glass-erp/northglass-erp/vite.config.js
+++ b/north-glass-erp/northglass-erp/vite.config.js
@@ -28,6 +28,4 @@
}
}
}
-
-
})
diff --git a/north-glass-erp/pom.xml b/north-glass-erp/pom.xml
index e80734f..7d7140c 100644
--- a/north-glass-erp/pom.xml
+++ b/north-glass-erp/pom.xml
@@ -120,11 +120,6 @@
<version>1.2.24</version>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- </dependency>
</dependencies>
@@ -146,7 +141,7 @@
</build>
- <repositories>
+ <!--<repositories>
<repository>
<id>nexus-aliyun</id>
<name>nexus-aliyun</name>
@@ -172,5 +167,5 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories>-->
</project>
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/OrderController.java
index c5fb7a1..e61f42d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/OrderController.java
+++ b/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);
+// }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/Order.java
index 9855e45..ba47e17 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/Order.java
+++ b/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 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
+@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;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java
index cce3bdf..4555cb9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java
@@ -4,24 +4,21 @@
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
-
-
-import java.time.LocalDate;
-
@Data
public class Product {
@TableId(type = IdType.AUTO)
- private Long id;
- private String productName;
+ private Integer id;
+ private String prodID;
+ private String product;
+ private String glassType;
private String typeName;
private Double totalThickness;
private Double thickness;
- private String query;
+ private String Query;
private String remarks;
private Integer state;
private String creator;
- private LocalDate createTime;
- private LocalDate updateTime;
+ private String createTime;
+ private String updateTime;
- private BasicGlassType basicGlassType;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/OrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/OrderMapper.java
index c3a39ac..063cd40 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/OrderMapper.java
+++ b/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);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/IOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/IOrderService.java
new file mode 100644
index 0000000..693a567
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/IOrderService.java
@@ -0,0 +1,2 @@
+package com.example.erp.service;public interface IOrderService {
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/impl/OrderServiceImpl.java b/north-glass-erp/src/main/java/com/example/erp/service/impl/OrderServiceImpl.java
new file mode 100644
index 0000000..65f8a61
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/impl/OrderServiceImpl.java
@@ -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 {
+}
diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index f8b6516..0109f84 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -14,7 +14,7 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
- erp_sd:
+ sd:
url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
username: root
password: beibo.123/
diff --git a/north-glass-erp/src/main/resources/mapper/sd/Product.xml b/north-glass-erp/src/main/resources/mapper/sd/Product.xml
index f95d31d..1778fba 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/Product.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/Product.xml
@@ -3,42 +3,24 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
-
-<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="glassTypes" 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
+ <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}
diff --git a/north-glass-erp/src/test/java/com/example/erp/service/IOrderServiceTest.java b/north-glass-erp/src/test/java/com/example/erp/service/IOrderServiceTest.java
new file mode 100644
index 0000000..25ae9d0
--- /dev/null
+++ b/north-glass-erp/src/test/java/com/example/erp/service/IOrderServiceTest.java
@@ -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());
+ }
+}
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/application.yml b/north-glass-erp/target/classes/application.yml
index f8b6516..0109f84 100644
--- a/north-glass-erp/target/classes/application.yml
+++ b/north-glass-erp/target/classes/application.yml
@@ -14,7 +14,7 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
- erp_sd:
+ sd:
url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
username: root
password: beibo.123/
diff --git a/north-glass-erp/target/classes/mapper/sd/Product.xml b/north-glass-erp/target/classes/mapper/sd/Product.xml
index f95d31d..1778fba 100644
--- a/north-glass-erp/target/classes/mapper/sd/Product.xml
+++ b/north-glass-erp/target/classes/mapper/sd/Product.xml
@@ -3,42 +3,24 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
-
-<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="glassTypes" 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
+ <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}
--
Gitblit v1.8.0