yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

收款单修改

Browse Source
product
杨世强 1 year ago
parent df25ec27fd
commit e87a4b4d04
1 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File

86
SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
Unescape View File

@ -290,55 +290,57 @@ public class CollectionController {
@PostMapping @PostMapping
@Transactional @Transactional
public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException { public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException {
List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class); if (collectionCrForm.getCollection_item0List()!=null && collectionCrForm.getCollection_item0List().size()>0) {
for (Collection_item0Entity collectionItem0Entity : Collection_item0List){ List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(), Collection_item0Entity.class);
if (StringUtils.isNotEmpty(collectionItem0Entity.getSalesorderId())){ for (Collection_item0Entity collectionItem0Entity : Collection_item0List) {
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId()); if (StringUtils.isNotEmpty(collectionItem0Entity.getSalesorderId())) {
if (saleorderitemEntity.getInvoiceAmount() != null && saleorderitemEntity.getPrice() != null){ SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId());
if (saleorderitemEntity.getInvoiceAmount().compareTo(saleorderitemEntity.getPrice()) != 0){ if (saleorderitemEntity.getInvoiceAmount() != null && saleorderitemEntity.getPrice() != null) {
return ActionResult.fail("订单金额与发票金额不一致,无法回款"); if (saleorderitemEntity.getInvoiceAmount().compareTo(saleorderitemEntity.getPrice()) != 0) {
return ActionResult.fail("订单金额与发票金额不一致,无法回款");
}
} }
} }
} if (collectionItem0Entity.getAmount() == null || collectionItem0Entity.getAmount().compareTo(BigDecimal.ZERO) == 0) {
if (collectionItem0Entity.getAmount() == null ){ return ActionResult.fail("请输入收款金额");
return ActionResult.fail("请输入收款金额");
}
if (collectionItem0Entity.getSalesorderId() != null){
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId());
if (saleorderitemEntity.getAmountCollected() == null){
saleorderitemEntity.setAmountCollected(new BigDecimal("0"));
}
if (saleorderitemEntity.getPrice() == null){
saleorderitemEntity.setPrice(new BigDecimal("0"));
}
BigDecimal notAmount = new BigDecimal("0");
notAmount = saleorderitemEntity.getPrice().subtract(saleorderitemEntity.getAmountCollected());
if (collectionItem0Entity.getAmount().compareTo(notAmount) == 1){
return ActionResult.fail("收款金额不能大于订单金额-已收款金额");
} }
if (saleorderitemEntity.getAmountCollected().equals(saleorderitemEntity.getPrice()) || if (StringUtil.isNotEmpty(collectionItem0Entity.getSalesorderId())) {
saleorderitemEntity.getAmountCollected().compareTo(saleorderitemEntity.getPrice()) == 1){ SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId());
return ActionResult.fail("已回完款，无需回款"); if (saleorderitemEntity.getAmountCollected() == null) {
saleorderitemEntity.setAmountCollected(new BigDecimal("0"));
}
if (saleorderitemEntity.getPrice() == null) {
saleorderitemEntity.setPrice(new BigDecimal("0"));
}
BigDecimal notAmount = new BigDecimal("0");
notAmount = saleorderitemEntity.getPrice().subtract(saleorderitemEntity.getAmountCollected());
if (collectionItem0Entity.getAmount().compareTo(notAmount) == 1) {
return ActionResult.fail("收款金额不能大于订单金额-已收款金额");
}
if (saleorderitemEntity.getAmountCollected().equals(saleorderitemEntity.getPrice()) ||
saleorderitemEntity.getAmountCollected().compareTo(saleorderitemEntity.getPrice()) == 1) {
return ActionResult.fail("已回完款，无需回款");
}
} else {
return ActionResult.fail("销售订单不存在");
} }
}else { String mainId = RandomUtil.uuId();
return ActionResult.fail("销售订单不存在"); UserInfo userInfo = userProvider.get();
} collectionCrForm.setCreatorUserName(userInfo.getUserId());
String mainId =RandomUtil.uuId(); collectionCrForm.setCreatorTime(DateUtil.getNow());
UserInfo userInfo=userProvider.get();
collectionCrForm.setCreatorUserName(userInfo.getUserId());
collectionCrForm.setCreatorTime(DateUtil.getNow());
// collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); // collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class); CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
entity.setId(mainId); entity.setId(mainId);
entity.setStatus("0"); entity.setStatus("0");
collectionService.save(entity); collectionService.save(entity);
// List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class); // List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class);
for(Collection_item0Entity entitys : Collection_item0List){ for (Collection_item0Entity entitys : Collection_item0List) {
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setCollectionId(entity.getId()); entitys.setCollectionId(entity.getId());
collection_item0Service.save(entitys); collection_item0Service.save(entitys);
}
return ActionResult.success("创建成功");
} }
return ActionResult.success("创建成功");
} }
return ActionResult.fail("请填写收款明细"); return ActionResult.fail("请填写收款明细");
} }

Write Preview
Loading…
Cancel
Save