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-07-02 08:25:06 +08:00
parent 5c35dc263c
commit 59ba3d436b
5 changed files with 270 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
View File

@ -15,6 +15,8 @@ import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -147,4 +149,131 @@ public class EmisWaybillAjustApplyController extends EmisBaseController
{
return toAjax(emisWaybillAjustApplyService.deleteEmisWaybillAjustApplyByIds(ids));
}
/**
* 网点审核通过
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillAjustApply:pass')")
@Log(title = "审核通过", businessType = BusinessType.UPDATE)
@PostMapping("/auditDestPass/{ids}")
public AjaxResult auditDestPass(@PathVariable Long[] ids)
{
if(ids!=null && ids.length>0){
for(int i=0;i<ids.length;i++){
try {
long id=ids[i];
EmisWaybillAjustApply emisWaybillAjustApply = new EmisWaybillAjustApply();
emisWaybillAjustApply.setId(id);
emisWaybillAjustApplyService.auditDestPass(emisWaybillAjustApply);
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("审核异常，联系客服");
}
}
}
return AjaxResult.success("操作成功");
}
/**
* 网点 网点驳回
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillAjustApply:nopass')")
@Log(title = "网点驳回", businessType = BusinessType.UPDATE)
@PostMapping("/auditDestNoPass/{ids}")
public AjaxResult auditDestNoPass(@PathVariable Long[] ids,@RequestBody EmisWaybillAjustApply spr)
{
if(ids!=null && ids.length>0){
for(int i=0;i<ids.length;i++){
try {
long id=ids[i];
EmisWaybillAjustApply emisWaybillAjustApply = new EmisWaybillAjustApply();
emisWaybillAjustApply.setId(id);
emisWaybillAjustApply.setDestConfirmNote(spr.getDestConfirmNote());
emisWaybillAjustApplyService.auditDestNoPass(emisWaybillAjustApply);
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("审核异常，联系客服");
}
}
}
return AjaxResult.success("操作成功");
}
/**
* 中心审核通过
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillAjustApply:centerPass')")
@Log(title = "中心审核通过", businessType = BusinessType.UPDATE)
@PostMapping("/auditCenterPass/{ids}")
public AjaxResult auditCenterPass(@PathVariable Long[] ids)
{
if(ids!=null && ids.length>0){
for(int i=0;i<ids.length;i++){
try {
long id=ids[i];
EmisWaybillAjustApply emisWaybillAjustApply = new EmisWaybillAjustApply();
emisWaybillAjustApply.setId(id);
emisWaybillAjustApplyService.auditCenterPass(emisWaybillAjustApply);
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("审核异常，联系客服");
}
}
}
return AjaxResult.success("操作成功");
}
/**
* 中心审核驳回
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybillAjustApply:centerNoPass')")
@Log(title = "中心驳回", businessType = BusinessType.UPDATE)
@PostMapping("/auditCenterNoPass/{ids}")
public AjaxResult auditCenterNoPass(@PathVariable Long[] ids,@RequestBody EmisWaybillAjustApply spr)
{
if(ids!=null && ids.length>0){
for(int i=0;i<ids.length;i++){
try {
long id=ids[i];
EmisWaybillAjustApply emisWaybillAjustApply = new EmisWaybillAjustApply();
emisWaybillAjustApply.setId(id);
emisWaybillAjustApply.setDestConfirmNote(spr.getDestConfirmNote());
emisWaybillAjustApplyService.auditCenterNoPass(emisWaybillAjustApply);
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("审核异常，联系客服");
}
}
}
return AjaxResult.success("操作成功");
}
}

11
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillAjustApplyMapper.java
View File

@ -13,6 +13,8 @@ package com.xdadan.erp.emis.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisWaybillAjustApply;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
/**
* @ClassName EmisWaybillAjustApplyMapper
* @Description <p> 运单调整申请 Mapper 接口 </p>
@ -77,4 +79,13 @@ public interface EmisWaybillAjustApplyMapper extends BaseMapper<EmisWaybillAjust
* @return 结果
*/
public int deleteEmisWaybillAjustApplyByIds(Long[] ids);
public int auditDestPass(EmisWaybillAjustApply emisWaybillAjustApply) ;
public int auditDestNoPass(EmisWaybillAjustApply emisWaybillAjustApply);
public int auditCenterPass(EmisWaybillAjustApply emisWaybillAjustApply);
public int auditCenterNoPass(EmisWaybillAjustApply emisWaybillAjustApply);
}

19
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java
View File

