From a82a3d07efa93b978fb3a5831a7e4e1eff82d321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Wed, 24 May 2023 14:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CollectionController.java      | 39 ++++++++++---------
 .../scm/basicInformation/collection/Form.vue  | 31 ++++++++++++++-
 2 files changed, 50 insertions(+), 20 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 a8ab309a..52e84f44 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
@@ -290,8 +290,8 @@ 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);
+        List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(), Collection_item0Entity.class);
+        if (Collection_item0List != null && Collection_item0List.size() > 0) {
             for (Collection_item0Entity collectionItem0Entity : Collection_item0List) {
                 if (StringUtils.isNotEmpty(collectionItem0Entity.getSalesorderId())) {
                     SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId());
@@ -324,26 +324,27 @@ public class CollectionController {
                 } else {
                     return ActionResult.fail("销售订单不存在");
                 }
-                String mainId = RandomUtil.uuId();
-                UserInfo userInfo = userProvider.get();
-                collectionCrForm.setCreatorUserName(userInfo.getUserId());
-                collectionCrForm.setCreatorTime(DateUtil.getNow());
+            }
+        } else {
+            return ActionResult.fail("请填写收款明细");
+        }
+        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_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class);
-                for (Collection_item0Entity entitys : Collection_item0List) {
-                    entitys.setId(RandomUtil.uuId());
-                    entitys.setCollectionId(entity.getId());
-                    collection_item0Service.save(entitys);
-                }
-                return ActionResult.success("创建成功");
-            }
+        for (Collection_item0Entity entitys : Collection_item0List) {
+            entitys.setId(RandomUtil.uuId());
+            entitys.setCollectionId(entity.getId());
+            collection_item0Service.save(entitys);
         }
-        return ActionResult.fail("请填写收款明细");
-}
+        return ActionResult.success("创建成功");
+    }
 
 
 
diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index b5065f5e..d15f930a 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -625,6 +625,36 @@
       request() {
         this.submitDisabled = true;
         var _data = this.dataList()
+        var saleFlag = false;
+        var amountFlag = false;
+        for (let i = 0; i < _data.collection_item0List.length; i++) {
+          var _list = _data.collection_item0List[i];
+          debugger
+          if (_list.salesorderId == null){
+            saleFlag = true;
+          }
+          if (_list.amount == null || _list.amount == 0 || _list.amount == ''){
+            amountFlag = true;
+          }
+        }
+        if (saleFlag){
+          this.$message({
+            message: '销售订单不存在',
+            type: 'error',
+            duration: 1000
+          })
+          this.submitDisabled = false
+          return
+        }
+        if (amountFlag){
+          this.$message({
+            message: '请填写收款金额',
+            type: 'error',
+            duration: 1000
+          })
+          this.submitDisabled = false
+          return
+        }
         if (!this.dataForm.id) {
           request({
             url: '/api/collection/Collection',
@@ -677,7 +707,6 @@
           advanceAmount: undefined,
           rate: undefined,
           notPrice: undefined,
-          creatorTime: undefined,
         }
         this.dataForm.collection_item0List.push(item)
       },