aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-03-12 08:21:29 +08:00
parent 28dc7bbf0d
commit 13d7bf084b
10 changed files with 147 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCreditCustomerController.java
View File

@ -13,6 +13,8 @@ package com.xdadan.erp.web.emis;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
@ -71,8 +73,8 @@ public class EmisCreditCustomerController extends BaseController
@GetMapping("/checkUnique")
public AjaxResult checkUnique(EmisCreditCustomer emisCreditCustomer)
{
int cnt=emisCreditCustomerService.checkUnique(emisCreditCustomer);
return AjaxResult.success("检查成功",cnt);
// int cnt=emisCreditCustomerService.checkUnique(emisCreditCustomer);
return AjaxResult.success("检查成功");
}
@ -107,7 +109,17 @@ public class EmisCreditCustomerController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody EmisCreditCustomer emisCreditCustomer)
{
return toAjax(emisCreditCustomerService.insertEmisCreditCustomer(emisCreditCustomer));
try {
return toAjax(emisCreditCustomerService.insertEmisCreditCustomer(emisCreditCustomer));
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}
/**
@ -118,7 +130,16 @@ public class EmisCreditCustomerController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody EmisCreditCustomer emisCreditCustomer)
{
return toAjax(emisCreditCustomerService.updateEmisCreditCustomer(emisCreditCustomer));
try {
return toAjax(emisCreditCustomerService.updateEmisCreditCustomer(emisCreditCustomer));
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}
/**

29
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCreditSalesmenController.java
View File

@ -13,6 +13,8 @@ package com.xdadan.erp.web.emis;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
@ -71,8 +73,8 @@ public class EmisCreditSalesmenController extends BaseController
@GetMapping("/checkUnique")
public AjaxResult checkUnique(EmisCreditSalesmen emisCreditSalesmen)
{
int cnt=emisCreditSalesmenService.checkUnique(emisCreditSalesmen);
return AjaxResult.success("检查成功",cnt);
// int cnt=emisCreditSalesmenService.checkUnique(emisCreditSalesmen);
return AjaxResult.success("检查成功");
}
@ -107,7 +109,17 @@ public class EmisCreditSalesmenController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody EmisCreditSalesmen emisCreditSalesmen)
{
return toAjax(emisCreditSalesmenService.insertEmisCreditSalesmen(emisCreditSalesmen));
try {
return toAjax(emisCreditSalesmenService.insertEmisCreditSalesmen(emisCreditSalesmen));
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}
/**
@ -118,7 +130,16 @@ public class EmisCreditSalesmenController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody EmisCreditSalesmen emisCreditSalesmen)
{
return toAjax(emisCreditSalesmenService.updateEmisCreditSalesmen(emisCreditSalesmen));
try {
return toAjax(emisCreditSalesmenService.updateEmisCreditSalesmen(emisCreditSalesmen));
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}
/**

2
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCreditCustomerMapper.java
View File

@ -46,7 +46,7 @@ public interface EmisCreditCustomerMapper extends BaseMapper<EmisCreditCustomer>
* @param emisCreditCustomer
* @return 数量
*/
public int checkUnique(EmisCreditCustomer emisCreditCustomer);
public List<EmisCreditCustomer> checkUnique(EmisCreditCustomer emisCreditCustomer);
/**

2
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCreditSalesmenMapper.java
View File

@ -46,7 +46,7 @@ public interface EmisCreditSalesmenMapper extends BaseMapper<EmisCreditSalesmen>
* @param emisCreditSalesmen
* @return 数量
*/
public int checkUnique(EmisCreditSalesmen emisCreditSalesmen);
public List<EmisCreditSalesmen> checkUnique(EmisCreditSalesmen emisCreditSalesmen);
/**

9
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCreditCustomerService.java
View File

@ -11,8 +11,9 @@ package com.xdadan.erp.emis.service;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisCreditCustomer;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
/**
/**
* @ClassName EmisCreditCustomerService
* @Description 客户信用额度表
* @author linfso
@ -42,7 +43,7 @@ public interface IEmisCreditCustomerService
* @param emisCreditCustomer
* @return 数量
*/
public int checkUnique(EmisCreditCustomer emisCreditCustomer);
public List<EmisCreditCustomer> checkUnique(EmisCreditCustomer emisCreditCustomer);
/**
* 新增客户信用额度表
@ -50,7 +51,7 @@ public interface IEmisCreditCustomerService
* @param emisCreditCustomer 客户信用额度表
* @return 结果
*/
public int insertEmisCreditCustomer(EmisCreditCustomer emisCreditCustomer);
public int insertEmisCreditCustomer(EmisCreditCustomer emisCreditCustomer) throws EmisBizError;
/**
* 修改客户信用额度表
@ -58,7 +59,7 @@ public interface IEmisCreditCustomerService
* @param emisCreditCustomer 客户信用额度表
* @return 结果
*/
public int updateEmisCreditCustomer(EmisCreditCustomer emisCreditCustomer);
public int updateEmisCreditCustomer(EmisCreditCustomer emisCreditCustomer) throws EmisBizError;
/**
* 批量删除客户信用额度表

9
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCreditSalesmenService.java
View File

@ -11,8 +11,9 @@ package com.xdadan.erp.emis.service;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisCreditSalesmen;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
/**
/**
* @ClassName EmisCreditSalesmenService
* @Description 销售信用额度
* @author linfso
@ -42,7 +43,7 @@ public interface IEmisCreditSalesmenService
* @param emisCreditSalesmen
* @return 数量
*/
public int checkUnique(EmisCreditSalesmen emisCreditSalesmen);
public List<EmisCreditSalesmen> checkUnique(EmisCreditSalesmen emisCreditSalesmen);
/**
* 新增销售信用额度
@ -50,7 +51,7 @@ public interface IEmisCreditSalesmenService
* @param emisCreditSalesmen 销售信用额度
* @return 结果
*/
public int insertEmisCreditSalesmen(EmisCreditSalesmen emisCreditSalesmen);
public int insertEmisCreditSalesmen(EmisCreditSalesmen emisCreditSalesmen) throws EmisBizError;
/**
* 修改销售信用额度
@ -58,7 +59,7 @@ public interface IEmisCreditSalesmenService
* @param emisCreditSalesmen 销售信用额度
* @return 结果
*/
public int updateEmisCreditSalesmen(EmisCreditSalesmen emisCreditSalesmen);
public int updateEmisCreditSalesmen(EmisCreditSalesmen emisCreditSalesmen) throws EmisBizError;
/**
* 批量删除销售信用额度

34
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditCustomerServiceImpl.java
View File

@ -13,6 +13,10 @@ package com.xdadan.erp.emis.service.impl;
import java.math.BigDecimal;
import java.util.List;
import cn.hutool.core.collection.CollectionUtil;
import com.xdadan.erp.emis.domain.EmisQuotePrice;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -64,7 +68,7 @@ public class EmisCreditCustomerServiceImpl implements IEmisCreditCustomerService
* @return 数量
*/
@Override
public int checkUnique(EmisCreditCustomer emisCreditCustomer)
public List<EmisCreditCustomer> checkUnique(EmisCreditCustomer emisCreditCustomer)
{
return emisCreditCustomerMapper.checkUnique(emisCreditCustomer);
}
@ -76,8 +80,18 @@ public class EmisCreditCustomerServiceImpl implements IEmisCreditCustomerService
* @return 结果
*/
@Override
public int insertEmisCreditCustomer(EmisCreditCustomer emisCreditCustomer)
{
public int insertEmisCreditCustomer(EmisCreditCustomer emisCreditCustomer) throws EmisBizError {
// 检查是否重复
List<EmisCreditCustomer> listOld=emisCreditCustomerMapper.checkUnique(emisCreditCustomer);
if(!CollectionUtil.isEmpty(listOld)){
String estNameStr="";
for (EmisCreditCustomer item:listOld) {
estNameStr=estNameStr+item.getAccCode()+",";
}
throw new EmisBizError(EmisBizErrorType.EXISTS,"范围重复["+estNameStr+"]");
}
// 生成accCode
String accCode= WaybillHelper.genCreditAccCode();
emisCreditCustomer.setAccCode(accCode);
@ -91,8 +105,18 @@ public class EmisCreditCustomerServiceImpl implements IEmisCreditCustomerService
* @return 结果
*/
@Override
public int updateEmisCreditCustomer(EmisCreditCustomer emisCreditCustomer)
{
public int updateEmisCreditCustomer(EmisCreditCustomer emisCreditCustomer) throws EmisBizError {
// 检查是否重复
List<EmisCreditCustomer> listOld=emisCreditCustomerMapper.checkUnique(emisCreditCustomer);
if(!CollectionUtil.isEmpty(listOld)){
String estNameStr="";
for (EmisCreditCustomer item:listOld) {
estNameStr=estNameStr+item.getAccCode()+",";
}
throw new EmisBizError(EmisBizErrorType.EXISTS,"数据重复["+estNameStr+"]");
}
return emisCreditCustomerMapper.updateEmisCreditCustomer(emisCreditCustomer);
}

34
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditSalesmenServiceImpl.java
View File

@ -13,6 +13,10 @@ package com.xdadan.erp.emis.service.impl;
import java.math.BigDecimal;
import java.util.List;
import cn.hutool.core.collection.CollectionUtil;
import com.xdadan.erp.emis.domain.EmisCreditCustomer;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -64,7 +68,7 @@ public class EmisCreditSalesmenServiceImpl implements IEmisCreditSalesmenService
* @return 数量
*/
@Override
public int checkUnique(EmisCreditSalesmen emisCreditSalesmen)
public List<EmisCreditSalesmen> checkUnique(EmisCreditSalesmen emisCreditSalesmen)
{
return emisCreditSalesmenMapper.checkUnique(emisCreditSalesmen);
}
@ -76,8 +80,18 @@ public class EmisCreditSalesmenServiceImpl implements IEmisCreditSalesmenService
* @return 结果
*/
@Override
public int insertEmisCreditSalesmen(EmisCreditSalesmen emisCreditSalesmen)
{
public int insertEmisCreditSalesmen(EmisCreditSalesmen emisCreditSalesmen) throws EmisBizError {
// 检查是否重复
List<EmisCreditSalesmen> listOld=emisCreditSalesmenMapper.checkUnique(emisCreditSalesmen);
if(!CollectionUtil.isEmpty(listOld)){
String estNameStr="";
for (EmisCreditSalesmen item:listOld) {
estNameStr=estNameStr+item.getAccCode()+",";
}
throw new EmisBizError(EmisBizErrorType.EXISTS,"数据重复["+estNameStr+"]");
}
// 生成accCode
String accCode= WaybillHelper.genCreditAccCode();
emisCreditSalesmen.setAccCode(accCode);
@ -91,8 +105,18 @@ public class EmisCreditSalesmenServiceImpl implements IEmisCreditSalesmenService
* @return 结果
*/
@Override
public int updateEmisCreditSalesmen(EmisCreditSalesmen emisCreditSalesmen)
{
public int updateEmisCreditSalesmen(EmisCreditSalesmen emisCreditSalesmen) throws EmisBizError {
// 检查是否重复
List<EmisCreditSalesmen> listOld=emisCreditSalesmenMapper.checkUnique(emisCreditSalesmen);
if(!CollectionUtil.isEmpty(listOld)){
String estNameStr="";
for (EmisCreditSalesmen item:listOld) {
estNameStr=estNameStr+item.getAccCode()+",";
}
throw new EmisBizError(EmisBizErrorType.EXISTS,"数据重复["+estNameStr+"]");
}
return emisCreditSalesmenMapper.updateEmisCreditSalesmen(emisCreditSalesmen);
}

38
emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
View File

@ -87,30 +87,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by a.create_time desc
</select>
<select id="checkUnique" parameterType="EmisCreditCustomer" resultType="int">
select count(1) from emis_credit_customer
where del_flag='0'
and id = #{id}
and acc_code = #{accCode}
and customer_code = #{customerCode}
and monthly_pay_code = #{monthlyPayCode}
and credit_money = #{creditMoney}
and use_money = #{useMoney}
and currency = #{currency}
and trans_type = #{transType}
and start_date = #{startDate}
and end_date = #{endDate}
and bl_open = #{blOpen}
and remark = #{remark}
and tenant_id = #{tenantId}
and del_flag = #{delFlag}
and create_by = #{createBy}
and create_time = #{createTime}
and update_by = #{updateBy}
and update_time = #{updateTime}
and create_site = #{createSite}
and update_site = #{updateSite}
limit 1
<select id="checkUnique" parameterType="EmisCreditCustomer" resultMap="EmisCreditCustomerResult">
<include refid="selectEmisCreditCustomerVo"/>
where del_flag='0'
<if test="id != null "> and id != #{id}</if>
and monthly_pay_code = #{monthlyPayCode}
and FIND_IN_SET(#{transType},trans_type)
and (
( start_date <![CDATA[<= ]]> #{startDate} and #{startDate} <![CDATA[< ]]> end_date )
or ( start_date <![CDATA[<= ]]> #{endDate} and #{endDate} <![CDATA[< ]]> end_date )
)
limit 1
</select>
<select id="selectEmisCreditCustomerById" parameterType="Long" resultMap="EmisCreditCustomerResult">

37
emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
View File

@ -70,30 +70,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by create_time desc
</select>
<select id="checkUnique" parameterType="EmisCreditSalesmen" resultType="int">
select count(1) from emis_credit_salesmen
where del_flag='0'
and id = #{id}
and acc_code = #{accCode}
and salesmen = #{salesmen}
and credit_money = #{creditMoney}
and use_money = #{useMoney}
and currency = #{currency}
and trans_type = #{transType}
and start_date = #{startDate}
and end_date = #{endDate}
and bl_open = #{blOpen}
and remark = #{remark}
and tenant_id = #{tenantId}
and del_flag = #{delFlag}
and create_by = #{createBy}
and create_time = #{createTime}
and update_by = #{updateBy}
and update_time = #{updateTime}
and create_site = #{createSite}
and update_site = #{updateSite}
limit 1
</select>
<select id="checkUnique" parameterType="EmisCreditSalesmen" resultMap="EmisCreditSalesmenResult">
<include refid="selectEmisCreditSalesmenVo"/>
where del_flag='0'
<if test="id != null "> and id != #{id}</if>
and salesmen=#{salesmen}
and FIND_IN_SET(#{transType},trans_type)
and (
( start_date <![CDATA[<= ]]> #{startDate} and #{startDate} <![CDATA[< ]]> end_date )
or ( start_date <![CDATA[<= ]]> #{endDate} and #{endDate} <![CDATA[< ]]> end_date )
)
</select>
<select id="selectEmisCreditSalesmenById" parameterType="Long" resultMap="EmisCreditSalesmenResult">
select id, acc_code, salesmen, credit_money, use_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site