@ -10,9 +10,12 @@
package com.xdadan.erp.emis.service;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisWaybillAjustApply;
/**
import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge;
import com.xdadan.erp.emis.domain.EmisWaybillAjustApply;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
/**
* @ClassName EmisWaybillAjustApplyService
* @Description 运单调整申请
* @author linfso
@ -75,4 +78,16 @@ public interface IEmisWaybillAjustApplyService
* @return 结果
*/
public int deleteEmisWaybillAjustApplyById(Long id);
public int auditDestPass(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError;
public int auditDestNoPass(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError;
public int auditCenterPass(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError;
public int auditCenterNoPass(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError;
}

85
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -10,21 +10,31 @@
package com.xdadan.erp.emis.service.impl;
import java.util.Date;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisSite;
import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge;
import com.xdadan.erp.emis.domain.EmisSiteSettleRecord;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.domain.EmisWaybillAjustApply;
import com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper;
import com.xdadan.erp.emis.service.IEmisWaybillAjustApplyService;
import org.springframework.transaction.annotation.Transactional;
/**
/**
* 运单调整申请Service业务层处理
*
* @author linfso
* @date 2024-06-25 23:39:28
*/
@Service
public class EmisWaybillAjustApplyServiceImpl implements IEmisWaybillAjustApplyService
public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements IEmisWaybillAjustApplyService
{
@Autowired
private EmisWaybillAjustApplyMapper emisWaybillAjustApplyMapper;
@ -114,4 +124,75 @@ public class EmisWaybillAjustApplyServiceImpl implements IEmisWaybillAjustApplyS
return emisWaybillAjustApplyMapper.deleteEmisWaybillAjustApplyById(id);
}
@Transactional
@Override
public int auditDestPass(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError {
// 重新从数据库取信息
emisWaybillAjustApply = emisWaybillAjustApplyMapper.selectEmisWaybillAjustApplyById(emisWaybillAjustApply.getId());
if(!"0".equals(emisWaybillAjustApply.getBlDestConfirmed()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"已审核！");
}
emisWaybillAjustApply.setBlDestConfirmed("1");
emisWaybillAjustApply.setDestConfirmManCode(getCurrentUser().getEmpCode());
// 审核通过
return emisWaybillAjustApplyMapper.auditDestPass(emisWaybillAjustApply);
}
@Override
public int auditDestNoPass(EmisWaybillAjustApply inputObj) throws EmisBizError {
EmisWaybillAjustApply emisWaybillAjustApply = emisWaybillAjustApplyMapper.selectEmisWaybillAjustApplyById(inputObj.getId());
if(!"0".equals(emisWaybillAjustApply.getBlDestConfirmed()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"已驳回！");
}
emisWaybillAjustApply.setBlDestConfirmed("2");
emisWaybillAjustApply.setDestConfirmNote(inputObj.getDestConfirmNote());
emisWaybillAjustApply.setDestConfirmManCode(getCurrentUser().getEmpCode());
return emisWaybillAjustApplyMapper.auditDestNoPass(emisWaybillAjustApply);
}
@Transactional
@Override
public int auditCenterPass(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError {
// 重新从数据库取信息
emisWaybillAjustApply = emisWaybillAjustApplyMapper.selectEmisWaybillAjustApplyById(emisWaybillAjustApply.getId());
if(!"0".equals(emisWaybillAjustApply.getBlCenterConfirmed()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"已审核！");
}
emisWaybillAjustApply.setBlCenterConfirmed("1");
emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode());
// 审核通过
return emisWaybillAjustApplyMapper.auditCenterPass(emisWaybillAjustApply);
}
@Override
public int auditCenterNoPass(EmisWaybillAjustApply inputObj) throws EmisBizError {
EmisWaybillAjustApply emisWaybillAjustApply = emisWaybillAjustApplyMapper.selectEmisWaybillAjustApplyById(inputObj.getId());
if(!"0".equals(emisWaybillAjustApply.getBlCenterConfirmed()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"已驳回！");
}
emisWaybillAjustApply.setBlCenterConfirmed("2");
emisWaybillAjustApply.setCenterConfirmNote(inputObj.getCenterConfirmNote());
emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode());
return emisWaybillAjustApplyMapper.auditCenterNoPass(emisWaybillAjustApply);
}
}

30
emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
View File

@ -216,6 +216,36 @@
where a.id = #{id}
</select>
<update id="auditDestPass" parameterType="EmisWaybillAjustApply">
update emis_waybill_ajust_apply
set bl_dest_confirmed='1',dest_confirm_date=now() ,
dest_confirm_man_code = #{destConfirmManCode}
where id = #{id}
</update>
<update id="auditDestNoPass" parameterType="EmisWaybillAjustApply">
update emis_waybill_ajust_apply
set bl_dest_confirmed='2',dest_confirm_note = #{destConfirmNote},dest_confirm_date=now() ,
dest_confirm_man_code = #{destConfirmManCode}
where id = #{id}
</update>
<update id="auditCenterPass" parameterType="EmisWaybillAjustApply">
update emis_waybill_ajust_apply
set bl_center_confirmed='1',center_confirm_date=now() ,
center_confirm_man_code = #{centerConfirmManCode}
where id = #{id}
</update>
<update id="auditCenterNoPass" parameterType="EmisWaybillAjustApply">
update emis_waybill_ajust_apply
set bl_center_confirmed='2',center_confirm_note = #{centerConfirmNote},center_confirm_date=now() ,
center_confirm_man_code = #{centerConfirmManCode}
where id = #{id}
</update>
<insert id="insertEmisWaybillAjustApply" parameterType="EmisWaybillAjustApply" useGeneratedKeys="true" keyProperty="id">
insert into emis_waybill_ajust_apply
<trim prefix="(" suffix=")" suffixOverrides=",">