|
|
|
@ -85,13 +85,13 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq |
|
|
|
mainDO.setNumber(number); |
|
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseReceiptRequest"); |
|
|
|
RequestStatusState requestStatusState = new RequestStatusState(); |
|
|
|
requestStatusState.newObject(requestsettingDO); |
|
|
|
requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); |
|
|
|
mainDO.setStatus(requestStatusState.getState().getCode()); |
|
|
|
mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
|
mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
|
mainDO.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
|
//调用自动执行方法
|
|
|
|
if(requestsettingDO.getAutoCommit().equals("TRUE") && requestsettingDO.getAutoAgree().equals("TRUE") && requestsettingDO.getAutoExecute().equals("TREU")) { |
|
|
|
if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { |
|
|
|
|
|
|
|
} |
|
|
|
purchasereceiptRequestMainMapper.insert(mainDO); |
|
|
|
@ -119,10 +119,12 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq |
|
|
|
PurchasereceiptRequestMainDO updateObj = PurchasereceiptRequestMainConvert.INSTANCE.convert(updateReqVO); |
|
|
|
return purchasereceiptRequestMainMapper.updateById(updateObj); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageResult<PurchasereceiptRequestMainDO> getPurchasereceiptRequestMainSenior(CustomConditions conditions) { |
|
|
|
return purchasereceiptRequestMainMapper.selectSenior(conditions); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Integer deletePurchasereceiptRequestMain(Long id) { |
|
|
|
// 校验存在
|
|
|
|
@ -177,8 +179,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq |
|
|
|
} |
|
|
|
List<PurchasereceiptRequestMainImportErrorVO> errorList = new ArrayList<>(); |
|
|
|
datas.forEach(createReqVO -> { |
|
|
|
PurchasereceiptRequestMainDO mainDo = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO); |
|
|
|
String messageMain = this.validatePurchasereceiptRequestMainImport(mainDo); |
|
|
|
PurchasereceiptRequestMainDO mainDO = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO); |
|
|
|
String messageMain = this.validatePurchasereceiptRequestMainImport(mainDO); |
|
|
|
List<PurchasereceiptRequestDetailCreateReqVO> subList = createReqVO.getSubList(); |
|
|
|
List<PurchasereceiptRequestDetailDO> subDOList = PurchasereceiptRequestDetailConvert.INSTANCE.convertList03(subList); |
|
|
|
// 是否有错误数据
|
|
|
|
@ -199,40 +201,40 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq |
|
|
|
//申请单目前只做新增
|
|
|
|
//PurchasereceiptRequestMainDO existPurchasereceiptRequestMainDO = purchasereceiptRequestMainMapper.selectBySupplierCode(mainDo.getSupplierCode());
|
|
|
|
//if(existPurchasereceiptRequestMainDO == null && mode != 3) {//新增
|
|
|
|
purchasereceiptRequestMainMapper.insert(mainDo); |
|
|
|
purchasereceiptRequestMainMapper.insert(mainDO); |
|
|
|
//增加操作记录
|
|
|
|
trendsApi.createTrends(mainDo.getId(), "purchasereceiptRequest", "导入了采购收货", TrendsTypeEnum.CREATE); |
|
|
|
trendsApi.createTrends(mainDO.getId(), "purchasereceiptRequest", "导入了采购收货", TrendsTypeEnum.CREATE); |
|
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); |
|
|
|
mainDo.setNumber(number); |
|
|
|
mainDO.setNumber(number); |
|
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseReceiptRequest"); |
|
|
|
RequestStatusState requestStatusState = new RequestStatusState(); |
|
|
|
requestStatusState.newObject(requestsettingDO); |
|
|
|
mainDo.setStatus(requestStatusState.getState().getCode()); |
|
|
|
mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
|
mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
|
mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
|
requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); |
|
|
|
mainDO.setStatus(requestStatusState.getState().getCode()); |
|
|
|
mainDO.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
|
mainDO.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
|
mainDO.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
|
for (PurchasereceiptRequestDetailDO detailDO : subDOList) { |
|
|
|
detailDO.setMasterId(mainDo.getId()); |
|
|
|
detailDO.setMasterId(mainDO.getId()); |
|
|
|
detailDO.setNumber(number); |
|
|
|
} |
|
|
|
//调用自动执行方法
|
|
|
|
if(requestsettingDO.getAutoCommit().equals("TRUE") && requestsettingDO.getAutoAgree().equals("TRUE") && requestsettingDO.getAutoExecute().equals("TREU")) { |
|
|
|
if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { |
|
|
|
|
|
|
|
} |
|
|
|
purchasereceiptRequestDetailMapper.insertBatch(subDOList); |
|
|
|
//} else if(existPurchasereceiptRequestMainDO != null && existPurchasereceiptRequestMainDO.getStatus().equals(RequestStatusEnum.NEW.getCode()) && mode != 2) {//修改
|
|
|
|
//BeanUtils.copyProperties(existPurchasereceiptRequestMainDO, mainDo);
|
|
|
|
//BeanUtils.copyProperties(existPurchasereceiptRequestMainDO, mainDO);
|
|
|
|
//purchasereceiptRequestMainMapper.updateById(mainDo);
|
|
|
|
//增加操作记录
|
|
|
|
//trendsApi.createTrends(mainDo.getId(), "purchasereceiptRequest", existPurchasereceiptRequestMainDO.toString(), TrendsTypeEnum.UPDATE);
|
|
|
|
//trendsApi.createTrends(mainDO.getId(), "purchasereceiptRequest", existPurchasereceiptRequestMainDO.toString(), TrendsTypeEnum.UPDATE);
|
|
|
|
// 删除子表数据
|
|
|
|
//Map<String, Object> map = new HashMap<>();
|
|
|
|
//map.put("master_id", mainDo.getId());
|
|
|
|
//map.put("master_id", mainDO.getId());
|
|
|
|
//删除子表
|
|
|
|
//purchasereceiptRequestDetailMapper.deleteByMap(map);
|
|
|
|
//for (PurchasereceiptRequestDetailDO detailDO : subDOList) {
|
|
|
|
// detailDO.setMasterId(mainDo.getId());
|
|
|
|
// detailDO.setNumber(mainDo.getNumber());
|
|
|
|
// detailDO.setNumber(mainDO.getNumber());
|
|
|
|
// purchasereceiptRequestDetailMapper.insertBatch(subDOList);
|
|
|
|
//}
|
|
|
|
//}
|
|
|
|
@ -247,7 +249,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq |
|
|
|
|
|
|
|
@Override |
|
|
|
public Integer closePurchasereceiptRequestMain(Long id) { |
|
|
|
// 校验存在
|
|
|
|
// 校验存在存在下级单据
|
|
|
|
PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); |
|
|
|
Long count = purchasereceiptJobMainMapper.selectByRequestNumber(mainDO.getNumber()); |
|
|
|
if(count > 0) { |
|
|
|
@ -264,30 +266,48 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq |
|
|
|
|
|
|
|
@Override |
|
|
|
public Integer submitPurchasereceiptRequestMain(Long id) { |
|
|
|
// 校验存在
|
|
|
|
PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); |
|
|
|
Long count = purchasereceiptJobMainMapper.selectByRequestNumber(mainDO.getNumber()); |
|
|
|
if(count > 0) { |
|
|
|
throw new ServiceException(PURCHASERECEIPT_REQUEST_JOB_EXISTS); |
|
|
|
} |
|
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseReceiptRequest"); |
|
|
|
RequestStatusState requestStatusState = new RequestStatusState(); |
|
|
|
boolean flag = requestStatusState.submit(requestsettingDO); |
|
|
|
boolean flag = requestStatusState.submit(mainDO.getAutoAgree(), mainDO.getAutoExecute()); |
|
|
|
if(!flag) { |
|
|
|
throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); |
|
|
|
} |
|
|
|
mainDO.setStatus(requestStatusState.getState().getCode()); |
|
|
|
//调用自动执行方法
|
|
|
|
if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { |
|
|
|
|
|
|
|
} |
|
|
|
return purchasereceiptRequestMainMapper.updateById(mainDO); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Integer agreePurchasereceiptRequestMain(Long id) { |
|
|
|
return null; |
|
|
|
// 校验存在
|
|
|
|
PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); |
|
|
|
RequestStatusState requestStatusState = new RequestStatusState(); |
|
|
|
boolean flag = requestStatusState.agree(mainDO.getAutoExecute()); |
|
|
|
if(!flag) { |
|
|
|
throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); |
|
|
|
} |
|
|
|
mainDO.setStatus(requestStatusState.getState().getCode()); |
|
|
|
//调用自动执行方法
|
|
|
|
if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { |
|
|
|
|
|
|
|
} |
|
|
|
return purchasereceiptRequestMainMapper.updateById(mainDO); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Integer abortPurchasereceiptRequestMain(Long id) { |
|
|
|
return null; |
|
|
|
// 校验存在
|
|
|
|
PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); |
|
|
|
RequestStatusState requestStatusState = new RequestStatusState(); |
|
|
|
boolean flag = requestStatusState.reject(); |
|
|
|
if(!flag) { |
|
|
|
throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); |
|
|
|
} |
|
|
|
mainDO.setStatus(requestStatusState.getState().getCode()); |
|
|
|
return purchasereceiptRequestMainMapper.updateById(mainDO); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|
songguoqiang
2 years ago