Commit 56e5812dec147c624c72f268e1c0740db676ba19

Authored by 杨鸣坤
1 parent e90e9a1e

楚江ERP:申请锁规延期增加是否有未完成的申请校验

@@ -22,6 +22,7 @@ import com.lframework.xingyun.sc.bo.contract.GetSpecLockDelayApplicationBo; @@ -22,6 +22,7 @@ import com.lframework.xingyun.sc.bo.contract.GetSpecLockDelayApplicationBo;
22 import com.lframework.xingyun.sc.bo.contract.QuerySpecLockDelayApplicationBo; 22 import com.lframework.xingyun.sc.bo.contract.QuerySpecLockDelayApplicationBo;
23 import com.lframework.xingyun.sc.entity.ContractDistributorStandard; 23 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
24 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication; 24 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
  25 +import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
25 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService; 26 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
26 import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService; 27 import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService;
27 import com.lframework.xingyun.sc.vo.contract.createVo.CreateSpecLockDelayApplicationVo; 28 import com.lframework.xingyun.sc.vo.contract.createVo.CreateSpecLockDelayApplicationVo;
@@ -229,6 +230,16 @@ public class SpecLockDelayApplicationController extends DefaultBaseController { @@ -229,6 +230,16 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
229 QuerySpecLockDelayApplicationVo vo = new QuerySpecLockDelayApplicationVo(); 230 QuerySpecLockDelayApplicationVo vo = new QuerySpecLockDelayApplicationVo();
230 vo.setContractId(id); 231 vo.setContractId(id);
231 List<SpecLockDelayApplication> specLockDelayApplicationList = specLockDelayApplicationService.query(vo); 232 List<SpecLockDelayApplication> specLockDelayApplicationList = specLockDelayApplicationService.query(vo);
  233 + for (SpecLockDelayApplication specLockDelayApplication : CollectionUtils.emptyIfNull(specLockDelayApplicationList)) {
  234 + if (specLockDelayApplication == null) {
  235 + continue;
  236 + }
  237 +
  238 + if (CustomerDevelopStatus.REFUSE.name().equals(specLockDelayApplication.getApprovalStatus())
  239 + || CustomerDevelopStatus.AUDIT.name().equals(specLockDelayApplication.getApprovalStatus())) {
  240 + throw new DefaultClientException("该合同有未审核通过或未取消的锁价无规格操作申请单,不允许重复申请!");
  241 + }
  242 + }
232 243
233 GetSpecLockDelayApplicationBo result = new GetSpecLockDelayApplicationBo(); 244 GetSpecLockDelayApplicationBo result = new GetSpecLockDelayApplicationBo();
234 245