收款单修改

SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java

@@ -290,6 +290,7 @@ public class CollectionController {
     @PostMapping
     @Transactional
     public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException {
+        if (collectionCrForm.getCollection_item0List()!=null && collectionCrForm.getCollection_item0List().size()>0) {
             List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(), Collection_item0Entity.class);
             for (Collection_item0Entity collectionItem0Entity : Collection_item0List) {
                 if (StringUtils.isNotEmpty(collectionItem0Entity.getSalesorderId())) {
@@ -300,10 +301,10 @@ public class CollectionController {
                         }
                     }
                 }
-            if (collectionItem0Entity.getAmount() == null ){
+                if (collectionItem0Entity.getAmount() == null || collectionItem0Entity.getAmount().compareTo(BigDecimal.ZERO) == 0) {
                     return ActionResult.fail("请输入收款金额");
                 }
-            if (collectionItem0Entity.getSalesorderId() != null){
+                if (StringUtil.isNotEmpty(collectionItem0Entity.getSalesorderId())) {
                     SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId());
                     if (saleorderitemEntity.getAmountCollected() == null) {
                         saleorderitemEntity.setAmountCollected(new BigDecimal("0"));
@@ -340,6 +341,7 @@ public class CollectionController {
                 }
                 return ActionResult.success("创建成功");
             }
+        }
         return ActionResult.fail("请填写收款明细");
 }