Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
9cbf815e
"vscode:/vscode.git/clone" did not exist on "2853f394e73e7b56443169d1a427a06a62fe11ad"
Commit
9cbf815e
authored
May 10, 2020
by
季圣华
Browse files
优化系统名称
parent
a99e489c
Changes
11
Hide whitespace changes
Inline
Side-by-side
erp_web/home.html
View file @
9cbf815e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<meta
content=
"no-cache"
http-equiv=
"Pragma"
/>
<meta
content=
"no-cache"
http-equiv=
"Pragma"
/>
<meta
http-equiv=
"Expires"
content=
"0"
/>
<meta
http-equiv=
"Expires"
content=
"0"
/>
<meta
content=
"width=device-width, initial-scale=1, user-scalable=1"
name=
"viewport"
/>
<meta
content=
"width=device-width, initial-scale=1, user-scalable=1"
name=
"viewport"
/>
<title>
首页-
华夏ERP
</title>
<title>
华夏ERP
</title>
<link
rel=
"shortcut icon"
href=
"images/favicon.ico"
type=
"image/x-icon"
/>
<link
rel=
"shortcut icon"
href=
"images/favicon.ico"
type=
"image/x-icon"
/>
<script
src=
"js/jquery/jquery-1.12.4.min.js"
></script>
<script
src=
"js/jquery/jquery-1.12.4.min.js"
></script>
<!--[if lt IE 9]><script src="js/common/h5fix.min.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/common/h5fix.min.js"></script><![endif]-->
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
</div>
</div>
<footer
class=
"main-footer m0"
>
<footer
class=
"main-footer m0"
>
<div
class=
"pull-right hidden-xs"
>
当前版本: V2.1
</div>
<div
class=
"pull-right hidden-xs"
>
当前版本: V2.1
</div>
©
2015-20
2
0 华夏ERP
Demo
- Powered By
<a
href=
"http://www.huaxiaerp.com/"
target=
"_blank"
>
官方网站
</a>
©
2015-20
3
0 华夏ERP - Powered By
<a
href=
"http://www.huaxiaerp.com/"
target=
"_blank"
>
官方网站
</a>
</footer>
</footer>
</div>
</div>
...
...
erp_web/login.html
View file @
9cbf815e
...
@@ -8,9 +8,9 @@
...
@@ -8,9 +8,9 @@
<meta
content=
"no-cache"
http-equiv=
"Pragma"
/>
<meta
content=
"no-cache"
http-equiv=
"Pragma"
/>
<meta
http-equiv=
"Expires"
content=
"0"
/>
<meta
http-equiv=
"Expires"
content=
"0"
/>
<meta
content=
"width=device-width, initial-scale=1, user-scalable=1"
name=
"viewport"
/>
<meta
content=
"width=device-width, initial-scale=1, user-scalable=1"
name=
"viewport"
/>
<title>
华夏ERP
</title>
<title></title>
<meta
name=
"keywords"
content=
"ERP,ERP系统,进销存,进销存系统"
/>
<meta
name=
"keywords"
content=
"ERP,ERP系统,进销存,进销存系统"
/>
<meta
name=
"description"
content=
"
华夏
ERP
基于SpringBoot框架,立志为中小企业提供开源好用的ERP软件,目前专注进销存+财务功能。主要模块有零售管理、采购管理、销售管理、仓库管理、财务管理、报表查询、基础数据、系统管理等。支持预付款、收入支出、仓库调拨、组装拆卸、订单等特色功能。拥有库存状况、出入库统计等报表。同时对角色和权限进行了细致全面控制,精确到每个按钮和菜单。
"
/>
<meta
name=
"description"
content=
"ERP
系统,进销存系统
"
/>
<link
rel=
"shortcut icon"
href=
"images/favicon.ico"
type=
"image/x-icon"
/>
<link
rel=
"shortcut icon"
href=
"images/favicon.ico"
type=
"image/x-icon"
/>
<script
src=
"js/jquery/jquery-1.12.4.min.js"
></script>
<script
src=
"js/jquery/jquery-1.12.4.min.js"
></script>
<!--[if lt IE 9]><script src="js/common/h5fix.min.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/common/h5fix.min.js"></script><![endif]-->
...
@@ -79,13 +79,8 @@
...
@@ -79,13 +79,8 @@
</div>
</div>
</div>
</div>
<div
class=
"login-copyright"
>
<div
class=
"login-copyright"
>
© 2015-2020
© 2015-2030 华夏ERP - Powered By
<a
style=
"color:#00458a;"
href=
"http://www.huaxiaerp.com/"
target=
"_blank"
>
ERP系统
</a>
<a
style=
"color:#00458a;"
href=
"http://www.huaxiaerp.com/"
target=
"_blank"
>
官方网站
</a>
<a
style=
"color:#00458a;"
href=
"http://www.beian.miit.gov.cn"
target=
"_blank"
>
苏ICP备19040373号
</a>
<a
style=
"color:#00458a;"
href=
"https://gitee.com/jishenghua/JSH_ERP"
target=
"_blank"
>
华夏ERP
</a>
<a
href=
'https://gitee.com/jishenghua/JSH_ERP/stargazers'
target=
"_blank"
>
<img
src=
'https://gitee.com/jishenghua/JSH_ERP/badge/star.svg?theme=white'
alt=
'star'
></img>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
erp_web/register.html
View file @
9cbf815e
...
@@ -8,9 +8,9 @@
...
@@ -8,9 +8,9 @@
<meta
content=
"no-cache"
http-equiv=
"Pragma"
/>
<meta
content=
"no-cache"
http-equiv=
"Pragma"
/>
<meta
http-equiv=
"Expires"
content=
"0"
/>
<meta
http-equiv=
"Expires"
content=
"0"
/>
<meta
content=
"width=device-width, initial-scale=1, user-scalable=1"
name=
"viewport"
/>
<meta
content=
"width=device-width, initial-scale=1, user-scalable=1"
name=
"viewport"
/>
<title>
注册 -
华夏ERP
</title>
<title>
华夏ERP
</title>
<meta
name=
"keywords"
content=
"ERP,ERP系统,进销存,进销存系统"
/>
<meta
name=
"keywords"
content=
"ERP,ERP系统,进销存,进销存系统"
/>
<meta
name=
"description"
content=
"
华夏
ERP
基于SpringBoot框架,立志为中小企业提供开源好用的ERP软件,目前专注进销存+财务功能。主要模块有零售管理、采购管理、销售管理、仓库管理、财务管理、报表查询、基础数据、系统管理等。支持预付款、收入支出、仓库调拨、组装拆卸、订单等特色功能。拥有库存状况、出入库统计等报表。同时对角色和权限进行了细致全面控制,精确到每个按钮和菜单。
"
/>
<meta
name=
"description"
content=
"ERP
系统,进销存系统
"
/>
<link
rel=
"shortcut icon"
href=
"images/favicon.ico"
type=
"image/png"
>
<link
rel=
"shortcut icon"
href=
"images/favicon.ico"
type=
"image/png"
>
<script
src=
"js/jquery/jquery-1.12.4.min.js"
></script>
<script
src=
"js/jquery/jquery-1.12.4.min.js"
></script>
<!--[if lt IE 9]><script src="js/common/h5fix.min.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/common/h5fix.min.js"></script><![endif]-->
...
@@ -93,13 +93,8 @@
...
@@ -93,13 +93,8 @@
</div>
</div>
</div>
</div>
<div
class=
"register-copyright"
>
<div
class=
"register-copyright"
>
© 2015-2020
© 2015-2030 华夏ERP - Powered By
<a
style=
"color:#00458a;"
href=
"http://www.huaxiaerp.com/"
target=
"_blank"
>
ERP系统
</a>
<a
style=
"color:#00458a;"
href=
"http://www.huaxiaerp.com/"
target=
"_blank"
>
官方网站
</a>
<a
style=
"color:#00458a;"
href=
"http://www.beian.miit.gov.cn"
target=
"_blank"
>
苏ICP备19040373号
</a>
<a
style=
"color:#00458a;"
href=
"https://gitee.com/jishenghua/JSH_ERP"
target=
"_blank"
>
华夏ERP
</a>
<a
href=
'https://gitee.com/jishenghua/JSH_ERP/stargazers'
target=
"_blank"
>
<img
src=
'https://gitee.com/jishenghua/JSH_ERP/badge/star.svg?theme=white'
alt=
'star'
></img>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/main/java/com/jsh/erp/controller/FunctionsController.java
View file @
9cbf815e
...
@@ -22,7 +22,7 @@ import java.util.ArrayList;
...
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
/**
/**
* @author ji-sheng-hua
华夏
ERP
* @author ji-sheng-hua
jsh
ERP
*/
*/
@RestController
@RestController
@RequestMapping
(
value
=
"/functions"
)
@RequestMapping
(
value
=
"/functions"
)
...
...
src/main/java/com/jsh/erp/controller/InOutItemController.java
View file @
9cbf815e
...
@@ -19,7 +19,7 @@ import java.util.List;
...
@@ -19,7 +19,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
* @author jishenghua
华夏
ERP 2018年12月25日14:38:08
* @author jishenghua
jsh
ERP 2018年12月25日14:38:08
*/
*/
@RestController
@RestController
@RequestMapping
(
value
=
"/inOutItem"
)
@RequestMapping
(
value
=
"/inOutItem"
)
...
...
src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
View file @
9cbf815e
...
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import
java.util.List
;
import
java.util.List
;
/**
/**
* @author ji—sheng—hua
华夏
ERP
* @author ji—sheng—hua
jsh
ERP
*/
*/
@RestController
@RestController
@RequestMapping
(
value
=
"/materialCategory"
)
@RequestMapping
(
value
=
"/materialCategory"
)
...
...
src/main/java/com/jsh/erp/controller/MaterialController.java
View file @
9cbf815e
...
@@ -29,7 +29,7 @@ import java.util.*;
...
@@ -29,7 +29,7 @@ import java.util.*;
import
static
com
.
jsh
.
erp
.
utils
.
ResponseJsonUtil
.
returnJson
;
import
static
com
.
jsh
.
erp
.
utils
.
ResponseJsonUtil
.
returnJson
;
/**
/**
* @author ji|sheng|hua
华夏
ERP
* @author ji|sheng|hua
jsh
ERP
*/
*/
@RestController
@RestController
@RequestMapping
(
value
=
"/material"
)
@RequestMapping
(
value
=
"/material"
)
...
...
src/main/java/com/jsh/erp/controller/MsgController.java
View file @
9cbf815e
...
@@ -14,7 +14,7 @@ import java.util.List;
...
@@ -14,7 +14,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
* @author ji sheng hua
华夏
ERP
* @author ji sheng hua
jsh
ERP
*/
*/
@RestController
@RestController
@RequestMapping
(
value
=
"/msg"
)
@RequestMapping
(
value
=
"/msg"
)
...
...
src/main/java/com/jsh/erp/controller/RoleController.java
View file @
9cbf815e
...
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
import
java.util.List
;
import
java.util.List
;
/**
/**
* @author ji sheng hua
华夏
ERP
* @author ji sheng hua
jsh
ERP
*/
*/
@RestController
@RestController
@RequestMapping
(
value
=
"/role"
)
@RequestMapping
(
value
=
"/role"
)
...
...
src/main/java/com/jsh/erp/controller/SystemConfigController.java
View file @
9cbf815e
...
@@ -14,8 +14,7 @@ import javax.annotation.Resource;
...
@@ -14,8 +14,7 @@ import javax.annotation.Resource;
/**
/**
* Description
* Description
*
* @Author: jishenghua
* @Author: qiankunpingtai
* @Date: 2019/4/1 15:28
* @Date: 2019/4/1 15:28
*/
*/
@RestController
@RestController
...
@@ -24,14 +23,9 @@ public class SystemConfigController {
...
@@ -24,14 +23,9 @@ public class SystemConfigController {
private
Logger
logger
=
LoggerFactory
.
getLogger
(
SystemConfigController
.
class
);
private
Logger
logger
=
LoggerFactory
.
getLogger
(
SystemConfigController
.
class
);
@Resource
@Resource
private
SystemConfigService
systemConfigService
;
private
SystemConfigService
systemConfigService
;
/**
/**
* create by: qiankunpingtai
* website:https://qiankunpingtai.cn
* description:
* 批量删除系统配置信息
* 批量删除系统配置信息
* create time: 2019/3/29 11:15
* @Param: ids
* @return java.lang.Object
*/
*/
@RequestMapping
(
value
=
"/batchDeleteSystemConfigByIds"
)
@RequestMapping
(
value
=
"/batchDeleteSystemConfigByIds"
)
public
Object
batchDeleteSystemConfigByIds
(
@RequestParam
(
"ids"
)
String
ids
)
throws
Exception
{
public
Object
batchDeleteSystemConfigByIds
(
@RequestParam
(
"ids"
)
String
ids
)
throws
Exception
{
...
...
src/main/java/com/jsh/erp/controller/UserBusinessController.java
View file @
9cbf815e
...
@@ -21,7 +21,7 @@ import java.util.Map;
...
@@ -21,7 +21,7 @@ import java.util.Map;
import
static
com
.
jsh
.
erp
.
utils
.
ResponseJsonUtil
.
returnJson
;
import
static
com
.
jsh
.
erp
.
utils
.
ResponseJsonUtil
.
returnJson
;
/**
/**
* @author ji_sheng_hua
华夏
ERP
* @author ji_sheng_hua
jsh
ERP
*/
*/
@RestController
@RestController
@RequestMapping
(
value
=
"/userBusiness"
)
@RequestMapping
(
value
=
"/userBusiness"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment