diff --git a/erp-modular/src/main/java/com/skyeye/dao/CustomerDao.java b/erp-modular/src/main/java/com/skyeye/dao/CustomerDao.java index eeefd694..3ef5efe0 100644 --- a/erp-modular/src/main/java/com/skyeye/dao/CustomerDao.java +++ b/erp-modular/src/main/java/com/skyeye/dao/CustomerDao.java @@ -29,4 +29,6 @@ public interface CustomerDao { public int editCustomerByNotEnabled(Map params) throws Exception; public Map queryCustomerByIdAndName(Map params) throws Exception; + + public Map queryCustomerByEnabled(Map params) throws Exception; } diff --git a/erp-modular/src/main/java/com/skyeye/dao/MemberDao.java b/erp-modular/src/main/java/com/skyeye/dao/MemberDao.java index bacd0947..bf8e3cf4 100644 --- a/erp-modular/src/main/java/com/skyeye/dao/MemberDao.java +++ b/erp-modular/src/main/java/com/skyeye/dao/MemberDao.java @@ -29,4 +29,6 @@ public interface MemberDao { public int editMemberByNotEnabled(Map params) throws Exception; public Map queryMemberByIdAndName(Map params) throws Exception; + + public Map queryMemberByEnabled(Map params) throws Exception; } diff --git a/erp-modular/src/main/java/com/skyeye/dao/StoreHouseDao.java b/erp-modular/src/main/java/com/skyeye/dao/StoreHouseDao.java index 44d25fa1..e98c70c6 100644 --- a/erp-modular/src/main/java/com/skyeye/dao/StoreHouseDao.java +++ b/erp-modular/src/main/java/com/skyeye/dao/StoreHouseDao.java @@ -22,9 +22,13 @@ public interface StoreHouseDao { public void editStoreHouseById(Map params) throws Exception; - public void editStoreHouseBydeleteFlag(Map params) throws Exception; + public void editStoreHouseByDeleteFlag(Map params) throws Exception; public void editStoreHouseByDefault(Map params) throws Exception; public void editStoreHouseByDefaultAll(Map params) throws Exception; + + public Map queryStoreHouseByIdAndName(Map params) throws Exception; + + public Map queryStoreHouseByIsDefault(Map params) throws Exception; } diff --git a/erp-modular/src/main/java/com/skyeye/dao/SupplierDao.java b/erp-modular/src/main/java/com/skyeye/dao/SupplierDao.java index 1efda834..a91b5aac 100644 --- a/erp-modular/src/main/java/com/skyeye/dao/SupplierDao.java +++ b/erp-modular/src/main/java/com/skyeye/dao/SupplierDao.java @@ -28,4 +28,6 @@ public interface SupplierDao { public int editSupplierByNotEnabled(Map params) throws Exception; public Map querySupplierByIdAndName(Map params) throws Exception; + + public Map querySupplierByEnabled(Map params) throws Exception; } diff --git a/erp-modular/src/main/java/com/skyeye/service/impl/CustomerServiceImpl.java b/erp-modular/src/main/java/com/skyeye/service/impl/CustomerServiceImpl.java index aff621e7..23c7c74f 100644 --- a/erp-modular/src/main/java/com/skyeye/service/impl/CustomerServiceImpl.java +++ b/erp-modular/src/main/java/com/skyeye/service/impl/CustomerServiceImpl.java @@ -119,12 +119,9 @@ public class CustomerServiceImpl implements CustomerService { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); Map customerName = customerDao.queryCustomerByIdAndName(params); - if(customerName == null){ - Map bean = customerDao.queryCustomerByUserIdAndCustomer(params); - if(bean != null){ - outputObject.setreturnMessage("该客户信息已存在!"); - return; - } + if(customerName != null){ + outputObject.setreturnMessage("客户名称已存在!"); + return; } customerDao.editCustomerById(params); @@ -141,12 +138,12 @@ public class CustomerServiceImpl implements CustomerService { public void editCustomerByEnabled(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); - Map bean = customerDao.queryCustomerById(params); - if ("1".equals(bean.get("enabled").toString())){ + params.put("enabled", 1); + Map bean = customerDao.queryCustomerByEnabled(params); + if (bean != null){ outputObject.setreturnMessage("状态已改变,请不要重复操作!"); return; } - params.put("enabled", 1); customerDao.editCustomerByEnabled(params); } @@ -161,12 +158,12 @@ public class CustomerServiceImpl implements CustomerService { public void editCustomerByNotEnabled(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); - Map bean = customerDao.queryCustomerById(params); - if ("2".equals(bean.get("enabled").toString())){ + params.put("enabled", 2); + Map bean = customerDao.queryCustomerByEnabled(params); + if (bean != null){ outputObject.setreturnMessage("状态已改变,请不要重复操作!"); return; } - params.put("enabled", 2); customerDao.editCustomerByNotEnabled(params); } } diff --git a/erp-modular/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java b/erp-modular/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java index dbc8ff8c..e01c3cba 100644 --- a/erp-modular/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java +++ b/erp-modular/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java @@ -115,12 +115,9 @@ public class MemberServiceImpl implements MemberService { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); Map memberName = memberDao.queryMemberByIdAndName(params); - if(memberName == null){ - Map bean = memberDao.queryMemberByUserIdAndMember(params); - if(bean != null){ - outputObject.setreturnMessage("该会员信息已存在!"); - return; - } + if(memberName != null){ + outputObject.setreturnMessage("会员名称已存在!"); + return; } memberDao.editMemberById(params); } @@ -136,12 +133,12 @@ public class MemberServiceImpl implements MemberService { public void editMemberByEnabled(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); - Map bean = memberDao.queryMemberById(params); - if ("1".equals(bean.get("enabled").toString())){ + params.put("enabled", 1); + Map bean = memberDao.queryMemberByEnabled(params); + if (bean != null){ outputObject.setreturnMessage("状态已改变,请不要重复操作!"); return; } - params.put("enabled", 1); memberDao.editMemberByEnabled(params); } @@ -156,12 +153,12 @@ public class MemberServiceImpl implements MemberService { public void editMemberByNotEnabled(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); - Map bean = memberDao.queryMemberById(params); - if ("2".equals(bean.get("enabled").toString())){ + params.put("enabled", 2); + Map bean = memberDao.queryMemberByEnabled(params); + if (bean != null){ outputObject.setreturnMessage("状态已改变,请不要重复操作!"); return; } - params.put("enabled", 2); memberDao.editMemberByNotEnabled(params); } } diff --git a/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java b/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java index fcafe600..87b889a2 100644 --- a/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java +++ b/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java @@ -101,7 +101,7 @@ public class StoreHouseServiceImpl implements StoreHouseService { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); params.put("deleteFlag", "1"); - storeHouseDao.editStoreHouseBydeleteFlag(params); + storeHouseDao.editStoreHouseByDeleteFlag(params); } /** @@ -116,6 +116,11 @@ public class StoreHouseServiceImpl implements StoreHouseService { Map params = inputObject.getParams(); Map user = inputObject.getLogParams(); params.put("userId", user.get("id")); + Map houseName = storeHouseDao.queryStoreHouseByIdAndName(params); + if(houseName != null){ + outputObject.setreturnMessage("仓库名称已存在!"); + return; + } if(params.get("isDefault").toString().equals("1")){ params.put("isDefault", "2"); storeHouseDao.editStoreHouseByDefaultAll(params); @@ -136,6 +141,11 @@ public class StoreHouseServiceImpl implements StoreHouseService { Map params = inputObject.getParams(); Map user = inputObject.getLogParams(); params.put("userId", user.get("id")); + Map bean = storeHouseDao.queryStoreHouseByIsDefault(params); + if(bean != null){ + outputObject.setreturnMessage("状态已改变,请勿重复操作!"); + return; + } params.put("isDefault", "2"); storeHouseDao.editStoreHouseByDefaultAll(params); params.put("isDefault", "1"); diff --git a/erp-modular/src/main/java/com/skyeye/service/impl/SupplierServiceImpl.java b/erp-modular/src/main/java/com/skyeye/service/impl/SupplierServiceImpl.java index 98bd780d..ae94092f 100644 --- a/erp-modular/src/main/java/com/skyeye/service/impl/SupplierServiceImpl.java +++ b/erp-modular/src/main/java/com/skyeye/service/impl/SupplierServiceImpl.java @@ -115,12 +115,9 @@ public class SupplierServiceImpl implements SupplierService { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); Map supplierName = supplierDao.querySupplierByIdAndName(params); - if(supplierName == null){ - Map bean = supplierDao.querySupplierByUserIdAndSupplier(params); - if(bean != null){ - outputObject.setreturnMessage("供应商信息已存在!"); - return; - } + if(supplierName != null){ + outputObject.setreturnMessage("供应商名称已存在!"); + return; } supplierDao.editSupplierById(params); } @@ -136,12 +133,12 @@ public class SupplierServiceImpl implements SupplierService { public void editSupplierByEnabled(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); - Map bean = supplierDao.querySupplierById(params); - if ("1".equals(bean.get("enabled").toString())){ + params.put("enabled", 1); + Map bean = supplierDao.querySupplierByEnabled(params); + if (bean != null){ outputObject.setreturnMessage("状态已改变,请不要重复操作!"); return; } - params.put("enabled", 1); supplierDao.editSupplierByEnabled(params); } @@ -156,12 +153,12 @@ public class SupplierServiceImpl implements SupplierService { public void editSupplierByNotEnabled(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); - Map bean = supplierDao.querySupplierById(params); - if ("2".equals(bean.get("enabled").toString())){ + params.put("enabled", 2); + Map bean = supplierDao.querySupplierByEnabled(params); + if (bean != null){ outputObject.setreturnMessage("状态已改变,请不要重复操作!"); return; } - params.put("enabled", 2); supplierDao.editSupplierByNotEnabled(params); } } diff --git a/erp-web/src/main/resources/dbmapper/erp/CustomerMapper.xml b/erp-web/src/main/resources/dbmapper/erp/CustomerMapper.xml index b70d7dce..0a551cca 100644 --- a/erp-web/src/main/resources/dbmapper/erp/CustomerMapper.xml +++ b/erp-web/src/main/resources/dbmapper/erp/CustomerMapper.xml @@ -204,23 +204,29 @@ + + \ No newline at end of file diff --git a/erp-web/src/main/resources/dbmapper/erp/MemberMapper.xml b/erp-web/src/main/resources/dbmapper/erp/MemberMapper.xml index 2254e9b2..ffaebe3e 100644 --- a/erp-web/src/main/resources/dbmapper/erp/MemberMapper.xml +++ b/erp-web/src/main/resources/dbmapper/erp/MemberMapper.xml @@ -204,23 +204,29 @@ + + \ No newline at end of file diff --git a/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml b/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml index 0e385c1d..d7782908 100644 --- a/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml +++ b/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml @@ -91,16 +91,16 @@ truckage = #{truckage}, remark = #{remark}, principal = #{principal}, - delete_Flag = #{delete_Flag}, is_default = #{isDefault}, name = #{name} WHERE id = #{id} AND tenant_id = #{userId} + AND delete_Flag = 0 - + UPDATE erp_depot delete_Flag = #{deleteFlag} @@ -118,6 +118,7 @@ WHERE id = #{id} AND tenant_id = #{userId} + AND delete_Flag = 0 @@ -127,5 +128,32 @@ WHERE tenant_id = #{userId} + AND delete_Flag = 0 + + + + \ No newline at end of file diff --git a/erp-web/src/main/resources/dbmapper/erp/SupplierMapper.xml b/erp-web/src/main/resources/dbmapper/erp/SupplierMapper.xml index 8da9092c..84e946d6 100644 --- a/erp-web/src/main/resources/dbmapper/erp/SupplierMapper.xml +++ b/erp-web/src/main/resources/dbmapper/erp/SupplierMapper.xml @@ -202,23 +202,29 @@ + + \ No newline at end of file diff --git a/erp-web/src/main/resources/mapping/erp.xml b/erp-web/src/main/resources/mapping/erp.xml index e2605c53..8e94377f 100644 --- a/erp-web/src/main/resources/mapping/erp.xml +++ b/erp-web/src/main/resources/mapping/erp.xml @@ -41,12 +41,12 @@ - + - + @@ -65,13 +65,13 @@ - + - + - + @@ -91,21 +91,21 @@ - + - + - + - + @@ -124,13 +124,13 @@ - + - + - + @@ -150,21 +150,21 @@ - + - + - + - + @@ -183,13 +183,13 @@ - + - + - + @@ -209,10 +209,10 @@ - + - + diff --git a/erp-web/src/main/resources/template/js/customer/customerlist.js b/erp-web/src/main/resources/template/js/customer/customerlist.js index 64e302df..00fceb5e 100644 --- a/erp-web/src/main/resources/template/js/customer/customerlist.js +++ b/erp-web/src/main/resources/template/js/customer/customerlist.js @@ -7,7 +7,7 @@ layui.config({ window: 'js/winui.window', }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { winui.renderColor(); - authBtn('1569133150732'); + authBtn('1569133160398'); var $ = layui.$, form = layui.form, table = layui.table; diff --git a/erp-web/src/main/resources/template/js/member/memberlist.js b/erp-web/src/main/resources/template/js/member/memberlist.js index 22064d8f..92c6fdc5 100644 --- a/erp-web/src/main/resources/template/js/member/memberlist.js +++ b/erp-web/src/main/resources/template/js/member/memberlist.js @@ -7,7 +7,7 @@ layui.config({ window: 'js/winui.window', }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { winui.renderColor(); - authBtn('1569133219314'); + authBtn('1569133228443'); var $ = layui.$, form = layui.form, table = layui.table; diff --git a/erp-web/src/main/resources/template/js/supplier/supplierlist.js b/erp-web/src/main/resources/template/js/supplier/supplierlist.js index 7e0e47e7..b5836810 100644 --- a/erp-web/src/main/resources/template/js/supplier/supplierlist.js +++ b/erp-web/src/main/resources/template/js/supplier/supplierlist.js @@ -7,7 +7,7 @@ layui.config({ window: 'js/winui.window', }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { winui.renderColor(); - authBtn('1569132969654'); + authBtn('1569132999722'); var $ = layui.$, form = layui.form, table = layui.table;