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-05-31 03:17:14 +08:00
parent 6dae7928b3
commit 152a7c7961
3 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
View File

@ -110,7 +110,20 @@ public class EmisElectronicPagApplyController extends BaseController
// 网点自行申请
emisElectronicPagApply.setProvideFlag("1");
emisElectronicPagApply.setApplyDate(new Date());
return toAjax(emisElectronicPagApplyService.insertEmisElectronicPagApply(emisElectronicPagApply));
emisElectronicPagApplyService.insertEmisElectronicPagApply(emisElectronicPagApply);
// 系统自动发放
try {
return toAjax(emisElectronicPagService.sendByApply(emisElectronicPagApply.getId()));
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
}
return AjaxResult.error("服务器异常，联系客服");
}
}

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

@ -42,10 +42,11 @@ public interface IEmisElectronicPagService
/**
* 总部根据申请单发放电子面单发放
* @param applyId
* @param isAutoSend 发放
* @return
* @throws EmisBizError
*/
public int sendByApply(Long applyId) throws EmisBizError;
public int sendByApply(Long applyId,boolean isAutoSend) throws EmisBizError;
/**
* 总部直接下发面单

38
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
View File

@ -87,9 +87,16 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
* @return
* @throws EmisBizError
*/
/**
* 自动发放
* @param applyId
* @param isAutoSend
* @return
* @throws EmisBizError
*/
@Transactional
@Override
public int sendByApply(Long applyId) throws EmisBizError {
public int sendByApply(Long applyId,boolean isAutoSend) throws EmisBizError {
EmisElectronicPagApply emisElectronicPagApply=emisElectronicPagApplyMapper.selectEmisElectronicPagApplyById(applyId);
if(emisElectronicPagApply==null){
@ -107,6 +114,19 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
}
String empCode= getCurrentUser().getEmpCode();
String empSiteCode =getCurrentUser().getOwnerSiteCode();
String remark="网点申请发放";
// 系统自动发放
if(isAutoSend){
empCode="0";// 系统
empSiteCode="88888";
remark="系统自动发放";
}
String prefix=emisElectronicPagApply.getPrefix();
Integer applyNum=emisElectronicPagApply.getApplyCount();
@ -136,8 +156,8 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
emisElectronicSitePag.setHasBillCount(subApplyNum);
emisElectronicSitePag.setBillFee(emisElectronicSitePag.getUnitMoney().multiply(new BigDecimal(subApplyNum)));
emisElectronicSitePag.setProvideDate(new Date());
emisElectronicSitePag.setProvideMan(getCurrentUser().getEmpCode());
emisElectronicSitePag.setProvideSite(getCurrentUser().getOwnerSiteCode());
emisElectronicSitePag.setProvideMan(empCode);
emisElectronicSitePag.setProvideSite(empSiteCode);
emisElectronicSitePag.setStatus(1);
emisElectronicSitePag.setProvideFlag("1");
emisElectronicSitePag.setApplySeq(emisElectronicPagApply.getApplySeq());
@ -165,8 +185,8 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
emisElectronicSitePag.setHasBillCount(applyNum);
emisElectronicSitePag.setBillFee(BigDecimal.ZERO);
emisElectronicSitePag.setProvideDate(new Date());
emisElectronicSitePag.setProvideMan(getCurrentUser().getEmpCode());
emisElectronicSitePag.setProvideSite(getCurrentUser().getOwnerSiteCode());
emisElectronicSitePag.setProvideMan(empCode);
emisElectronicSitePag.setProvideSite(empSiteCode);
emisElectronicSitePag.setStatus(1);
emisElectronicSitePag.setProvideFlag("1");
emisElectronicSitePag.setApplySeq(emisElectronicPagApply.getApplySeq());
@ -181,11 +201,11 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
// 更新运单已发放
emisElectronicPagApply.setBlSend("1");
emisElectronicPagApply.setSendCenterManCode(getCurrentUser().getEmpCode());
emisElectronicPagApply.setSendCenterSiteCode(getCurrentUser().getOwnerSiteCode());
emisElectronicPagApply.setSendCenterManCode(empCode);
emisElectronicPagApply.setSendCenterSiteCode(empSiteCode);
emisElectronicPagApply.setSendSiteCode(getCurrentUser().getOwnerSiteCode());
emisElectronicPagApply.setSendManCode(getCurrentUser().getEmpCode());
emisElectronicPagApply.setSendSiteCode(empSiteCode);
emisElectronicPagApply.setSendManCode(empCode);
emisElectronicPagApply.setSendDate(new Date());
emisElectronicPagApply.preUpdate();
emisElectronicPagApplyMapper.updateEmisElectronicPagApply(emisElectronicPagApply);