From 94e42e483b7f6224014ef2c2179f6ab789beb93e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 一月 2024 15:12:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 29 ++
/dev/null | 472 ------------------------------------------
north-glass-erp/src/main/resources/mapper/sd/Product.xml | 26 ++
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java | 32 +-
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 29 ++
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java | 22 ++
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java | 12 +
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 12 +
8 files changed, 141 insertions(+), 493 deletions(-)
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
deleted file mode 100644
index 87f65c2..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml
+++ /dev/null
@@ -1,1808 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSource name="@localhost ">
- <database-model serializer="dbm" dbms="MYSQL" family-id="MYSQL" format-version="4.49">
- <root id="1">
- <DefaultCasing>lower/lower</DefaultCasing>
- <DefaultEngine>InnoDB</DefaultEngine>
- <DefaultTmpEngine>InnoDB</DefaultTmpEngine>
- <Grants>|root||root||ALTER|G
-|root||root||ALTER ROUTINE|G
-|root||mysql.session|localhost|BACKUP_ADMIN|G
-|root||mysql.session|localhost|CLONE_ADMIN|G
-|root||mysql.session|localhost|CONNECTION_ADMIN|G
-|root||root||CREATE|G
-|root||root||CREATE ROLE|G
-|root||root||CREATE ROUTINE|G
-|root||root||CREATE TABLESPACE|G
-|root||root||CREATE TEMPORARY TABLES|G
-|root||root||CREATE USER|G
-|root||root||CREATE VIEW|G
-|root||root||DELETE|G
-|root||root||DROP|G
-|root||root||DROP ROLE|G
-|root||root||EVENT|G
-|root||root||EXECUTE|G
-|root||root||FILE|G
-|root||root||INDEX|G
-|root||root||INSERT|G
-|root||root||LOCK TABLES|G
-|root||mysql.session|localhost|PERSIST_RO_VARIABLES_ADMIN|G
-|root||root||PROCESS|G
-|root||root||REFERENCES|G
-|root||root||RELOAD|G
-|root||root||REPLICATION CLIENT|G
-|root||root||REPLICATION SLAVE|G
-|root||mysql.infoschema|localhost|SELECT|G
-|root||root||SELECT|G
-|root||mysql.session|localhost|SESSION_VARIABLES_ADMIN|G
-|root||root||SHOW DATABASES|G
-|root||root||SHOW VIEW|G
-|root||mysql.session|localhost|SHUTDOWN|G
-|root||root||SHUTDOWN|G
-|root||mysql.session|localhost|SUPER|G
-|root||root||SUPER|G
-|root||mysql.infoschema|localhost|SYSTEM_USER|G
-|root||mysql.session|localhost|SYSTEM_USER|G
-|root||mysql.sys|localhost|SYSTEM_USER|G
-|root||mysql.session|localhost|SYSTEM_VARIABLES_ADMIN|G
-|root||root||TRIGGER|G
-|root||root||UPDATE|G
-|root||root||grant option|G
-performance_schema|schema||mysql.session|localhost|SELECT|G
-sys|schema||mysql.sys|localhost|TRIGGER|G</Grants>
- <ServerVersion>8.0.22</ServerVersion>
- </root>
- <collation id="2" parent="1" name="armscii8_bin">
- <Charset>armscii8</Charset>
- </collation>
- <collation id="3" parent="1" name="armscii8_general_ci">
- <Charset>armscii8</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="4" parent="1" name="ascii_bin">
- <Charset>ascii</Charset>
- </collation>
- <collation id="5" parent="1" name="ascii_general_ci">
- <Charset>ascii</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="6" parent="1" name="big5_bin">
- <Charset>big5</Charset>
- </collation>
- <collation id="7" parent="1" name="big5_chinese_ci">
- <Charset>big5</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="8" parent="1" name="binary">
- <Charset>binary</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="9" parent="1" name="cp1250_bin">
- <Charset>cp1250</Charset>
- </collation>
- <collation id="10" parent="1" name="cp1250_croatian_ci">
- <Charset>cp1250</Charset>
- </collation>
- <collation id="11" parent="1" name="cp1250_czech_cs">
- <Charset>cp1250</Charset>
- </collation>
- <collation id="12" parent="1" name="cp1250_general_ci">
- <Charset>cp1250</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="13" parent="1" name="cp1250_polish_ci">
- <Charset>cp1250</Charset>
- </collation>
- <collation id="14" parent="1" name="cp1251_bin">
- <Charset>cp1251</Charset>
- </collation>
- <collation id="15" parent="1" name="cp1251_bulgarian_ci">
- <Charset>cp1251</Charset>
- </collation>
- <collation id="16" parent="1" name="cp1251_general_ci">
- <Charset>cp1251</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="17" parent="1" name="cp1251_general_cs">
- <Charset>cp1251</Charset>
- </collation>
- <collation id="18" parent="1" name="cp1251_ukrainian_ci">
- <Charset>cp1251</Charset>
- </collation>
- <collation id="19" parent="1" name="cp1256_bin">
- <Charset>cp1256</Charset>
- </collation>
- <collation id="20" parent="1" name="cp1256_general_ci">
- <Charset>cp1256</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="21" parent="1" name="cp1257_bin">
- <Charset>cp1257</Charset>
- </collation>
- <collation id="22" parent="1" name="cp1257_general_ci">
- <Charset>cp1257</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="23" parent="1" name="cp1257_lithuanian_ci">
- <Charset>cp1257</Charset>
- </collation>
- <collation id="24" parent="1" name="cp850_bin">
- <Charset>cp850</Charset>
- </collation>
- <collation id="25" parent="1" name="cp850_general_ci">
- <Charset>cp850</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="26" parent="1" name="cp852_bin">
- <Charset>cp852</Charset>
- </collation>
- <collation id="27" parent="1" name="cp852_general_ci">
- <Charset>cp852</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="28" parent="1" name="cp866_bin">
- <Charset>cp866</Charset>
- </collation>
- <collation id="29" parent="1" name="cp866_general_ci">
- <Charset>cp866</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="30" parent="1" name="cp932_bin">
- <Charset>cp932</Charset>
- </collation>
- <collation id="31" parent="1" name="cp932_japanese_ci">
- <Charset>cp932</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="32" parent="1" name="dec8_bin">
- <Charset>dec8</Charset>
- </collation>
- <collation id="33" parent="1" name="dec8_swedish_ci">
- <Charset>dec8</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="34" parent="1" name="eucjpms_bin">
- <Charset>eucjpms</Charset>
- </collation>
- <collation id="35" parent="1" name="eucjpms_japanese_ci">
- <Charset>eucjpms</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="36" parent="1" name="euckr_bin">
- <Charset>euckr</Charset>
- </collation>
- <collation id="37" parent="1" name="euckr_korean_ci">
- <Charset>euckr</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="38" parent="1" name="gb18030_bin">
- <Charset>gb18030</Charset>
- </collation>
- <collation id="39" parent="1" name="gb18030_chinese_ci">
- <Charset>gb18030</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="40" parent="1" name="gb18030_unicode_520_ci">
- <Charset>gb18030</Charset>
- </collation>
- <collation id="41" parent="1" name="gb2312_bin">
- <Charset>gb2312</Charset>
- </collation>
- <collation id="42" parent="1" name="gb2312_chinese_ci">
- <Charset>gb2312</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="43" parent="1" name="gbk_bin">
- <Charset>gbk</Charset>
- </collation>
- <collation id="44" parent="1" name="gbk_chinese_ci">
- <Charset>gbk</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="45" parent="1" name="geostd8_bin">
- <Charset>geostd8</Charset>
- </collation>
- <collation id="46" parent="1" name="geostd8_general_ci">
- <Charset>geostd8</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="47" parent="1" name="greek_bin">
- <Charset>greek</Charset>
- </collation>
- <collation id="48" parent="1" name="greek_general_ci">
- <Charset>greek</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="49" parent="1" name="hebrew_bin">
- <Charset>hebrew</Charset>
- </collation>
- <collation id="50" parent="1" name="hebrew_general_ci">
- <Charset>hebrew</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="51" parent="1" name="hp8_bin">
- <Charset>hp8</Charset>
- </collation>
- <collation id="52" parent="1" name="hp8_english_ci">
- <Charset>hp8</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="53" parent="1" name="keybcs2_bin">
- <Charset>keybcs2</Charset>
- </collation>
- <collation id="54" parent="1" name="keybcs2_general_ci">
- <Charset>keybcs2</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="55" parent="1" name="koi8r_bin">
- <Charset>koi8r</Charset>
- </collation>
- <collation id="56" parent="1" name="koi8r_general_ci">
- <Charset>koi8r</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="57" parent="1" name="koi8u_bin">
- <Charset>koi8u</Charset>
- </collation>
- <collation id="58" parent="1" name="koi8u_general_ci">
- <Charset>koi8u</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="59" parent="1" name="latin1_bin">
- <Charset>latin1</Charset>
- </collation>
- <collation id="60" parent="1" name="latin1_danish_ci">
- <Charset>latin1</Charset>
- </collation>
- <collation id="61" parent="1" name="latin1_general_ci">
- <Charset>latin1</Charset>
- </collation>
- <collation id="62" parent="1" name="latin1_general_cs">
- <Charset>latin1</Charset>
- </collation>
- <collation id="63" parent="1" name="latin1_german1_ci">
- <Charset>latin1</Charset>
- </collation>
- <collation id="64" parent="1" name="latin1_german2_ci">
- <Charset>latin1</Charset>
- </collation>
- <collation id="65" parent="1" name="latin1_spanish_ci">
- <Charset>latin1</Charset>
- </collation>
- <collation id="66" parent="1" name="latin1_swedish_ci">
- <Charset>latin1</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="67" parent="1" name="latin2_bin">
- <Charset>latin2</Charset>
- </collation>
- <collation id="68" parent="1" name="latin2_croatian_ci">
- <Charset>latin2</Charset>
- </collation>
- <collation id="69" parent="1" name="latin2_czech_cs">
- <Charset>latin2</Charset>
- </collation>
- <collation id="70" parent="1" name="latin2_general_ci">
- <Charset>latin2</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="71" parent="1" name="latin2_hungarian_ci">
- <Charset>latin2</Charset>
- </collation>
- <collation id="72" parent="1" name="latin5_bin">
- <Charset>latin5</Charset>
- </collation>
- <collation id="73" parent="1" name="latin5_turkish_ci">
- <Charset>latin5</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="74" parent="1" name="latin7_bin">
- <Charset>latin7</Charset>
- </collation>
- <collation id="75" parent="1" name="latin7_estonian_cs">
- <Charset>latin7</Charset>
- </collation>
- <collation id="76" parent="1" name="latin7_general_ci">
- <Charset>latin7</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="77" parent="1" name="latin7_general_cs">
- <Charset>latin7</Charset>
- </collation>
- <collation id="78" parent="1" name="macce_bin">
- <Charset>macce</Charset>
- </collation>
- <collation id="79" parent="1" name="macce_general_ci">
- <Charset>macce</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="80" parent="1" name="macroman_bin">
- <Charset>macroman</Charset>
- </collation>
- <collation id="81" parent="1" name="macroman_general_ci">
- <Charset>macroman</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="82" parent="1" name="sjis_bin">
- <Charset>sjis</Charset>
- </collation>
- <collation id="83" parent="1" name="sjis_japanese_ci">
- <Charset>sjis</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="84" parent="1" name="swe7_bin">
- <Charset>swe7</Charset>
- </collation>
- <collation id="85" parent="1" name="swe7_swedish_ci">
- <Charset>swe7</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="86" parent="1" name="tis620_bin">
- <Charset>tis620</Charset>
- </collation>
- <collation id="87" parent="1" name="tis620_thai_ci">
- <Charset>tis620</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="88" parent="1" name="ucs2_bin">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="89" parent="1" name="ucs2_croatian_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="90" parent="1" name="ucs2_czech_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="91" parent="1" name="ucs2_danish_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="92" parent="1" name="ucs2_esperanto_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="93" parent="1" name="ucs2_estonian_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="94" parent="1" name="ucs2_general_ci">
- <Charset>ucs2</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="95" parent="1" name="ucs2_general_mysql500_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="96" parent="1" name="ucs2_german2_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="97" parent="1" name="ucs2_hungarian_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="98" parent="1" name="ucs2_icelandic_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="99" parent="1" name="ucs2_latvian_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="100" parent="1" name="ucs2_lithuanian_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="101" parent="1" name="ucs2_persian_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="102" parent="1" name="ucs2_polish_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="103" parent="1" name="ucs2_roman_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="104" parent="1" name="ucs2_romanian_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="105" parent="1" name="ucs2_sinhala_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="106" parent="1" name="ucs2_slovak_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="107" parent="1" name="ucs2_slovenian_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="108" parent="1" name="ucs2_spanish2_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="109" parent="1" name="ucs2_spanish_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="110" parent="1" name="ucs2_swedish_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="111" parent="1" name="ucs2_turkish_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="112" parent="1" name="ucs2_unicode_520_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="113" parent="1" name="ucs2_unicode_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="114" parent="1" name="ucs2_vietnamese_ci">
- <Charset>ucs2</Charset>
- </collation>
- <collation id="115" parent="1" name="ujis_bin">
- <Charset>ujis</Charset>
- </collation>
- <collation id="116" parent="1" name="ujis_japanese_ci">
- <Charset>ujis</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="117" parent="1" name="utf16_bin">
- <Charset>utf16</Charset>
- </collation>
- <collation id="118" parent="1" name="utf16_croatian_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="119" parent="1" name="utf16_czech_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="120" parent="1" name="utf16_danish_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="121" parent="1" name="utf16_esperanto_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="122" parent="1" name="utf16_estonian_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="123" parent="1" name="utf16_general_ci">
- <Charset>utf16</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="124" parent="1" name="utf16_german2_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="125" parent="1" name="utf16_hungarian_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="126" parent="1" name="utf16_icelandic_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="127" parent="1" name="utf16_latvian_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="128" parent="1" name="utf16_lithuanian_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="129" parent="1" name="utf16_persian_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="130" parent="1" name="utf16_polish_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="131" parent="1" name="utf16_roman_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="132" parent="1" name="utf16_romanian_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="133" parent="1" name="utf16_sinhala_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="134" parent="1" name="utf16_slovak_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="135" parent="1" name="utf16_slovenian_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="136" parent="1" name="utf16_spanish2_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="137" parent="1" name="utf16_spanish_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="138" parent="1" name="utf16_swedish_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="139" parent="1" name="utf16_turkish_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="140" parent="1" name="utf16_unicode_520_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="141" parent="1" name="utf16_unicode_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="142" parent="1" name="utf16_vietnamese_ci">
- <Charset>utf16</Charset>
- </collation>
- <collation id="143" parent="1" name="utf16le_bin">
- <Charset>utf16le</Charset>
- </collation>
- <collation id="144" parent="1" name="utf16le_general_ci">
- <Charset>utf16le</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="145" parent="1" name="utf32_bin">
- <Charset>utf32</Charset>
- </collation>
- <collation id="146" parent="1" name="utf32_croatian_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="147" parent="1" name="utf32_czech_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="148" parent="1" name="utf32_danish_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="149" parent="1" name="utf32_esperanto_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="150" parent="1" name="utf32_estonian_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="151" parent="1" name="utf32_general_ci">
- <Charset>utf32</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="152" parent="1" name="utf32_german2_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="153" parent="1" name="utf32_hungarian_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="154" parent="1" name="utf32_icelandic_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="155" parent="1" name="utf32_latvian_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="156" parent="1" name="utf32_lithuanian_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="157" parent="1" name="utf32_persian_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="158" parent="1" name="utf32_polish_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="159" parent="1" name="utf32_roman_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="160" parent="1" name="utf32_romanian_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="161" parent="1" name="utf32_sinhala_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="162" parent="1" name="utf32_slovak_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="163" parent="1" name="utf32_slovenian_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="164" parent="1" name="utf32_spanish2_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="165" parent="1" name="utf32_spanish_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="166" parent="1" name="utf32_swedish_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="167" parent="1" name="utf32_turkish_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="168" parent="1" name="utf32_unicode_520_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="169" parent="1" name="utf32_unicode_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="170" parent="1" name="utf32_vietnamese_ci">
- <Charset>utf32</Charset>
- </collation>
- <collation id="171" parent="1" name="utf8_bin">
- <Charset>utf8</Charset>
- </collation>
- <collation id="172" parent="1" name="utf8_croatian_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="173" parent="1" name="utf8_czech_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="174" parent="1" name="utf8_danish_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="175" parent="1" name="utf8_esperanto_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="176" parent="1" name="utf8_estonian_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="177" parent="1" name="utf8_general_ci">
- <Charset>utf8</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="178" parent="1" name="utf8_general_mysql500_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="179" parent="1" name="utf8_german2_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="180" parent="1" name="utf8_hungarian_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="181" parent="1" name="utf8_icelandic_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="182" parent="1" name="utf8_latvian_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="183" parent="1" name="utf8_lithuanian_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="184" parent="1" name="utf8_persian_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="185" parent="1" name="utf8_polish_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="186" parent="1" name="utf8_roman_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="187" parent="1" name="utf8_romanian_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="188" parent="1" name="utf8_sinhala_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="189" parent="1" name="utf8_slovak_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="190" parent="1" name="utf8_slovenian_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="191" parent="1" name="utf8_spanish2_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="192" parent="1" name="utf8_spanish_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="193" parent="1" name="utf8_swedish_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="194" parent="1" name="utf8_tolower_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="195" parent="1" name="utf8_turkish_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="196" parent="1" name="utf8_unicode_520_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="197" parent="1" name="utf8_unicode_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="198" parent="1" name="utf8_vietnamese_ci">
- <Charset>utf8</Charset>
- </collation>
- <collation id="199" parent="1" name="utf8mb4_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- <DefaultForCharset>1</DefaultForCharset>
- </collation>
- <collation id="200" parent="1" name="utf8mb4_0900_as_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="201" parent="1" name="utf8mb4_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="202" parent="1" name="utf8mb4_0900_bin">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="203" parent="1" name="utf8mb4_bin">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="204" parent="1" name="utf8mb4_croatian_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="205" parent="1" name="utf8mb4_cs_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="206" parent="1" name="utf8mb4_cs_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="207" parent="1" name="utf8mb4_czech_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="208" parent="1" name="utf8mb4_da_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="209" parent="1" name="utf8mb4_da_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="210" parent="1" name="utf8mb4_danish_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="211" parent="1" name="utf8mb4_de_pb_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="212" parent="1" name="utf8mb4_de_pb_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="213" parent="1" name="utf8mb4_eo_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="214" parent="1" name="utf8mb4_eo_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="215" parent="1" name="utf8mb4_es_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="216" parent="1" name="utf8mb4_es_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="217" parent="1" name="utf8mb4_es_trad_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="218" parent="1" name="utf8mb4_es_trad_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="219" parent="1" name="utf8mb4_esperanto_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="220" parent="1" name="utf8mb4_estonian_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="221" parent="1" name="utf8mb4_et_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="222" parent="1" name="utf8mb4_et_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="223" parent="1" name="utf8mb4_general_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="224" parent="1" name="utf8mb4_german2_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="225" parent="1" name="utf8mb4_hr_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="226" parent="1" name="utf8mb4_hr_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="227" parent="1" name="utf8mb4_hu_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="228" parent="1" name="utf8mb4_hu_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="229" parent="1" name="utf8mb4_hungarian_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="230" parent="1" name="utf8mb4_icelandic_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="231" parent="1" name="utf8mb4_is_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="232" parent="1" name="utf8mb4_is_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="233" parent="1" name="utf8mb4_ja_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="234" parent="1" name="utf8mb4_ja_0900_as_cs_ks">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="235" parent="1" name="utf8mb4_la_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="236" parent="1" name="utf8mb4_la_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="237" parent="1" name="utf8mb4_latvian_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="238" parent="1" name="utf8mb4_lithuanian_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="239" parent="1" name="utf8mb4_lt_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="240" parent="1" name="utf8mb4_lt_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="241" parent="1" name="utf8mb4_lv_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="242" parent="1" name="utf8mb4_lv_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="243" parent="1" name="utf8mb4_persian_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="244" parent="1" name="utf8mb4_pl_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="245" parent="1" name="utf8mb4_pl_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="246" parent="1" name="utf8mb4_polish_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="247" parent="1" name="utf8mb4_ro_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="248" parent="1" name="utf8mb4_ro_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="249" parent="1" name="utf8mb4_roman_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="250" parent="1" name="utf8mb4_romanian_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="251" parent="1" name="utf8mb4_ru_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="252" parent="1" name="utf8mb4_ru_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="253" parent="1" name="utf8mb4_sinhala_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="254" parent="1" name="utf8mb4_sk_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="255" parent="1" name="utf8mb4_sk_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="256" parent="1" name="utf8mb4_sl_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="257" parent="1" name="utf8mb4_sl_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="258" parent="1" name="utf8mb4_slovak_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="259" parent="1" name="utf8mb4_slovenian_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="260" parent="1" name="utf8mb4_spanish2_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="261" parent="1" name="utf8mb4_spanish_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="262" parent="1" name="utf8mb4_sv_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="263" parent="1" name="utf8mb4_sv_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="264" parent="1" name="utf8mb4_swedish_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="265" parent="1" name="utf8mb4_tr_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="266" parent="1" name="utf8mb4_tr_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="267" parent="1" name="utf8mb4_turkish_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="268" parent="1" name="utf8mb4_unicode_520_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="269" parent="1" name="utf8mb4_unicode_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="270" parent="1" name="utf8mb4_vi_0900_ai_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="271" parent="1" name="utf8mb4_vi_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="272" parent="1" name="utf8mb4_vietnamese_ci">
- <Charset>utf8mb4</Charset>
- </collation>
- <collation id="273" parent="1" name="utf8mb4_zh_0900_as_cs">
- <Charset>utf8mb4</Charset>
- </collation>
- <schema id="274" parent="1" name="erp_user_info">
- <IntrospectionTimestamp>2024-01-22.17:05:18</IntrospectionTimestamp>
- <LocalIntrospectionTimestamp>2024-01-22.01:05:18</LocalIntrospectionTimestamp>
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="275" parent="1" name="gglass">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="276" parent="1" name="glog">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="277" parent="1" name="gmms">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="278" parent="1" name="hr">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="279" parent="1" name="information_schema">
- <CollationName>utf8_general_ci</CollationName>
- </schema>
- <schema id="280" parent="1" name="mesgglass">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="281" parent="1" name="mm">
- <CollationName>utf8_general_ci</CollationName>
- </schema>
- <schema id="282" parent="1" name="mysql">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="283" parent="1" name="performance_schema">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="284" parent="1" name="pp">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="285" parent="1" name="sapglass">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="286" parent="1" name="sapglog">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="287" parent="1" name="sappp">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="288" parent="1" name="sapsd">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="289" parent="1" name="sd">
- <IntrospectionTimestamp>2024-01-22.17:05:10</IntrospectionTimestamp>
- <LocalIntrospectionTimestamp>2024-01-22.01:05:10</LocalIntrospectionTimestamp>
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="290" parent="1" name="sd_ly">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <schema id="291" parent="1" name="sys">
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </schema>
- <user id="292" parent="1" name="mysql.infoschema">
- <CanLogin>0</CanLogin>
- <Host>localhost</Host>
- <Plugin>caching_sha2_password</Plugin>
- </user>
- <user id="293" parent="1" name="mysql.session">
- <CanLogin>0</CanLogin>
- <Host>localhost</Host>
- <Plugin>caching_sha2_password</Plugin>
- </user>
- <user id="294" parent="1" name="mysql.sys">
- <CanLogin>0</CanLogin>
- <Host>localhost</Host>
- <Plugin>caching_sha2_password</Plugin>
- </user>
- <user id="295" parent="1" name="root"/>
- <routine id="296" parent="274" name="02">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>443</SourceTextLength>
- </routine>
- <routine id="297" parent="274" name="aa">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>458</SourceTextLength>
- </routine>
- <routine id="298" parent="274" name="anquan">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>1536</SourceTextLength>
- </routine>
- <routine id="299" parent="274" name="app_denglu">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>826</SourceTextLength>
- </routine>
- <routine id="300" parent="274" name="app_version">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>73</SourceTextLength>
- </routine>
- <routine id="301" parent="274" name="banzuchaxun">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>87</SourceTextLength>
- </routine>
- <routine id="302" parent="274" name="bumenchaxun">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>85</SourceTextLength>
- </routine>
- <routine id="303" parent="274" name="caiDanQuanXian">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>143</SourceTextLength>
- </routine>
- <routine id="304" parent="274" name="caidan">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>629</SourceTextLength>
- </routine>
- <routine id="305" parent="274" name="chaxungongneng">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>72</SourceTextLength>
- </routine>
- <routine id="306" parent="274" name="chaxunmima">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>66</SourceTextLength>
- </routine>
- <routine id="307" parent="274" name="denglu">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>957</SourceTextLength>
- </routine>
- <routine id="308" parent="274" name="dingdan_yewuyuan_chaxun1">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>115</SourceTextLength>
- </routine>
- <routine id="309" parent="274" name="exitsys">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>559</SourceTextLength>
- </routine>
- <routine id="310" parent="274" name="fahuobaobiao">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>6549</SourceTextLength>
- </routine>
- <routine id="311" parent="274" name="fenzuquanxian">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>2097</SourceTextLength>
- </routine>
- <routine id="312" parent="274" name="gongneng">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>192</SourceTextLength>
- </routine>
- <routine id="313" parent="274" name="mimachongzhi">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>108</SourceTextLength>
- </routine>
- <routine id="314" parent="274" name="mm">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>345</SourceTextLength>
- </routine>
- <routine id="315" parent="274" name="mokuai">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>507</SourceTextLength>
- </routine>
- <routine id="316" parent="274" name="mokuaichaxun">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>77</SourceTextLength>
- </routine>
- <routine id="317" parent="274" name="quanxian_test">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>241</SourceTextLength>
- </routine>
- <routine id="318" parent="274" name="quanxiancaidanchaxun">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>179</SourceTextLength>
- </routine>
- <routine id="319" parent="274" name="quanxiangongengchaxun">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>645</SourceTextLength>
- </routine>
- <routine id="320" parent="274" name="quanxiangongneng">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>234</SourceTextLength>
- </routine>
- <routine id="321" parent="274" name="quanxiantianjia">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>238</SourceTextLength>
- </routine>
- <routine id="322" parent="274" name="renzichaxun">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>85</SourceTextLength>
- </routine>
- <routine id="323" parent="274" name="shezhiquanxian">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>2221</SourceTextLength>
- </routine>
- <routine id="324" parent="274" name="tianJiaGongNeng_Test">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>250</SourceTextLength>
- </routine>
- <routine id="325" parent="274" name="yonghuchaxun">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>690</SourceTextLength>
- </routine>
- <routine id="326" parent="274" name="yuyan">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>123</SourceTextLength>
- </routine>
- <routine id="327" parent="274" name="zhuce">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>1231</SourceTextLength>
- </routine>
- <routine id="328" parent="274" name="zj">
- <Definer>root@%</Definer>
- <RoutineKind>procedure</RoutineKind>
- <SourceTextLength>216</SourceTextLength>
- </routine>
- <table id="329" parent="274" name="sys_menu">
- <Engine>InnoDB</Engine>
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </table>
- <table id="330" parent="274" name="sys_menu_item">
- <Engine>InnoDB</Engine>
- <CollationName>utf8mb4_0900_ai_ci</CollationName>
- </table>
- <table id="331" parent="274" name="user">
- <Engine>InnoDB</Engine>
- <Options>row_format
-DYNAMIC</Options>
- <CollationName>utf8_general_ci</CollationName>
- </table>
- <argument id="332" parent="296" name="cishu">
- <DasType>int|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="333" parent="296" name="yuyanleixing1">
- <DasType>varchar(50)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="334" parent="296" name="mokuainame1">
- <DasType>varchar(50)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="335" parent="296" name="caidanname1">
- <DasType>varchar(50)|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="336" parent="296" name="yemian1">
- <DasType>varchar(50)|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="337" parent="296" name="yuyanneirong1">
- <DasType>varchar(50)|0s</DasType>
- <Position>6</Position>
- </argument>
- <argument id="338" parent="297" name="cishu">
- <DasType>int|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="339" parent="297" name="yuyanid1">
- <DasType>varchar(50)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="340" parent="297" name="yuyanleixing1">
- <DasType>varchar(50)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="341" parent="297" name="mokuainame1">
- <DasType>varchar(50)|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="342" parent="297" name="caidanname1">
- <DasType>varchar(50)|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="343" parent="297" name="yemian1">
- <DasType>varchar(50)|0s</DasType>
- <Position>6</Position>
- </argument>
- <argument id="344" parent="297" name="yuyanneirong1">
- <DasType>varchar(50)|0s</DasType>
- <Position>7</Position>
- </argument>
- <argument id="345" parent="298" name="id">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="346" parent="298" name="tip">
- <DasType>varchar(32)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="347" parent="298" name="ym">
- <DasType>varchar(200)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="348" parent="298" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>int|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="349" parent="298" name="aqkey">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>varchar(30)|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="350" parent="298" name="usetime">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>int|0s</DasType>
- <Position>6</Position>
- </argument>
- <argument id="351" parent="299" name="username">
- <DasType>varchar(20)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="352" parent="299" name="upwd">
- <DasType>varchar(20)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="353" parent="299" name="ym">
- <DasType>varchar(200)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="354" parent="299" name="tip">
- <DasType>varchar(32)|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="355" parent="299" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>int|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="356" parent="299" name="mingzi">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>varchar(30)|0s</DasType>
- <Position>6</Position>
- </argument>
- <argument id="357" parent="299" name="aid">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>varchar(15)|0s</DasType>
- <Position>7</Position>
- </argument>
- <argument id="358" parent="303" name="adminid1">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="359" parent="303" name="mokuaiid1">
- <DasType>int|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="360" parent="303" name="caidanid1">
- <DasType>int|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="361" parent="304" name="id">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="362" parent="304" name="mid">
- <DasType>int|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="363" parent="304" name="yuyan">
- <DasType>varchar(20)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="364" parent="304" name="ip">
- <DasType>varchar(100)|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="365" parent="305" name="caidanid1">
- <DasType>int|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="366" parent="306" name="adminid1">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="367" parent="307" name="username">
- <DasType>varchar(50)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="368" parent="307" name="upwd">
- <DasType>varchar(20)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="369" parent="307" name="ym">
- <DasType>varchar(200)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="370" parent="307" name="tip">
- <DasType>varchar(32)|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="371" parent="307" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>int|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="372" parent="307" name="mingzi">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>varchar(30)|0s</DasType>
- <Position>6</Position>
- </argument>
- <argument id="373" parent="307" name="aid">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>varchar(50)|0s</DasType>
- <Position>7</Position>
- </argument>
- <argument id="374" parent="307" name="bumen1">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>varchar(50)|0s</DasType>
- <Position>8</Position>
- </argument>
- <argument id="375" parent="309" name="adid">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="376" parent="309" name="aqkey">
- <DasType>varchar(30)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="377" parent="309" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>int|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="378" parent="310" name="kaishi">
- <ArgumentDirection>M</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="379" parent="310" name="jieshu">
- <ArgumentDirection>M</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="380" parent="310" name="xianghao1">
- <ArgumentDirection>M</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="381" parent="310" name="kuan1">
- <ArgumentDirection>M</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="382" parent="310" name="gao1">
- <ArgumentDirection>M</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="383" parent="310" name="kehumingcheng1">
- <ArgumentDirection>M</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>6</Position>
- </argument>
- <argument id="384" parent="310" name="xiangmu1">
- <ArgumentDirection>M</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>7</Position>
- </argument>
- <argument id="385" parent="310" name="adminid1">
- <DasType>varchar(20)|0s</DasType>
- <Position>8</Position>
- </argument>
- <argument id="386" parent="310" name="ip">
- <DasType>varchar(20)|0s</DasType>
- <Position>9</Position>
- </argument>
- <argument id="387" parent="311" name="adminid1">
- <DasType>text|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="388" parent="311" name="zhuangtai">
- <DasType>text|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="389" parent="311" name="ip">
- <DasType>varchar(50)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="390" parent="311" name="adminid3">
- <DasType>varchar(50)|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="391" parent="311" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="392" parent="312" name="id">
- <DasType>int|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="393" parent="312" name="cid">
- <DasType>int|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="394" parent="312" name="yuyan">
- <DasType>varchar(20)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="395" parent="313" name="adminid1">
- <DasType>varchar(20)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="396" parent="313" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>int|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="397" parent="314" name="adminid1">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="398" parent="314" name="loginpwd1">
- <DasType>varchar(15)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="399" parent="314" name="ip">
- <DasType>varchar(50)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="400" parent="314" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>int|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="401" parent="315" name="userid">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="402" parent="315" name="yuyan">
- <DasType>varchar(20)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="403" parent="315" name="ip">
- <DasType>varchar(100)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="404" parent="317" name="cishu">
- <DasType>int|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="405" parent="317" name="id">
- <DasType>varchar(10)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="406" parent="317" name="mokuai">
- <DasType>int|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="407" parent="317" name="caidan">
- <DasType>int|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="408" parent="317" name="gongneng">
- <DasType>int|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="409" parent="318" name="mid">
- <DasType>int|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="410" parent="318" name="yuyan">
- <DasType>varchar(20)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="411" parent="319" name="adminid1">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="412" parent="319" name="caidanid1">
- <DasType>int|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="413" parent="320" name="adminid1">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="414" parent="320" name="caidanid1">
- <DasType>int|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="415" parent="322" name="gonghao1">
- <DasType>varchar(10)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="416" parent="323" name="adminid">
- <DasType>text|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="417" parent="323" name="mokuaiid">
- <DasType>text|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="418" parent="323" name="caidanid">
- <DasType>text|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="419" parent="323" name="gongnengid">
- <DasType>text|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="420" parent="323" name="zhuangtai">
- <DasType>text|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="421" parent="323" name="ip">
- <DasType>varchar(50)|0s</DasType>
- <Position>6</Position>
- </argument>
- <argument id="422" parent="323" name="adminid3">
- <DasType>varchar(50)|0s</DasType>
- <Position>7</Position>
- </argument>
- <argument id="423" parent="323" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>text|0s</DasType>
- <Position>8</Position>
- </argument>
- <argument id="424" parent="324" name="cishu">
- <DasType>int|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="425" parent="324" name="kaishiId">
- <DasType>int|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="426" parent="324" name="yemian1">
- <DasType>varchar(200)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="427" parent="324" name="caidanId">
- <DasType>int|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="428" parent="325" name="loginname1">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="429" parent="325" name="adminid">
- <DasType>varchar(10)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="430" parent="325" name="ip">
- <DasType>varchar(50)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="431" parent="326" name="id">
- <DasType>varchar(50)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="432" parent="326" name="leixing">
- <DasType>varchar(50)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="433" parent="327" name="username">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <argument id="434" parent="327" name="upwd">
- <DasType>varchar(15)|0s</DasType>
- <Position>2</Position>
- </argument>
- <argument id="435" parent="327" name="xingming">
- <DasType>varchar(30)|0s</DasType>
- <Position>3</Position>
- </argument>
- <argument id="436" parent="327" name="bumenbianhao">
- <DasType>varchar(10)|0s</DasType>
- <Position>4</Position>
- </argument>
- <argument id="437" parent="327" name="bumen">
- <DasType>varchar(50)|0s</DasType>
- <Position>5</Position>
- </argument>
- <argument id="438" parent="327" name="banzu">
- <DasType>varchar(50)|0s</DasType>
- <Position>6</Position>
- </argument>
- <argument id="439" parent="327" name="ip">
- <DasType>varchar(50)|0s</DasType>
- <Position>7</Position>
- </argument>
- <argument id="440" parent="327" name="banzubianhao">
- <DasType>varchar(50)|0s</DasType>
- <Position>8</Position>
- </argument>
- <argument id="441" parent="327" name="fanhui">
- <ArgumentDirection>O</ArgumentDirection>
- <DasType>int|0s</DasType>
- <Position>9</Position>
- </argument>
- <argument id="442" parent="328" name="adminid1">
- <DasType>varchar(15)|0s</DasType>
- <Position>1</Position>
- </argument>
- <column id="443" parent="329" name="id">
- <AutoIncrement>4</AutoIncrement>
- <Comment>鑷id</Comment>
- <DasType>int|0s</DasType>
- <NotNull>1</NotNull>
- <Position>1</Position>
- </column>
- <column id="444" parent="329" name="menuName">
- <Comment>妯″潡鍚嶇О</Comment>
- <DasType>varchar(255)|0s</DasType>
- <Position>2</Position>
- </column>
- <column id="445" parent="329" name="icon">
- <DasType>varchar(255)|0s</DasType>
- <Position>3</Position>
- </column>
- <column id="446" parent="329" name="languageType">
- <Comment>璇█绫诲瀷</Comment>
- <DasType>varchar(10)|0s</DasType>
- <Position>4</Position>
- </column>
- <column id="447" parent="329" name="state">
- <Comment>鐘舵��</Comment>
- <DasType>int|0s</DasType>
- <Position>5</Position>
- </column>
- <column id="448" parent="329" name="listSort">
- <Comment>鎺掑簭</Comment>
- <DasType>varchar(255)|0s</DasType>
- <Position>6</Position>
- </column>
- <column id="449" parent="329" name="createTime">
- <Comment>鍒涘缓鏃堕棿</Comment>
- <DasType>datetime|0s</DasType>
- <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
- <NotNull>1</NotNull>
- <Position>7</Position>
- </column>
- <index id="450" parent="329" name="PRIMARY">
- <ColNames>id</ColNames>
- <Type>btree</Type>
- <Unique>1</Unique>
- </index>
- <key id="451" parent="329" name="PRIMARY">
- <NameSurrogate>1</NameSurrogate>
- <Primary>1</Primary>
- <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
- </key>
- <column id="452" parent="330" name="id">
- <AutoIncrement>22</AutoIncrement>
- <Comment>鑷id</Comment>
- <DasType>int|0s</DasType>
- <NotNull>1</NotNull>
- <Position>1</Position>
- </column>
- <column id="453" parent="330" name="menuID">
- <DasType>int|0s</DasType>
- <NotNull>1</NotNull>
- <Position>2</Position>
- </column>
- <column id="454" parent="330" name="itemName">
- <Comment>鑿滃崟鍚嶇О</Comment>
- <DasType>varchar(255)|0s</DasType>
- <NotNull>1</NotNull>
- <Position>3</Position>
- </column>
- <column id="455" parent="330" name="url">
- <Comment>鍦板潃</Comment>
- <DasType>varchar(255)|0s</DasType>
- <NotNull>1</NotNull>
- <Position>4</Position>
- </column>
- <column id="456" parent="330" name="languageType">
- <Comment>璇█绫诲瀷</Comment>
- <DasType>varchar(255)|0s</DasType>
- <NotNull>1</NotNull>
- <Position>5</Position>
- </column>
- <column id="457" parent="330" name="state">
- <Comment>鐘舵��</Comment>
- <DasType>int|0s</DasType>
- <DefaultExpression>1</DefaultExpression>
- <NotNull>1</NotNull>
- <Position>6</Position>
- </column>
- <column id="458" parent="330" name="listSort">
- <Comment>鎺掑簭</Comment>
- <DasType>int|0s</DasType>
- <NotNull>1</NotNull>
- <Position>7</Position>
- </column>
- <column id="459" parent="330" name="createTime">
- <Comment>鍒涘缓鏃堕棿</Comment>
- <DasType>datetime|0s</DasType>
- <NotNull>1</NotNull>
- <Position>8</Position>
- </column>
- <foreign-key id="460" parent="330" name="menuid">
- <ColNames>menuID</ColNames>
- <RefColNames>id</RefColNames>
- <RefTableName>sys_menu</RefTableName>
- </foreign-key>
- <index id="461" parent="330" name="PRIMARY">
- <ColNames>id</ColNames>
- <Type>btree</Type>
- <Unique>1</Unique>
- </index>
- <index id="462" parent="330" name="menuid">
- <ColNames>menuID</ColNames>
- <Type>btree</Type>
- </index>
- <key id="463" parent="330" name="PRIMARY">
- <NameSurrogate>1</NameSurrogate>
- <Primary>1</Primary>
- <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
- </key>
- <column id="464" parent="331" name="id">
- <AutoIncrement>40</AutoIncrement>
- <DasType>int|0s</DasType>
- <NotNull>1</NotNull>
- <Position>1</Position>
- </column>
- <column id="465" parent="331" name="login_name">
- <DasType>varchar(15)|0s</DasType>
- <NotNull>1</NotNull>
- <Position>2</Position>
- </column>
- <column id="466" parent="331" name="password">
- <DasType>varchar(15)|0s</DasType>
- <NotNull>1</NotNull>
- <Position>3</Position>
- </column>
- <column id="467" parent="331" name="user_name">
- <DasType>varchar(30)|0s</DasType>
- <NotNull>1</NotNull>
- <Position>4</Position>
- </column>
- <column id="468" parent="331" name="address">
- <DasType>varchar(50)|0s</DasType>
- <Position>5</Position>
- </column>
- <column id="469" parent="331" name="phone">
- <DasType>varchar(20)|0s</DasType>
- <Position>6</Position>
- </column>
- <column id="470" parent="331" name="create_time">
- <DasType>datetime|0s</DasType>
- <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
- <Position>7</Position>
- </column>
- <column id="471" parent="331" name="update_time">
- <DasType>datetime|0s</DasType>
- <Position>8</Position>
- </column>
- <column id="472" parent="331" name="state">
- <DasType>int|0s</DasType>
- <DefaultExpression>1</DefaultExpression>
- <Position>9</Position>
- </column>
- <index id="473" parent="331" name="PRIMARY">
- <ColNames>id</ColNames>
- <Type>btree</Type>
- <Unique>1</Unique>
- </index>
- <key id="474" parent="331" name="PRIMARY">
- <NameSurrogate>1</NameSurrogate>
- <Primary>1</Primary>
- <UnderlyingIndexName>PRIMARY</UnderlyingIndexName>
- </key>
- <trigger id="475" parent="331" name="logName">
- <Definer>root@%</Definer>
- <Events>I</Events>
- <SourceTextLength>77</SourceTextLength>
- <Turn>before-row</Turn>
- </trigger>
- </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
deleted file mode 100644
index 681dcc7..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#n:erp_sd
-!<md> [1705914095000, 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
deleted file mode 100644
index 0fb7685..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#n:erp_user_info
-!<md> [1705914318000, 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
deleted file mode 100644
index 2935edb..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip
+++ /dev/null
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
deleted file mode 100644
index 1ff3db2..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/information_schema.FNRwLQ.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#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
deleted file mode 100644
index 86a53f1..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/mysql.osA4Bg.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#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
deleted file mode 100644
index 9394db1..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/performance_schema.kIw0nw.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#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
deleted file mode 100644
index 4a1ef11..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sd_kd.B3aDBg.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#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
deleted file mode 100644
index 2f4470b..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sys.zb4BAA.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#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
deleted file mode 100644
index 1bf2ef7..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/testpp.Ena3yw.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#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
deleted file mode 100644
index b736f03..0000000
--- a/north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/ztest.DHjtBg.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-#n:ztest
-!<md> [null, 0, null, null, -2147483648, -2147483648]
diff --git a/north-glass-erp/.idea/workspace.xml b/north-glass-erp/.idea/workspace.xml
deleted file mode 100644
index 8337d82..0000000
--- a/north-glass-erp/.idea/workspace.xml
+++ /dev/null
@@ -1,472 +0,0 @@
-<?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 beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/northglass-erp/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/stores/sd/product/productGlassType.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/stores/sd/product/productGlassType.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/controller/sd/ProductController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/controller/sd/ProductController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/sd/Product.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/sd/Product.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/mapper/sd/ProductMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/mapper/sd/ProductMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/service/sd/BasicGlassTypeServise.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/service/sd/BasicGlassTypeServise.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/erp/service/sd/ProductService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/service/sd/ProductService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/sd/Product.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/sd/Product.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/test/java/com/example/erp/service/IOrderServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/erp/service/IOrderServiceTest.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/sd/Product.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/sd/Product.xml" afterDir="false" />
- </list>
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <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" />
- <option value="JavaScript File" />
- </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"><![CDATA[{
- "keyToString": {
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "WebServerToolWindowFactoryState": "false",
- "com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary": "JUnit5",
- "com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5": "",
- "git-widget-placeholder": "master",
- "last_opened_file_path": "D:/Documents/ERP_override/north-glass-erp/northglass-erp/src/views/sd/product",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "project.structure.last.edited": "妯″潡",
- "project.structure.proportion": "0.0",
- "project.structure.side.proportion": "0.0",
- "settings.editor.selected.configurable": "MavenSettings",
- "spring.configuration.checksum": "def6d90e829e50c63f98c387daecd138",
- "ts.external.directory.path": "D:\\file\\IntelliJ IDEA 2023.2.1\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
- "vue.rearranger.settings.migration": "true"
- },
- "keyToStringList": {
- "DatabaseDriversLRU": [
- "mysql"
- ],
- "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:\Documents\ERP_override\north-glass-erp\northglass-erp\src\views\sd\product" />
- <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\components\pp\processCard" />
- <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\components\pp\workorder" />
- <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\views\pp\workOrder" />
- <recent name="D:\Documents\north-glass-erp\src\main\resources\mapper\userInfo" />
- </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="generated-requests | #2" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http" index="2" requestIdentifier="#2" runType="杩愯鍗曚釜璇锋眰">
- <method v="2" />
- </configuration>
- <configuration name="generated-requests涓殑鎵�鏈�" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http">
- <method v="2" />
- </configuration>
- <configuration name="IOrderServiceTest.testGetOrderList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
- <module name="erp" />
- <extension name="coverage">
- <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="HTTP 璇锋眰.generated-requests | #2" />
- <item itemvalue="HTTP 璇锋眰.generated-requests涓殑鎵�鏈�" />
- <item itemvalue="JUnit.IOrderServiceTest.testGetOrderList" />
- <item itemvalue="npm.dev" />
- <item itemvalue="Spring Boot.ErpApplication" />
- </list>
- <recent_temporary>
- <list>
- <item itemvalue="HTTP 璇锋眰.generated-requests涓殑鎵�鏈�" />
- <item itemvalue="HTTP 璇锋眰.generated-requests | #2" />
- <item itemvalue="JUnit.IOrderServiceTest.testGetOrderList" />
- </list>
- </recent_temporary>
- </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" />
- <workItem from="1705884104780" duration="598000" />
- <workItem from="1705884720189" duration="21268000" />
- </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/components/basic/BasicTable.vue</url>
- <line>1</line>
- <properties lambdaOrdinal="-1" />
- <option name="timeStamp" value="9" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="javascript">
- <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
- <line>178</line>
- <properties lambdaOrdinal="-1" />
- <option name="timeStamp" value="12" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="javascript">
- <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
- <line>291</line>
- <properties lambdaOrdinal="-1" />
- <option name="timeStamp" value="13" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="javascript">
- <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
- <line>148</line>
- <properties lambdaOrdinal="-1" />
- <option name="timeStamp" value="14" />
- </line-breakpoint>
- </breakpoints>
- </breakpoint-manager>
- </component>
- <component name="XSLT-Support.FileAssociations.UIState">
- <expand />
- <select />
- </component>
-</project>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
index 6763729..a6eab00 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
@@ -13,28 +13,18 @@
@TableId(type = IdType.AUTO)
private Long id;
- private Integer deliveryState;
- private Integer stockState;
- private String deliveryId;
- private String project;
- private String customerName;
- private LocalDate deliveryDate;
- private String payMethod;
- private LocalDate payDate;
- private String salaManId;
- private String salaMan;
- private String createrId;
- private String creator;
- private String contacts;
- private String contactNumber;
- private String deliveryAddress;
+ private String orderId;
+ private Integer orderNumber;
+ private Integer inventory ;
+ private Double actualSignalArea;
private Double area;
- private Integer quantity;
- private Double money;
- private String remarks;
- private LocalDate createTime;
+ private Integer quantityAvailable;
+ private String warehouseNumber;
+ private LocalDate storageRegion;
+ private Integer status;
+ private LocalDate enterStorageTime;
+ private String remark;
private LocalDate updateTime;
- private Order order;
- private Customer customer;
+ private LocalDate endTime;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java
new file mode 100644
index 0000000..80c328e
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java
@@ -0,0 +1,22 @@
+package com.example.erp.entity.mm;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class FinishedOperateLog {
+ @TableId(type = IdType.AUTO)
+
+ private Long id;
+ private String operationOrderNumber;
+ private Long productNumber;
+ private Integer operationNumber ;
+ private String operateType;
+ private String operator;
+ private LocalDate operateTime;
+
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
new file mode 100644
index 0000000..7c499b9
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
@@ -0,0 +1,12 @@
+package com.example.erp.mapper.mm;
+
+import com.example.erp.entity.mm.FinishedGoodsInventory;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface FinishedGoodsInventoryMapper {
+ List<FinishedGoodsInventory> defaultProduct(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
new file mode 100644
index 0000000..523b395
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -0,0 +1,12 @@
+package com.example.erp.mapper.mm;
+
+import com.example.erp.entity.mm.FinishedOperateLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface FinishedOperateLogMapper {
+ List<FinishedOperateLog> defaultProduct(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
+}
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
new file mode 100644
index 0000000..1778fba
--- /dev/null
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
+ <select id="defaultProduct">
+ select
+ a.id,
+ prodID,
+ product,
+ glassType,
+ typeName,
+ totalThickness,
+ thickness,
+ Query,
+ remarks,
+ state,
+ creator,
+ date(a.createTime) as 'createTime',
+ updateTime
+ from
+ product as a
+ left join basic_glass_type bgt on bgt.typeID = a.glassType
+
+ order by id desc
+ limit #{offset},#{pageSize}
+ ;
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
new file mode 100644
index 0000000..1778fba
--- /dev/null
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
+ <select id="defaultProduct">
+ select
+ a.id,
+ prodID,
+ product,
+ glassType,
+ typeName,
+ totalThickness,
+ thickness,
+ Query,
+ remarks,
+ state,
+ creator,
+ date(a.createTime) as 'createTime',
+ updateTime
+ from
+ product as a
+ left join basic_glass_type bgt on bgt.typeID = a.glassType
+
+ order by id desc
+ limit #{offset},#{pageSize}
+ ;
+ </select>
+</mapper>
\ No newline at end of file
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 fcc975a..b774dab 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/Product.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/Product.xml
@@ -5,7 +5,11 @@
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
<resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
<id column="id" property="id"/>
+<<<<<<< HEAD
<result column="product_name" property="productName"/>
+=======
+ <result column="product" property="product"/>
+>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
<result column="total_thickness" property="totalThickness"/>
<result column="thickness" property="thickness"/>
<result column="query" property="query"/>
@@ -14,8 +18,13 @@
<result column="creator" property="creator"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
+<<<<<<< HEAD
<association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
<result column="type_id" property="typeID"/>
+=======
+ <association property="glassType" javaType="com.example.erp.entity.sd.GlassType">
+ <result column="type_id" property="typeId"/>
+>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
<result column="type_name" property="typeName"/>
</association>
<!--<result column="g_typeId" property="glassTypes.typeId"/>
@@ -24,6 +33,7 @@
</resultMap>
<select id="defaultProduct" resultMap="productmap">
+<<<<<<< HEAD
select a.id as id,
a.product_name,
a.total_thickness,
@@ -61,6 +71,22 @@
and date(a.create_time) regexp #{product.createTime}
</if>
</where>
+=======
+ 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
+>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
order by id desc
limit #{offset},#{pageSize}
--
Gitblit v1.8.0