| | |
| | | for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) { |
| | | ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery() |
| | | .eq(ContractSubjectMatter::getContractId, contract.getId()) |
| | | .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode()) |
| | | .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId()) |
| | | .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode()) |
| | | .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo()) |
| | | .last("limit 1")); |
| | | outAmount = outAmount.add(outSubjectMatterAddDTO.getOutBoundNum().multiply(subjectMatter.getUnitPrice())); |
| | |
| | | addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> { |
| | | ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery() |
| | | .eq(ContractSubjectMatter::getContractId, contract.getId()) |
| | | .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode()) |
| | | .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId()) |
| | | .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode()) |
| | | .ne(ContractSubjectMatter::getDeliveryStatus, 2) |
| | | .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo()) |
| | | .last("limit 1")); |
| | |
| | | if (CollUtil.isEmpty(addDTO.getSubjectMatterList())) { |
| | | return R.failed("出库标的物不能为空"); |
| | | } |
| | | if (addDTO.getSubjectMatterList().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&& |
| | | StrUtil.isBlank(contractSubjectMatterAddDTO.getSubjectMatterCode()))){ |
| | | return R.failed("标的物的dataId和materialCode不能同时为空"); |
| | | } |
| | | // 1. 确定查询用的合同编号字段值 |
| | | String targetContractNo = addDTO.getContractNo(); |
| | | boolean isSgbAndEmptyOutbound = StrUtil.isEmpty(addDTO.getOutBoundType()) |
| | |
| | | for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) { |
| | | ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery() |
| | | .eq(ContractSubjectMatter::getContractId, contract.getId()) |
| | | .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode()) |
| | | .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId()) |
| | | .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode()) |
| | | .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo()) |
| | | .last("limit 1")); |
| | | if (ObjUtil.isNull(subjectMatter)) { |
| | |
| | | baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber)); |
| | | return R.ok(); |
| | | } |
| | | |
| | | @Override |
| | | public R addContractOutSgb(OutBoundAddDTO addDTO) { |
| | | //校验参数 |
| | | R<Contract> r = vailParam(addDTO); |
| | | if (!r.isOk()) { |
| | | return r; |
| | | } |
| | | Contract contract = r.getData(); |
| | | String batchNumber = genBatchNumber(); |
| | | //出库 |
| | | handleOutBound(batchNumber,contract, addDTO); |
| | | |
| | | //保存资金明细 |
| | | BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO); |
| | | //更新合同状态及阶段 |
| | | contract.setOutBoundAmout(outBoundAmount); |
| | | updateContractSchedule(contract); |
| | | |
| | | return R.ok(batchNumber); |
| | | } |
| | | } |