From 08452758d1af3b76d0252cfbaefa5453329f7848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Wed, 22 Mar 2023 18:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CollectionController.java | 63 ++++++++----------- .../scm/basicInformation/arinvoices/Form.vue | 34 +++++++--- .../scm/basicInformation/collection/Form.vue | 8 +-- .../scm/basicInformation/receiptout/Form.vue | 2 +- .../scm/basicInformation/saleback/Form.vue | 2 + .../scm/basicInformation/saleorder/Form.vue | 53 ++++++++-------- 6 files changed, 83 insertions(+), 79 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java index c3c32d6a..6113e72c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -33,6 +33,7 @@ import jnpf.util.file.UploadUtil; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; @@ -218,10 +219,21 @@ public class CollectionController { public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException { List Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class); for (Collection_item0Entity collectionItem0Entity : Collection_item0List){ + if (collectionItem0Entity.getAmount() == null ){ + return ActionResult.fail("请输入收款金额"); + } if (collectionItem0Entity.getSalesorderId() != null){ SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionCrForm.getCollection_item0List().get(0).getSalesorderId()); if (saleorderitemEntity.getAmountCollected() == null){ - saleorderitemEntity.setAmountCollected(new BigDecimal(0)); + 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){ @@ -230,39 +242,24 @@ public class CollectionController { }else { return ActionResult.fail("销售订单不存在"); } - } -// if (collectionCrForm.getCollection_item0List().size()>0) { -// -// SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionCrForm.getCollection_item0List().get(0).getSalesorderId()); -// if (saleorderitemEntity.getAmountCollected() == null){ -// saleorderitemEntity.setAmountCollected(new BigDecimal(0)); -// } -// if (saleorderitemEntity.getAmountCollected().equals(saleorderitemEntity.getPrice()) || -// saleorderitemEntity.getAmountCollected().compareTo(saleorderitemEntity.getPrice()) == 1){ -// return ActionResult.fail("已回完款，无需回款"); -// } -// }else { -// return ActionResult.fail("销售订单不存在"); -// } - String mainId =RandomUtil.uuId(); - UserInfo userInfo=userProvider.get(); - collectionCrForm.setCreatorUserName(userInfo.getUserId()); - collectionCrForm.setCreatorTime(DateUtil.getNow()); + String mainId =RandomUtil.uuId(); + UserInfo userInfo=userProvider.get(); + collectionCrForm.setCreatorUserName(userInfo.getUserId()); + collectionCrForm.setCreatorTime(DateUtil.getNow()); // collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); - CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class); - entity.setId(mainId); - entity.setStatus("0"); - collectionService.save(entity); + CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class); + entity.setId(mainId); + entity.setStatus("0"); + collectionService.save(entity); // List 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.setCollectionId(entity.getId()); collection_item0Service.save(entitys); } - - - - return ActionResult.success("创建成功"); + return ActionResult.success("创建成功"); + } + return ActionResult.fail("请填写收款明细"); } @@ -519,16 +516,6 @@ public class CollectionController { List Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class); for(Collection_item0Entity entitys : Collection_item0List){ - - - - - - - - - - entitys.setId(RandomUtil.uuId()); entitys.setCollectionId(entity.getId()); collection_item0Service.save(entitys); diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index 3a9b3fe0..68672425 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -2,7 +2,7 @@ + width="1500px"> - + @@ -156,7 +155,7 @@ interfaceId="398108817931470725" :columnOptions="salesorder_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog" - popupWidth="800px" + popupWidth="800px" disabled > @@ -164,7 +163,7 @@