仓库,供应商,客户,会员功能代码优化

This commit is contained in:
hai_c 2019-09-25 23:45:37 +08:00
parent d836793eb7
commit ae8d200c1e
16 changed files with 154 additions and 97 deletions

View file

@ -29,4 +29,6 @@ public interface CustomerDao {
public int editCustomerByNotEnabled(Map<String, Object> params) throws Exception;
public Map<String, Object> queryCustomerByIdAndName(Map<String, Object> params) throws Exception;
public Map<String, Object> queryCustomerByEnabled(Map<String, Object> params) throws Exception;
}

View file

@ -29,4 +29,6 @@ public interface MemberDao {
public int editMemberByNotEnabled(Map<String, Object> params) throws Exception;
public Map<String, Object> queryMemberByIdAndName(Map<String, Object> params) throws Exception;
public Map<String, Object> queryMemberByEnabled(Map<String, Object> params) throws Exception;
}

View file

@ -22,9 +22,13 @@ public interface StoreHouseDao {
public void editStoreHouseById(Map<String, Object> params) throws Exception;
public void editStoreHouseBydeleteFlag(Map<String, Object> params) throws Exception;
public void editStoreHouseByDeleteFlag(Map<String, Object> params) throws Exception;
public void editStoreHouseByDefault(Map<String, Object> params) throws Exception;
public void editStoreHouseByDefaultAll(Map<String, Object> params) throws Exception;
public Map<String, Object> queryStoreHouseByIdAndName(Map<String, Object> params) throws Exception;
public Map<String, Object> queryStoreHouseByIsDefault(Map<String, Object> params) throws Exception;
}

View file

@ -28,4 +28,6 @@ public interface SupplierDao {
public int editSupplierByNotEnabled(Map<String, Object> params) throws Exception;
public Map<String, Object> querySupplierByIdAndName(Map<String, Object> params) throws Exception;
public Map<String, Object> querySupplierByEnabled(Map<String, Object> params) throws Exception;
}

View file

