This commit is contained in:
linfso 2024-06-26 18:27:53 +08:00
parent 31cf247293
commit 92324ab74c
3 changed files with 32 additions and 5 deletions

View File

@ -22,6 +22,7 @@ import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -224,6 +225,19 @@ public class EmisWaybillProblemInfoController extends EmisBaseController
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByIds(ids));
if(ids==null || ids.length>=0){
return AjaxResult.error("请先选择问题件");
}
try {
return toAjax(emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByIds(ids));
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常,联系客服");
}
}
}

View File

@ -11,8 +11,9 @@ package com.xdadan.erp.emis.service;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
/**
/**
* @ClassName EmisWaybillProblemInfoService
* @Description 问题件
* @author linfso
@ -57,7 +58,7 @@ public interface IEmisWaybillProblemInfoService
* @param ids 需要删除的问题件主键集合
* @return 结果
*/
public int deleteEmisWaybillProblemInfoByIds(Long[] ids);
public int deleteEmisWaybillProblemInfoByIds(Long[] ids) throws EmisBizError;
/**
* 删除问题件信息

View File

@ -14,6 +14,7 @@ import java.util.*;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.enumtype.ScanType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
@ -106,8 +107,19 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
* @return 结果
*/
@Override
public int deleteEmisWaybillProblemInfoByIds(Long[] ids)
{
public int deleteEmisWaybillProblemInfoByIds(Long[] ids) throws EmisBizError {
// 检查数据
for(Long id:ids){
EmisWaybillProblemInfo emisWaybillProblemInfo=emisWaybillProblemInfoMapper.selectEmisWaybillProblemInfoById(id);
if(emisWaybillProblemInfo==null){
throw new EmisBizError(EmisBizErrorType.FAIL,"问题件不存在");
}
if("1".equals(emisWaybillProblemInfo.getBlReversion())){
throw new EmisBizError(EmisBizErrorType.FAIL,"问题件已回复,不允许删除");
}
}
return emisWaybillProblemInfoMapper.deleteEmisWaybillProblemInfoByIds(ids);
}