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 2024-11-14 20:14:43 +08:00
parent 6fa5aaa967
commit ca204fac91
3 changed files with 31 additions and 2 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/EmisCommissionProfitController.java
View File

@ -11,8 +11,12 @@
package com.xdadan.erp.web.emis; package com.xdadan.erp.web.emis;
import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -29,7 +33,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.StringUtils;
import com.xdadan.erp.common.utils.poi.ExcelUtil; import com.xdadan.erp.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisCommissionProfit; import com.xdadan.erp.emis.domain.EmisCommissionProfit;
@ -48,6 +51,29 @@ public class EmisCommissionProfitController extends BaseController
@Autowired @Autowired
private IEmisCommissionProfitService emisCommissionProfitService; private IEmisCommissionProfitService emisCommissionProfitService;
@GetMapping(value = "/batchReCalcProfitByBillCode")
public AjaxResult batchReCalcProfitByBillCode(String billCode)
{
if(!StringUtils.isEmpty(billCode)){
billCode=WaybillHelper.formatQueryValue(billCode);
String[] billCodeSortList = billCode.split(",");
if(billCodeSortList.length>1){
for (int i=0;i<billCodeSortList.length;i++){
String subBillCode=billCodeSortList[i];
try {
emisCommissionProfitService.reCalcProfitByBillCode(subBillCode);
}catch (Exception ex){
return AjaxResult.error("计算失败-单号:["+subBillCode+"]");
}
}
}
return AjaxResult.success("计算成功");
}else{
return AjaxResult.error("计算失败-单号不能为空");
}
}
/** /**
* 查询员工提成表列表 * 查询员工提成表列表
*/ */
@ -60,7 +86,6 @@ public class EmisCommissionProfitController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
/** /**
* 检查是否重复 * 检查是否重复
* *

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java
View File

@ -33,6 +33,7 @@ public interface IEmisCommissionProfitService
*/ */
public void autoDoProfit(); public void autoDoProfit();
/** /**
* 重新计算提成根据billCode * 重新计算提成根据billCode
* @param billCode * @param billCode

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -26,7 +26,9 @@ import com.xdadan.erp.emis.mapper.EmisCommissionDtlMapper;
import com.xdadan.erp.emis.mapper.EmisCommissionQuoteMapper; import com.xdadan.erp.emis.mapper.EmisCommissionQuoteMapper;
import com.xdadan.erp.emis.mapper.EmisWaybillMapper; import com.xdadan.erp.emis.mapper.EmisWaybillMapper;
import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.utils.WaybillHelper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.mapper.EmisCommissionProfitMapper; import com.xdadan.erp.emis.mapper.EmisCommissionProfitMapper;
@ -75,6 +77,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
} }
} }
/** /**
* 根据单号重新计算提成 * 根据单号重新计算提成
*/ */