@ -119,12 +119,9 @@ public class CustomerServiceImpl implements CustomerService {
Map<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> customerName = customerDao.queryCustomerByIdAndName(params);
if(customerName == null){
Map<String, Object> 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<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> bean = customerDao.queryCustomerById(params);
if ("1".equals(bean.get("enabled").toString())){
params.put("enabled", 1);
Map<String, Object> 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<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> bean = customerDao.queryCustomerById(params);
if ("2".equals(bean.get("enabled").toString())){
params.put("enabled", 2);
Map<String, Object> bean = customerDao.queryCustomerByEnabled(params);
if (bean != null){
outputObject.setreturnMessage("状态已改变,请不要重复操作!");
return;
}
params.put("enabled", 2);
customerDao.editCustomerByNotEnabled(params);
}
}

View file

@ -115,12 +115,9 @@ public class MemberServiceImpl implements MemberService {
Map<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> memberName = memberDao.queryMemberByIdAndName(params);
if(memberName == null){
Map<String, Object> 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<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> bean = memberDao.queryMemberById(params);
if ("1".equals(bean.get("enabled").toString())){
params.put("enabled", 1);
Map<String, Object> 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<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> bean = memberDao.queryMemberById(params);
if ("2".equals(bean.get("enabled").toString())){
params.put("enabled", 2);
Map<String, Object> bean = memberDao.queryMemberByEnabled(params);
if (bean != null){
outputObject.setreturnMessage("状态已改变,请不要重复操作!");
return;
}
params.put("enabled", 2);
memberDao.editMemberByNotEnabled(params);
}
}

View file

@ -101,7 +101,7 @@ public class StoreHouseServiceImpl implements StoreHouseService {
Map<String, Object> 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<String, Object> params = inputObject.getParams();
Map<String, Object> user = inputObject.getLogParams();
params.put("userId", user.get("id"));
Map<String, Object> 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<String, Object> params = inputObject.getParams();
Map<String, Object> user = inputObject.getLogParams();
params.put("userId", user.get("id"));
Map<String, Object> bean = storeHouseDao.queryStoreHouseByIsDefault(params);
if(bean != null){
outputObject.setreturnMessage("状态已改变,请勿重复操作!");
return;
}
params.put("isDefault", "2");
storeHouseDao.editStoreHouseByDefaultAll(params);
params.put("isDefault", "1");

View file

@ -115,12 +115,9 @@ public class SupplierServiceImpl implements SupplierService {
Map<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> supplierName = supplierDao.querySupplierByIdAndName(params);
if(supplierName == null){
Map<String, Object> 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<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> bean = supplierDao.querySupplierById(params);
if ("1".equals(bean.get("enabled").toString())){
params.put("enabled", 1);
Map<String, Object> 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<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> bean = supplierDao.querySupplierById(params);
if ("2".equals(bean.get("enabled").toString())){
params.put("enabled", 2);
Map<String, Object> bean = supplierDao.querySupplierByEnabled(params);
if (bean != null){
outputObject.setreturnMessage("状态已改变,请不要重复操作!");
return;
}
params.put("enabled", 2);
supplierDao.editSupplierByNotEnabled(params);
}
}

View file

@ -204,23 +204,29 @@
<select id="queryCustomerByIdAndName" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
s.id,
s.supplier customerName,
s.contacts,
s.phonenum,
s.email,
s.description,
s.isystem,
s.type customerType,
s.enabled,
s.delete_flag deleteFlag
s.id
FROM
erp_supplier s
WHERE
s.tenant_id = #{userId}
AND s.id != #{id}
AND s.type = 2
AND s.supplier = #{customerName}
AND s.delete_flag = 0
ORDER BY s.id DESC LIMIT 0,1
</select>
<select id="queryCustomerByEnabled" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
s.id
FROM
erp_supplier s
WHERE
s.tenant_id = #{userId}
AND s.id = #{id}
AND s.type = 2
AND s.supplier = #{customerName}
AND s.enabled = #{enabled}
AND s.delete_flag = 0
ORDER BY s.id DESC LIMIT 0,1
</select>
</mapper>

View file

@ -204,23 +204,29 @@
<select id="queryMemberByIdAndName" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
s.id,
s.supplier memberName,
s.contacts,
s.phonenum,
s.email,
s.description,
s.isystem,
s.type memberType,
s.enabled,
s.delete_flag deleteFlag
s.id
FROM
erp_supplier s
WHERE
s.tenant_id = #{userId}
AND s.id != #{id}
AND s.type = 3
AND s.supplier = #{memberName}
AND s.delete_flag = 0
ORDER BY s.id DESC LIMIT 0,1
</select>
<select id="queryMemberByEnabled" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
s.id
FROM
erp_supplier s
WHERE
s.tenant_id = #{userId}
AND s.id = #{id}
AND s.type = 3
AND s.supplier = #{memberName}
AND s.enabled = #{enabled}
AND s.delete_flag = 0
ORDER BY s.id DESC LIMIT 0,1
</select>
</mapper>

View file

@ -91,16 +91,16 @@
truckage = #{truckage},
remark = #{remark},
principal = #{principal},
delete_Flag = #{delete_Flag},
is_default = #{isDefault},
name = #{name}
</set>
WHERE
id = #{id}
AND tenant_id = #{userId}
AND delete_Flag = 0
</update>
<update id="editStoreHouseBydeleteFlag" parameterType="java.util.Map">
<update id="editStoreHouseByDeleteFlag" parameterType="java.util.Map">
UPDATE erp_depot
<set>
delete_Flag = #{deleteFlag}
@ -118,6 +118,7 @@
WHERE
id = #{id}
AND tenant_id = #{userId}
AND delete_Flag = 0
</update>
<update id="editStoreHouseByDefaultAll" parameterType="java.util.Map">
@ -127,5 +128,32 @@
</set>
WHERE
tenant_id = #{userId}
AND delete_Flag = 0
</update>
<select id="queryStoreHouseByIdAndName" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
d.id
FROM
erp_depot d
WHERE
d.id != #{id}
AND d.tenant_id = #{userId}
AND d.name = #{name}
AND d.delete_Flag = 0
ORDER BY d.create_time DESC LIMIT 0,1
</select>
<select id="queryStoreHouseByIsDefault" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
d.id
FROM
erp_depot d
WHERE
d.id = #{id}
AND d.tenant_id = #{userId}
AND d.is_default = 1
AND d.delete_Flag = 0
ORDER BY d.create_time DESC LIMIT 0,1
</select>
</mapper>

View file

@ -202,23 +202,29 @@
<select id="querySupplierByIdAndName" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
s.id,
s.supplier supplierName,
s.contacts,
s.phonenum,
s.email,
s.description,
s.isystem,
s.type supplierType,
s.enabled,
s.delete_flag deleteFlag
s.id
FROM
erp_supplier s
WHERE
s.tenant_id = #{userId}
AND s.id != #{id}
AND s.type = 1
AND s.supplier = #{supplierName}
AND s.delete_flag = 0
ORDER BY s.id DESC LIMIT 0,1
</select>
<select id="querySupplierByEnabled" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
s.id
FROM
erp_supplier s
WHERE
s.tenant_id = #{userId}
AND s.id = #{id}
AND s.type = 1
AND s.supplier = #{supplierName}
AND s.enabled = #{enabled}
AND s.delete_flag = 0
ORDER BY s.id DESC LIMIT 0,1
</select>
</mapper>

View file

@ -41,12 +41,12 @@
<!-- 仓库管理结束 -->
<!-- 供应商管理开始 -->
<url id="supplier001" path="/post/SupplierController/querySupplierByList" val="获取供应商信息" allUse="0">
<url id="supplier001" path="/post/SupplierController/querySupplierByList" val="获取供应商信息" allUse="1">
<property id="supplierName" name="supplierName" ref="" var="供应商名称"></property>
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
</url>
<url id="supplier002" path="/post/SupplierContronller/insertSupplier" val="添加供应商信息" allUse="0">
<url id="supplier002" path="/post/SupplierContronller/insertSupplier" val="添加供应商信息" allUse="1">
<property id="supplierName" name="supplierName" ref="required" var="仓库名称"></property>
<property id="contacts" name="contacts" ref="" var="联系人"></property>
<property id="phonenum" name="phonenum" ref="" var="联系电话"></property>
@ -65,13 +65,13 @@
<property id="accountNumber" name="accountNumber" ref="" var="账号"></property>
<property id="taxRate" name="taxRate" ref="" var="税率"></property>
</url>
<url id="supplier003" path="/post/SupplierController/querySupplierById" val="根据ID查询供应商信息用于信息回显" allUse="0">
<url id="supplier003" path="/post/SupplierController/querySupplierById" val="根据ID查询供应商信息用于信息回显" allUse="2">
<property id="rowId" name="id" ref="required" var="供应商ID"></property>
</url>
<url id="supplier004" path="/post/SupplierController/deleteSupplierById" val="删除供应商信息" allUse="0">
<url id="supplier004" path="/post/SupplierController/deleteSupplierById" val="删除供应商信息" allUse="1">
<property id="rowId" name="id" ref="required" var="供应商ID"></property>
</url>
<url id="supplier005" path="/post/SupplierController/editSupplierById" val="编辑供应商信息" allUse="0">
<url id="supplier005" path="/post/SupplierController/editSupplierById" val="编辑供应商信息" allUse="1">
<property id="rowId" name="id" ref="required" var="供应商ID"></property>
<property id="supplierName" name="supplierName" ref="required" var="供应商名称"></property>
<property id="contacts" name="contacts" ref="" var="联系人"></property>
@ -91,21 +91,21 @@
<property id="accountNumber" name="accountNumber" ref="" var="账号"></property>
<property id="taxRate" name="taxRate" ref="" var="税率"></property>
</url>
<url id="supplier006" path="/post/SupplierController/editSupplierByEnabled" val="设置供应商状态改为启用" allUse="0">
<url id="supplier006" path="/post/SupplierController/editSupplierByEnabled" val="设置供应商状态改为启用" allUse="1">
<property id="rowId" name="id" ref="required" var="供应商ID"></property>
</url>
<url id="supplier007" path="/post/SupplierController/editSupplierByNotEnabled" val="设置供应商状态改为未启用" allUse="0">
<url id="supplier007" path="/post/SupplierController/editSupplierByNotEnabled" val="设置供应商状态改为未启用" allUse="1">
<property id="rowId" name="id" ref="required" var="供应商ID"></property>
</url>
<!-- 供应商管理结束-->
<!-- 客户信息管理开始 -->
<url id="customer001" path="/post/CustomerController/queryCustomerByList" val="获取客户信息" allUse="0">
<url id="customer001" path="/post/CustomerController/queryCustomerByList" val="获取客户信息" allUse="1">
<property id="customerName" name="customerName" ref="" var="客户名称"></property>
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
</url>
<url id="customer002" path="/post/CustomerContronller/insertCustomer" val="添加客户信息" allUse="0">
<url id="customer002" path="/post/CustomerContronller/insertCustomer" val="添加客户信息" allUse="1">
<property id="customerName" name="customerName" ref="required" var="客户名称"></property>
<property id="contacts" name="contacts" ref="" var="联系人"></property>
<property id="phonenum" name="phonenum" ref="" var="联系电话"></property>
@ -124,13 +124,13 @@
<property id="accountNumber" name="accountNumber" ref="" var="账号"></property>
<property id="taxRate" name="taxRate" ref="" var="税率"></property>
</url>
<url id="customer003" path="/post/CustomerController/queryCustomerById" val="据ID查询客户信息用于信息回显" allUse="0">
<url id="customer003" path="/post/CustomerController/queryCustomerById" val="据ID查询客户信息用于信息回显" allUse="2">
<property id="rowId" name="id" ref="required" var="客户ID"></property>
</url>
<url id="customer004" path="/post/CustomerController/deleteCustomerById" val="删除客户信息" allUse="0">
<url id="customer004" path="/post/CustomerController/deleteCustomerById" val="删除客户信息" allUse="1">
<property id="rowId" name="id" ref="required" var="客户ID"></property>
</url>
<url id="customer005" path="/post/CustomerController/editCustomerById" val="编辑客户信息" allUse="0">
<url id="customer005" path="/post/CustomerController/editCustomerById" val="编辑客户信息" allUse="1">
<property id="rowId" name="id" ref="required" var="客户ID"></property>
<property id="customerName" name="customerName" ref="required" var="客户名称"></property>
<property id="contacts" name="contacts" ref="" var="联系人"></property>
@ -150,21 +150,21 @@
<property id="accountNumber" name="accountNumber" ref="" var="账号"></property>
<property id="taxRate" name="taxRate" ref="" var="税率"></property>
</url>
<url id="customer006" path="/post/CustomerController/editCustomerByEnabled" val="设置客户状态改为启用" allUse="0">
<url id="customer006" path="/post/CustomerController/editCustomerByEnabled" val="设置客户状态改为启用" allUse="1">
<property id="rowId" name="id" ref="required" var="客户ID"></property>
</url>
<url id="customer007" path="/post/CustomerController/editCustomerByNotEnabled" val="设置客户状态改为未启用" allUse="0">
<url id="customer007" path="/post/CustomerController/editCustomerByNotEnabled" val="设置客户状态改为未启用" allUse="1">
<property id="rowId" name="id" ref="required" var="客户ID"></property>
</url>
<!-- 客户信息管理结束-->
<!-- 会员信息管理开始 -->
<url id="member001" path="/post/MemberController/queryMemberByList" val="获取会员信息" allUse="0">
<url id="member001" path="/post/MemberController/queryMemberByList" val="获取会员信息" allUse="1">
<property id="memberName" name="memberName" ref="" var="会员名称"></property>
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
</url>
<url id="member002" path="/post/MemberController/insertMember" val="添加会员商信息" allUse="0">
<url id="member002" path="/post/MemberController/insertMember" val="添加会员商信息" allUse="1">
<property id="memberName" name="memberName" ref="required" var="会员名称"></property>
<property id="contacts" name="contacts" ref="" var="联系人"></property>
<property id="phonenum" name="phonenum" ref="" var="联系电话"></property>
@ -183,13 +183,13 @@
<property id="accountNumber" name="accountNumber" ref="" var="账号"></property>
<property id="taxRate" name="taxRate" ref="" var="税率"></property>
</url>
<url id="member003" path="/post/MemberController/queryMemberById" val="据ID查询会员信息用于信息回显" allUse="0">
<url id="member003" path="/post/MemberController/queryMemberById" val="据ID查询会员信息用于信息回显" allUse="2">
<property id="rowId" name="id" ref="required" var="会员ID"></property>
</url>
<url id="member004" path="/post/MemberController/deleteMemberById" val="删除会员信息" allUse="0">
<url id="member004" path="/post/MemberController/deleteMemberById" val="删除会员信息" allUse="1">
<property id="rowId" name="id" ref="required" var="会员ID"></property>
</url>
<url id="member005" path="/post/MemberController/editMemberById" val="编辑会员信息" allUse="0">
<url id="member005" path="/post/MemberController/editMemberById" val="编辑会员信息" allUse="1">
<property id="rowId" name="id" ref="required" var="会员ID"></property>
<property id="memberName" name="memberName" ref="required" var="会员名称"></property>
<property id="contacts" name="contacts" ref="" var="联系人"></property>
@ -209,10 +209,10 @@
<property id="accountNumber" name="accountNumber" ref="" var="账号"></property>
<property id="taxRate" name="taxRate" ref="" var="税率"></property>
</url>
<url id="member006" path="/post/MemberController/editMemberByEnabled" val="设置会员状态改为启用" allUse="0">
<url id="member006" path="/post/MemberController/editMemberByEnabled" val="设置会员状态改为启用" allUse="1">
<property id="rowId" name="id" ref="required" var="会员ID"></property>
</url>
<url id="member007" path="/post/MemberController/editMemberByNotEnabled" val="设置会员状态改为未启用" allUse="0">
<url id="member007" path="/post/MemberController/editMemberByNotEnabled" val="设置会员状态改为未启用" allUse="1">
<property id="rowId" name="id" ref="required" var="会员ID"></property>
</url>
<!-- 会员信息管理结束 -->

View file

@ -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;

View file

@ -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;

View file

@ -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;