From 54bf4897233d4b4569c75ed7d259c592bc582735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
<852955+jishenghua@users.noreply.gitee.com>
Date: Tue, 19 Mar 2019 23:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7=E7=9A=84?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/pages/materials/material.html | 14 +-
pom.xml | 5 +
sql/jsh_erp.sql | 30 +
sql/华夏ERP数据库设计汇总.xlsx | Bin 83404 -> 83675 bytes
src/main/java/com/jsh/erp/ErpApplication.java | 3 +
.../java/com/jsh/erp/config/TenantConfig.java | 100 +
.../erp/controller/DepotItemController.java | 8 +-
.../jsh/erp/controller/RoleController.java | 5 +
.../jsh/erp/controller/UserController.java | 7 +
.../jsh/erp/datasource/entities/Account.java | 488 ++-
.../datasource/entities/AccountExample.java | 1564 +++----
.../erp/datasource/entities/AccountHead.java | 682 +--
.../entities/AccountHeadExample.java | 1926 +++++----
.../entities/AccountHeadVo4ListEx.java | 10 +
.../erp/datasource/entities/AccountItem.java | 424 +-
.../entities/AccountItemExample.java | 1404 +++---
.../jsh/erp/datasource/entities/Asset.java | 1258 +++---
.../datasource/entities/AssetCategory.java | 32 +
.../entities/AssetCategoryExample.java | 60 +
.../erp/datasource/entities/AssetExample.java | 2786 ++++++------
.../erp/datasource/entities/AssetName.java | 32 +
.../datasource/entities/AssetNameExample.java | 60 +
.../jsh/erp/datasource/entities/Depot.java | 616 +--
.../erp/datasource/entities/DepotExample.java | 1824 ++++----
.../erp/datasource/entities/DepotHead.java | 32 +
.../datasource/entities/DepotHeadExample.java | 60 +
.../erp/datasource/entities/DepotItem.java | 1512 +++----
.../datasource/entities/DepotItemExample.java | 3604 ++++++++--------
.../entities/DepotItemVo4Material.java | 232 +-
.../entities/DepotItemVo4WithInfoEx.java | 234 +-
.../erp/datasource/entities/InOutItem.java | 32 +
.../datasource/entities/InOutItemExample.java | 60 +
.../com/jsh/erp/datasource/entities/Log.java | 32 +
.../erp/datasource/entities/LogExample.java | 60 +
.../jsh/erp/datasource/entities/Material.java | 1557 +++----
.../datasource/entities/MaterialCategory.java | 808 ++--
.../entities/MaterialCategoryExample.java | 2204 +++++-----
.../datasource/entities/MaterialExample.java | 3820 +++++++++--------
.../datasource/entities/MaterialVo4Unit.java | 245 +-
.../erp/datasource/entities/OrgaUserRel.java | 616 +--
.../entities/OrgaUserRelExample.java | 1784 ++++----
.../erp/datasource/entities/Organization.java | 1000 ++---
.../entities/OrganizationExample.java | 2624 +++++------
.../jsh/erp/datasource/entities/Person.java | 32 +
.../datasource/entities/PersonExample.java | 60 +
.../com/jsh/erp/datasource/entities/Role.java | 32 +
.../erp/datasource/entities/RoleExample.java | 60 +
.../erp/datasource/entities/SerialNumber.java | 725 ++--
.../entities/SerialNumberExample.java | 2062 ++++-----
.../jsh/erp/datasource/entities/Supplier.java | 1384 +++---
.../datasource/entities/SupplierExample.java | 3424 +++++++--------
.../erp/datasource/entities/SystemConfig.java | 32 +
.../entities/SystemConfigExample.java | 60 +
.../com/jsh/erp/datasource/entities/Unit.java | 32 +
.../erp/datasource/entities/UnitExample.java | 60 +
.../com/jsh/erp/datasource/entities/User.java | 42 +-
.../erp/datasource/entities/UserExample.java | 84 +-
.../datasource/mappers/AccountHeadMapper.java | 194 +-
.../datasource/mappers/AccountItemMapper.java | 2 -
.../erp/datasource/mappers/AccountMapper.java | 3 -
.../jsh/erp/datasource/mappers/AppMapper.java | 1 -
.../datasource/mappers/DepotItemMapper.java | 192 +-
.../jsh/erp/datasource/mappers/LogMapper.java | 2 -
.../mappers/MaterialCategoryMapper.java | 190 +-
.../datasource/mappers/MaterialMapper.java | 194 +-
.../datasource/mappers/OrgaUserRelMapper.java | 190 +-
.../mappers/OrganizationMapper.java | 190 +-
.../mappers/SerialNumberMapper.java | 191 +-
.../datasource/mappers/SupplierMapper.java | 190 +-
.../erp/datasource/vo/AccountItemVo4List.java | 64 +-
.../datasource/vo/AccountVo4InOutList.java | 10 +
.../jsh/erp/datasource/vo/AccountVo4List.java | 74 +-
.../datasource/vo/DepotHeadVo4InDetail.java | 10 +
.../vo/DepotHeadVo4InOutMCount.java | 10 +
.../erp/datasource/vo/DepotHeadVo4List.java | 294 +-
.../vo/DepotHeadVo4StatementAccount.java | 10 +
.../com/jsh/erp/datasource/vo/LogVo4List.java | 84 +-
.../service/depotItem/DepotItemService.java | 8 +-
.../serialNumber/SerialNumberService.java | 2 +-
src/main/resources/application.properties | 4 +
.../mapper_xml/AccountHeadMapper.xml | 31 +-
.../mapper_xml/AccountItemMapper.xml | 33 +-
.../resources/mapper_xml/AccountMapper.xml | 29 +-
.../mapper_xml/AssetCategoryMapper.xml | 25 +-
src/main/resources/mapper_xml/AssetMapper.xml | 36 +-
.../resources/mapper_xml/AssetNameMapper.xml | 31 +-
.../resources/mapper_xml/DepotHeadMapper.xml | 27 +-
.../resources/mapper_xml/DepotItemMapper.xml | 31 +-
src/main/resources/mapper_xml/DepotMapper.xml | 33 +-
.../resources/mapper_xml/InOutItemMapper.xml | 25 +-
src/main/resources/mapper_xml/LogMapper.xml | 27 +-
.../mapper_xml/MaterialCategoryMapper.xml | 33 +-
.../resources/mapper_xml/MaterialMapper.xml | 52 +-
.../mapper_xml/OrgaUserRelMapper.xml | 219 +-
.../mapper_xml/OrganizationMapper.xml | 33 +-
.../resources/mapper_xml/PersonMapper.xml | 29 +-
src/main/resources/mapper_xml/RoleMapper.xml | 27 +-
.../mapper_xml/SerialNumberMapper.xml | 33 +-
.../resources/mapper_xml/SupplierMapper.xml | 33 +-
.../mapper_xml/SystemConfigMapper.xml | 26 +-
src/main/resources/mapper_xml/UnitMapper.xml | 27 +-
src/main/resources/mapper_xml/UserMapper.xml | 39 +-
src/test/resources/generatorConfig.xml | 16 +-
103 files changed, 23174 insertions(+), 21773 deletions(-)
create mode 100644 src/main/java/com/jsh/erp/config/TenantConfig.java
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 6d650362..5ea4ff23 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -85,7 +85,7 @@
| 序列号 |
- |