Skip to content
GitLab
Commit f2244a3a authored by baozhuhui's avatar baozhuhui
Browse files

Merge branch 'master' of https://gitee.com/tearn/JSH_ERP 

# Conflicts:
#	src/main/java/com/jsh/erp/service/app/AppService.java
#	src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java
parents ff28be71 1a8b4d89
Show whitespace changes
Inline Side-by-side
erp_web/js/pages/financial/financial_base.js
View file @ f2244a3a
...@@ -486,8 +486,11 @@ ...@@ -486,8 +486,11 @@
{ {
$.ajax({ $.ajax({
type:"post", type:"post",
url: "/accountHead/" + accountHeadID + "/delete", url: "/accountHead/batchDeleteAccountHeadByIds",
dataType: "json", dataType: "json",
data:{
ids: accountHeadID
},
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -576,7 +579,7 @@ ...@@ -576,7 +579,7 @@
//批量删除 //批量删除
$.ajax({ $.ajax({
type:"post", type:"post",
url: "/accountHead/batchDelete", url: "/accountHead/batchDeleteAccountHeadByIds",
dataType: "json", dataType: "json",
async : false, async : false,
data: ({ data: ({
......
erp_web/js/pages/manage/supplier.js
View file @ f2244a3a
...@@ -170,8 +170,11 @@ ...@@ -170,8 +170,11 @@
var supplierTotalInfo = supplierInfo.split("AaBb"); var supplierTotalInfo = supplierInfo.split("AaBb");
$.ajax({ $.ajax({
type:"post", type:"post",
url: "/supplier/" + supplierTotalInfo[0] + "/delete", url: "/supplier/batchDeleteSupplierByIds",
dataType: "json", dataType: "json",
data: ({
ids : supplierTotalInfo[0]
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -210,7 +213,7 @@ ...@@ -210,7 +213,7 @@
} }
$.ajax({ $.ajax({
type:"post", type:"post",
url: "/supplier/batchDelete", url: "/supplier/batchDeleteSupplierByIds",
dataType: "json", dataType: "json",
async : false, async : false,
data: ({ data: ({
......
erp_web/pages/manage/account.html
View file @ f2244a3a
...@@ -225,8 +225,11 @@ ...@@ -225,8 +225,11 @@
var accountTotalInfo = accountInfo.split("AaBb"); var accountTotalInfo = accountInfo.split("AaBb");
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/account/" + accountTotalInfo[0] + "/delete", url: "/account/batchDeleteAccountByIds",
dataType: "json", dataType: "json",
data: ({
ids: accountTotalInfo[0]
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -264,7 +267,7 @@ ...@@ -264,7 +267,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/account/batchDelete", url: "/account/batchDeleteAccountByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/manage/app.html
View file @ f2244a3a
...@@ -270,8 +270,11 @@ ...@@ -270,8 +270,11 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/app/" + appID + "/delete", url: "/app/batchDeleteAppByIds",
dataType: "json", dataType: "json",
data: ({
ids: appID
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -309,7 +312,7 @@ ...@@ -309,7 +312,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/app/batchDelete", url: "/app/batchDeleteAppByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/manage/depot.html
View file @ f2244a3a
...@@ -255,8 +255,11 @@ ...@@ -255,8 +255,11 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/depot/" + depotID + "/delete", url: "/depot/batchDeleteDepotByIds",
dataType: "json", dataType: "json",
data: ({
ids: depotID
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -294,7 +297,7 @@ ...@@ -294,7 +297,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/depot/batchDelete", url: "/depot/batchDeleteDepotByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/manage/functions.html
View file @ f2244a3a
...@@ -268,8 +268,11 @@ ...@@ -268,8 +268,11 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/functions/" + functionsID + "/delete", url: "/functions/batchDeleteFunctionsByIds",
dataType: "json", dataType: "json",
data: ({
ids: functionsID
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -307,7 +310,7 @@ ...@@ -307,7 +310,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/functions/batchDelete", url: "/functions/batchDeleteFunctionsByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/manage/inOutItem.html
View file @ f2244a3a
...@@ -225,8 +225,11 @@ ...@@ -225,8 +225,11 @@
var inOutItemTotalInfo = inOutItemInfo.split("AaBb"); var inOutItemTotalInfo = inOutItemInfo.split("AaBb");
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/inOutItem/" + inOutItemTotalInfo[0] + "/delete", url: "/inOutItem/batchDeleteInOutItemByIds",
dataType: "json", dataType: "json",
data: ({
ids: inOutItemTotalInfo[0]
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -264,7 +267,7 @@ ...@@ -264,7 +267,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/inOutItem/batchDelete", url: "/inOutItem/batchDeleteInOutItemByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/manage/role.html
View file @ f2244a3a
...@@ -203,8 +203,11 @@ ...@@ -203,8 +203,11 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/role/" + roleID + "/delete", url: "/role/batchDeleteRoleByIds",
dataType: "json", dataType: "json",
data: ({
ids: roleID,
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -242,7 +245,7 @@ ...@@ -242,7 +245,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/role/batchDelete", url: "/role/batchDeleteRoleByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/manage/systemConfig.html
View file @ f2244a3a
...@@ -192,8 +192,11 @@ ...@@ -192,8 +192,11 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/systemConfig/" + systemConfigId + "/delete", url: "/systemConfig/batchDeleteSystemConfigByIds",
dataType: "json", dataType: "json",
data: ({
ids: systemConfigId
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -235,7 +238,7 @@ ...@@ -235,7 +238,7 @@
} else { } else {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/systemConfig/batchDelete", url: "/systemConfig/batchDeleteSystemConfigByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/manage/unit.html
View file @ f2244a3a
...@@ -197,8 +197,11 @@ ...@@ -197,8 +197,11 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/unit/" + unitID + "/delete", url: "/unit/batchDeleteUnitByIds",
dataType: "json", dataType: "json",
data: ({
ids: unitID
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -237,7 +240,7 @@ ...@@ -237,7 +240,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/unit/batchDelete", url: "/unit/batchDeleteUnitByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/materials/material.html
View file @ f2244a3a
...@@ -771,8 +771,11 @@ ...@@ -771,8 +771,11 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/material/" + materialID + "/delete", url: "/material/batchDeleteMaterialByIds",
dataType: "json", dataType: "json",
data: ({
ids: materialID
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -811,7 +814,7 @@ ...@@ -811,7 +814,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/material/batchDelete", url: "/material/batchDeleteMaterialByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
erp_web/pages/materials/person.html
View file @ f2244a3a
...@@ -249,8 +249,11 @@ ...@@ -249,8 +249,11 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/person/" + personID + "/delete", url: "/person/batchDeletePersonByIds",
dataType: "json", dataType: "json",
data: ({
ids: personID
}),
success: function (res) { success: function (res) {
if(res && res.code == 200) { if(res && res.code == 200) {
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -289,7 +292,7 @@ ...@@ -289,7 +292,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/person/batchDelete", url: "/person/batchDeletePersonByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
......
src/main/java/com/jsh/erp/constants/ExceptionConstants.java
View file @ f2244a3a
...@@ -42,9 +42,163 @@ public class ExceptionConstants { ...@@ -42,9 +42,163 @@ public class ExceptionConstants {
//登录名已存在 //登录名已存在
public static final int USER_LOGIN_NAME_ALREADY_EXISTS_CODE = 500003; public static final int USER_LOGIN_NAME_ALREADY_EXISTS_CODE = 500003;
public static final String USER_LOGIN_NAME_ALREADY_EXISTS_MSG = "登录名已存在"; public static final String USER_LOGIN_NAME_ALREADY_EXISTS_MSG = "登录名已存在";
/**
* 角色信息
* type = 10
* */
//添加角色信息失败
public static final int ROLE_ADD_FAILED_CODE = 1000000;
public static final String ROLE_ADD_FAILED_MSG = "添加角色信息失败";
//删除角色信息失败
public static final int ROLE_DELETE_FAILED_CODE = 1000001;
public static final String ROLE_DELETE_FAILED_MSG = "删除角色信息失败";
//修改角色信息失败
public static final int ROLE_EDIT_FAILED_CODE = 1000002;
public static final String ROLE_EDIT_FAILED_MSG = "修改角色信息失败";
/**
* 应用信息
* type = 15
* */
//添加角色信息失败
public static final int APP_ADD_FAILED_CODE = 1500000;
public static final String APP_ADD_FAILED_MSG = "添加应用信息失败";
//删除角色信息失败
public static final int APP_DELETE_FAILED_CODE = 1500001;
public static final String APP_DELETE_FAILED_MSG = "删除应用信息失败";
//修改角色信息失败
public static final int APP_EDIT_FAILED_CODE = 1500002;
public static final String APP_EDIT_FAILED_MSG = "修改应用信息失败";
/**
* 仓库信息
* type = 20
* */
//添加仓库信息失败
public static final int DEPOT_ADD_FAILED_CODE = 2000000;
public static final String DEPOT_ADD_FAILED_MSG = "添加仓库信息失败";
//删除仓库信息失败
public static final int DEPOT_DELETE_FAILED_CODE = 2000001;
public static final String DEPOT_DELETE_FAILED_MSG = "删除仓库信息失败";
//修改仓库信息失败
public static final int DEPOT_EDIT_FAILED_CODE = 2000002;
public static final String DEPOT_EDIT_FAILED_MSG = "修改仓库信息失败";
/**
* 功能模块信息
* type = 30
* */
//添加角色信息失败
public static final int FUNCTIONS_ADD_FAILED_CODE = 3000000;
public static final String FUNCTIONS_ADD_FAILED_MSG = "添加功能模块信息失败";
//删除角色信息失败
public static final int FUNCTIONS_DELETE_FAILED_CODE = 3000001;
public static final String FUNCTIONS_DELETE_FAILED_MSG = "删除功能模块信息失败";
//修改角色信息失败
public static final int FUNCTIONS_EDIT_FAILED_CODE = 3000002;
public static final String FUNCTIONS_EDIT_FAILED_MSG = "修改功能模块信息失败";
/**
* 收支项目信息
* type = 35
* */
//添加收支项目信息失败
public static final int IN_OUT_ITEM_ADD_FAILED_CODE = 3500000;
public static final String IN_OUT_ITEM_ADD_FAILED_MSG = "添加收支项目信息失败";
//删除收支项目信息失败
public static final int IN_OUT_ITEM_DELETE_FAILED_CODE = 3500001;
public static final String IN_OUT_ITEM_DELETE_FAILED_MSG = "删除收支项目信息失败";
//修改收支项目信息失败
public static final int IN_OUT_ITEM_EDIT_FAILED_CODE = 3500002;
public static final String IN_OUT_ITEM_EDIT_FAILED_MSG = "修改收支项目信息失败";
/**
* 多单位信息
* type = 40
* */
//添加多单位信息失败
public static final int UNIT_ADD_FAILED_CODE = 4000000;
public static final String UNIT_ADD_FAILED_MSG = "添加多单位信息失败";
//删除多单位信息失败
public static final int UNIT_DELETE_FAILED_CODE = 4000001;
public static final String UNIT_DELETE_FAILED_MSG = "删除多单位信息失败";
//修改多单位信息失败
public static final int UNIT_EDIT_FAILED_CODE = 4000002;
public static final String UNIT_EDIT_FAILED_MSG = "修改多单位信息失败";
/**
* 经手人信息
* type = 45
* */
//添加经手人信息失败
public static final int PERSON_ADD_FAILED_CODE = 4500000;
public static final String PERSON_ADD_FAILED_MSG = "添加经手人信息失败";
//删除经手人信息失败
public static final int PERSON_DELETE_FAILED_CODE = 4500001;
public static final String PERSON_DELETE_FAILED_MSG = "删除经手人信息失败";
//修改经手人信息失败
public static final int PERSON_EDIT_FAILED_CODE = 4500002;
public static final String PERSON_EDIT_FAILED_MSG = "修改经手人信息失败";
/**
* 用户角色模块关系信息
* type = 50
* */
//添加用户角色模块关系信息失败
public static final int USER_BUSINESS_ADD_FAILED_CODE = 5000000;
public static final String USER_BUSINESS_ADD_FAILED_MSG = "添加用户角色模块关系信息失败";
//删除用户角色模块关系信息失败
public static final int USER_BUSINESS_DELETE_FAILED_CODE = 5000001;
public static final String USER_BUSINESS_DELETE_FAILED_MSG = "删除用户角色模块关系信息失败";
//修改用户角色模块关系信息失败
public static final int USER_BUSINESS_EDIT_FAILED_CODE = 5000002;
public static final String USER_BUSINESS_EDIT_FAILED_MSG = "修改用户角色模块关系信息失败";
/**
* 系统参数信息
* type = 55
* */
//添加系统参数信息失败
public static final int SYSTEM_CONFIG_ADD_FAILED_CODE = 5500000;
public static final String SYSTEM_CONFIG_ADD_FAILED_MSG = "添加系统参数信息失败";
//删除系统参数信息失败
public static final int SYSTEM_CONFIG_DELETE_FAILED_CODE = 5500001;
public static final String SYSTEM_CONFIG_DELETE_FAILED_MSG = "删除系统参数信息失败";
//修改系统参数信息失败
public static final int SYSTEM_CONFIG_EDIT_FAILED_CODE = 5500002;
public static final String SYSTEM_CONFIG_EDIT_FAILED_MSG = "修改系统参数信息失败";
/**
* 商品扩展信息
* type = 60
* */
//添加商品扩展信息失败
public static final int MATERIAL_PROPERTY_ADD_FAILED_CODE = 6000000;
public static final String MATERIAL_PROPERTY_ADD_FAILED_MSG = "添加商品扩展信息失败";
//删除商品扩展信息失败
public static final int MATERIAL_PROPERTY_DELETE_FAILED_CODE = 6000001;
public static final String MATERIAL_PROPERTY_DELETE_FAILED_MSG = "删除商品扩展信息失败";
//修改商品扩展信息失败
public static final int MATERIAL_PROPERTY_EDIT_FAILED_CODE = 6000002;
public static final String MATERIAL_PROPERTY_EDIT_FAILED_MSG = "修改商品扩展信息失败";
/**
* 账户信息
* type = 65
* */
//添加账户信息失败
public static final int ACCOUNT_ADD_FAILED_CODE = 6500000;
public static final String ACCOUNT_ADD_FAILED_MSG = "添加账户信息失败";
//删除账户信息失败
public static final int ACCOUNT_DELETE_FAILED_CODE = 6500001;
public static final String ACCOUNT_DELETE_FAILED_MSG = "删除账户信息失败";
//修改账户信息失败
public static final int ACCOUNT_EDIT_FAILED_CODE = 6500002;
public static final String ACCOUNT_EDIT_FAILED_MSG = "修改账户信息失败";
/**
* 供应商信息
* type = 70
* */
//添加供应商信息失败
public static final int SUPPLIER_ADD_FAILED_CODE = 7000000;
public static final String SUPPLIER_ADD_FAILED_MSG = "添加供应商信息失败";
//删除供应商信息失败
public static final int SUPPLIER_DELETE_FAILED_CODE = 7000001;
public static final String SUPPLIER_DELETE_FAILED_MSG = "删除供应商信息失败";
//修改供应商信息失败
public static final int SUPPLIER_EDIT_FAILED_CODE = 7000002;
public static final String SUPPLIER_EDIT_FAILED_MSG = "修改供应商信息失败";
/** /**
* 商品类别信息 * 商品类别信息
* type = 75 * type = 75
...@@ -57,7 +211,7 @@ public class ExceptionConstants { ...@@ -57,7 +211,7 @@ public class ExceptionConstants {
public static final String MATERIAL_CATEGORY_DELETE_FAILED_MSG = "删除商品类别信息失败"; public static final String MATERIAL_CATEGORY_DELETE_FAILED_MSG = "删除商品类别信息失败";
//修改商品类别信息失败 //修改商品类别信息失败
public static final int MATERIAL_CATEGORY_EDIT_FAILED_CODE = 7500002; public static final int MATERIAL_CATEGORY_EDIT_FAILED_CODE = 7500002;
public static final String MATERIAL_CATEGORY_EDIT_FAILED_MSG = "添加商品类别信息失败"; public static final String MATERIAL_CATEGORY_EDIT_FAILED_MSG = "修改商品类别信息失败";
//商品类别编号已存在 //商品类别编号已存在
public static final int MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_CODE = 7500003; public static final int MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_CODE = 7500003;
public static final String MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_MSG = "商品类别编号已存在"; public static final String MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_MSG = "商品类别编号已存在";
...@@ -67,11 +221,19 @@ public class ExceptionConstants { ...@@ -67,11 +221,19 @@ public class ExceptionConstants {
//根目录不支持删除 //根目录不支持删除
public static final int MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_DELETE_CODE = 7500005; public static final int MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_DELETE_CODE = 7500005;
public static final String MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_DELETE_MSG = "根目录不支持删除"; public static final String MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_DELETE_MSG = "根目录不支持删除";
/** /**
* 商品信息 * 商品信息
* type = 80 * type = 80
* */ * */
//添加商品信息信息失败
public static final int MATERIAL_ADD_FAILED_CODE = 7500000;
public static final String MATERIAL_ADD_FAILED_MSG = "添加商品信息失败";
//删除商品信息失败
public static final int MATERIAL_DELETE_FAILED_CODE = 7500001;
public static final String MATERIAL_DELETE_FAILED_MSG = "删除商品信息失败";
//修改商品信息失败
public static final int MATERIAL_EDIT_FAILED_CODE = 7500002;
public static final String MATERIAL_EDIT_FAILED_MSG = "修改商品信息失败";
//商品信息不存在 //商品信息不存在
public static final int MATERIAL_NOT_EXISTS_CODE = 8000000; public static final int MATERIAL_NOT_EXISTS_CODE = 8000000;
public static final String MATERIAL_NOT_EXISTS_MSG = "商品信息不存在"; public static final String MATERIAL_NOT_EXISTS_MSG = "商品信息不存在";
...@@ -87,7 +249,58 @@ public class ExceptionConstants { ...@@ -87,7 +249,58 @@ public class ExceptionConstants {
//商品库存不足 //商品库存不足
public static final int MATERIAL_STOCK_NOT_ENOUGH_CODE = 8000004; public static final int MATERIAL_STOCK_NOT_ENOUGH_CODE = 8000004;
public static final String MATERIAL_STOCK_NOT_ENOUGH_MSG = "商品:%s库存不足"; public static final String MATERIAL_STOCK_NOT_ENOUGH_MSG = "商品:%s库存不足";
/**
* 单据信息
* type = 85
* */
//添加单据信息失败
public static final int DEPOT_HEAD_ADD_FAILED_CODE = 8500000;
public static final String DEPOT_HEAD_ADD_FAILED_MSG = "添加单据信息失败";
//删除单据信息失败
public static final int DEPOT_HEAD_DELETE_FAILED_CODE = 8500001;
public static final String DEPOT_HEAD_DELETE_FAILED_MSG = "删除单据信息失败";
//修改单据信息失败
public static final int DEPOT_HEAD_EDIT_FAILED_CODE = 8500002;
public static final String DEPOT_HEAD_EDIT_FAILED_MSG = "修改单据信息失败";
/**
* 单据明细信息
* type = 90
* */
//添加单据明细信息失败
public static final int DEPOT_ITEM_ADD_FAILED_CODE = 9000000;
public static final String DEPOT_ITEM_ADD_FAILED_MSG = "添加单据明细信息失败";
//删除单据明细信息失败
public static final int DEPOT_ITEM_DELETE_FAILED_CODE = 9000001;
public static final String DEPOT_ITEM_DELETE_FAILED_MSG = "删除单据明细信息失败";
//修改单据明细信息失败
public static final int DEPOT_ITEM_EDIT_FAILED_CODE = 9000002;
public static final String DEPOT_ITEM_EDIT_FAILED_MSG = "修改单据明细信息失败";
/**
* 财务信息
* type = 95
* */
//添加财务信息失败
public static final int ACCOUNT_HEAD_ADD_FAILED_CODE = 9500000;
public static final String ACCOUNT_HEAD_ADD_FAILED_MSG = "添加财务信息失败";
//删除财务信息失败
public static final int ACCOUNT_HEAD_DELETE_FAILED_CODE = 9500001;
public static final String ACCOUNT_HEAD_DELETE_FAILED_MSG = "删除财务信息失败";
//修改财务信息失败
public static final int ACCOUNT_HEAD_EDIT_FAILED_CODE = 9500002;
public static final String ACCOUNT_HEAD_EDIT_FAILED_MSG = "修改财务信息失败";
/**
* 财务明细信息
* type = 100
* */
//添加财务明细信息失败
public static final int ACCOUNT_ITEM_ADD_FAILED_CODE = 10000000;
public static final String ACCOUNT_ITEM_ADD_FAILED_MSG = "添加财务明细信息失败";
//删除财务明细信息失败
public static final int ACCOUNT_ITEM_DELETE_FAILED_CODE = 10000001;
public static final String ACCOUNT_ITEM_DELETE_FAILED_MSG = "删除财务明细信息失败";
//修改财务明细信息失败
public static final int ACCOUNT_ITEM_EDIT_FAILED_CODE = 10000002;
public static final String ACCOUNT_ITEM_EDIT_FAILED_MSG = "修改财务明细信息失败";
/** /**
* 序列号 * 序列号
* type = 105 * type = 105
...@@ -105,7 +318,7 @@ public class ExceptionConstants { ...@@ -105,7 +318,7 @@ public class ExceptionConstants {
public static final int SERIAL_NUMBERE_DELETE_FAILED_CODE = 10500003; public static final int SERIAL_NUMBERE_DELETE_FAILED_CODE = 10500003;
public static final String SERIAL_NUMBERE_DELETE_FAILED_MSG = "删序列号信息失败"; public static final String SERIAL_NUMBERE_DELETE_FAILED_MSG = "删序列号信息失败";
/** /**
* 机构 * 机构信息
* type = 110 * type = 110
* */ * */
//添加机构信息失败 //添加机构信息失败
...@@ -140,6 +353,8 @@ public class ExceptionConstants { ...@@ -140,6 +353,8 @@ public class ExceptionConstants {
public static final int ORGA_USER_REL_EDIT_FAILED_CODE = 11500002; public static final int ORGA_USER_REL_EDIT_FAILED_CODE = 11500002;
public static final String ORGA_USER_REL_EDIT_FAILED_MSG = "修改机构用户关联关系失败"; public static final String ORGA_USER_REL_EDIT_FAILED_MSG = "修改机构用户关联关系失败";
/** /**
* 标准正常返回/操作成功返回 * 标准正常返回/操作成功返回
* @return * @return
......
src/main/java/com/jsh/erp/controller/AccountController.java
View file @ f2244a3a
...@@ -2,8 +2,10 @@ package com.jsh.erp.controller; ...@@ -2,8 +2,10 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.Account; import com.jsh.erp.datasource.entities.Account;
import com.jsh.erp.datasource.vo.AccountVo4InOutList; import com.jsh.erp.datasource.vo.AccountVo4InOutList;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.account.AccountService; import com.jsh.erp.service.account.AccountService;
import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo; import com.jsh.erp.utils.ErpInfo;
...@@ -138,5 +140,27 @@ public class AccountController { ...@@ -138,5 +140,27 @@ public class AccountController {
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
} }
} }
/**
* create by: qiankunpingtai
* website：http://39.105.146.63/symphony/
* description:
* 批量删除账户信息
* create time: 2019/3/29 10:49
* @Param: ids
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteAccountByIds")
public Object batchDeleteAccountByIds(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
int i= accountService.batchDeleteAccountByIds(ids);
if(i<1){
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
ExceptionConstants.ACCOUNT_DELETE_FAILED_CODE,ExceptionConstants.ACCOUNT_DELETE_FAILED_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.ACCOUNT_DELETE_FAILED_CODE,
ExceptionConstants.ACCOUNT_DELETE_FAILED_MSG);
}
return result;
}
} }
src/main/java/com/jsh/erp/controller/AccountHeadController.java
View file @ f2244a3a
package com.jsh.erp.controller; package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.AccountHead; import com.jsh.erp.datasource.entities.AccountHead;
import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx; import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.accountHead.AccountHeadService; import com.jsh.erp.service.accountHead.AccountHeadService;
import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo; import com.jsh.erp.utils.ErpInfo;
...@@ -146,5 +148,27 @@ public class AccountHeadController { ...@@ -146,5 +148,27 @@ public class AccountHeadController {
} }
return allMoney; return allMoney;
} }
/**
* create by: qiankunpingtai
* website：http://39.105.146.63/symphony/
* description:
* 批量删除账户信息
* create time: 2019/3/29 10:49
* @Param: ids
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteAccountHeadByIds")
public Object batchDeleteAccountHeadByIds(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
int i= accountHeadService.batchDeleteAccountHeadByIds(ids);
if(i<1){
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
ExceptionConstants.ACCOUNT_HEAD_DELETE_FAILED_CODE,ExceptionConstants.ACCOUNT_HEAD_DELETE_FAILED_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.ACCOUNT_HEAD_DELETE_FAILED_CODE,
ExceptionConstants.ACCOUNT_HEAD_DELETE_FAILED_MSG);
}
return result;
}
} }
src/main/java/com/jsh/erp/controller/AccountItemController.java
View file @ f2244a3a
...@@ -2,8 +2,10 @@ package com.jsh.erp.controller; ...@@ -2,8 +2,10 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.AccountItem; import com.jsh.erp.datasource.entities.AccountItem;
import com.jsh.erp.datasource.vo.AccountItemVo4List; import com.jsh.erp.datasource.vo.AccountItemVo4List;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.accountItem.AccountItemService; import com.jsh.erp.service.accountItem.AccountItemService;
import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.log.LogService;
import com.jsh.erp.utils.*; import com.jsh.erp.utils.*;
...@@ -104,5 +106,27 @@ public class AccountItemController { ...@@ -104,5 +106,27 @@ public class AccountItemController {
} }
return res; return res;
} }
/**
* create by: qiankunpingtai
* website：http://39.105.146.63/symphony/
* description:
* 批量删除财务明细信息
* create time: 2019/3/29 10:56
* @Param: ids
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteAccountItemByIds")
public Object batchDeleteAccountItemByIds(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
int i= accountItemService.batchDeleteAccountItemByIds(ids);
if(i<1){
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
ExceptionConstants.ACCOUNT_ITEM_DELETE_FAILED_CODE,ExceptionConstants.ACCOUNT_ITEM_DELETE_FAILED_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.ACCOUNT_ITEM_DELETE_FAILED_CODE,
ExceptionConstants.ACCOUNT_ITEM_DELETE_FAILED_MSG);
}
return result;
}
} }
src/main/java/com/jsh/erp/controller/AppController.java
View file @ f2244a3a
...@@ -2,8 +2,10 @@ package com.jsh.erp.controller; ...@@ -2,8 +2,10 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.App; import com.jsh.erp.datasource.entities.App;
import com.jsh.erp.datasource.entities.UserBusiness; import com.jsh.erp.datasource.entities.UserBusiness;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.app.AppService; import com.jsh.erp.service.app.AppService;
import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.service.userBusiness.UserBusinessService;
import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.BaseResponseInfo;
...@@ -225,4 +227,26 @@ public class AppController { ...@@ -225,4 +227,26 @@ public class AppController {
} }
return res; return res;
} }
/**
* create by: qiankunpingtai
* website：http://39.105.146.63/symphony/
* description:
* 批量删除应用信息
* create time: 2019/3/29 11:15
* @Param: ids
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteAppByIds")
public Object batchDeleteAppByIds(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
int i= appService.batchDeleteAppByIds(ids);
if(i<1){
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
ExceptionConstants.APP_DELETE_FAILED_CODE,ExceptionConstants.APP_DELETE_FAILED_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.APP_DELETE_FAILED_CODE,
ExceptionConstants.APP_DELETE_FAILED_MSG);
}
return result;
}
} }
src/main/java/com/jsh/erp/controller/DepotController.java
View file @ f2244a3a
...@@ -7,8 +7,10 @@ import com.github.pagehelper.Page; ...@@ -7,8 +7,10 @@ import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.Depot; import com.jsh.erp.datasource.entities.Depot;
import com.jsh.erp.datasource.entities.DepotEx; import com.jsh.erp.datasource.entities.DepotEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.depot.DepotService;
import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.service.userBusiness.UserBusinessService;
import com.jsh.erp.utils.*; import com.jsh.erp.utils.*;
...@@ -173,5 +175,26 @@ public class DepotController { ...@@ -173,5 +175,26 @@ public class DepotController {
queryInfo.setTotal(pageInfo.getTotal()); queryInfo.setTotal(pageInfo.getTotal());
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
} }
/**
* create by: qiankunpingtai
* website：http://39.105.146.63/symphony/
* description:
* 批量删除仓库信息
* create time: 2019/3/29 11:15
* @Param: ids
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteDepotByIds")
public Object batchDeleteDepotByIds(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
int i= depotService.batchDeleteDepotByIds(ids);
if(i<1){
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
ExceptionConstants.DEPOT_DELETE_FAILED_CODE,ExceptionConstants.DEPOT_DELETE_FAILED_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_DELETE_FAILED_CODE,
ExceptionConstants.DEPOT_DELETE_FAILED_MSG);
}
return result;
}
} }
src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @ f2244a3a
...@@ -3,7 +3,9 @@ package com.jsh.erp.controller; ...@@ -3,7 +3,9 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.depotItem.DepotItemService; import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.material.MaterialService; import com.jsh.erp.service.material.MaterialService;
import com.jsh.erp.utils.*; import com.jsh.erp.utils.*;
...@@ -782,4 +784,25 @@ public class DepotItemController { ...@@ -782,4 +784,25 @@ public class DepotItemController {
} }
return sumPrice; return sumPrice;
} }
/**
* create by: qiankunpingtai
* website：http://39.105.146.63/symphony/
* description:
* 批量删除单据明细信息
* create time: 2019/3/29 11:15
* @Param: ids
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteDepotItemByIds")
public Object batchDeleteDepotItemByIds(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
int i= depotItemService.batchDeleteDepotItemByIds(ids);
if(i<1){
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
ExceptionConstants.DEPOT_ITEM_DELETE_FAILED_CODE,ExceptionConstants.DEPOT_ITEM_DELETE_FAILED_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_ITEM_DELETE_FAILED_CODE,
ExceptionConstants.DEPOT_ITEM_DELETE_FAILED_MSG);
}
return result;
}
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment