收款单修改

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);
+        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,6 +324,10 @@ public class CollectionController {
                 } else {
                     return ActionResult.fail("销售订单不存在");
                 }
+            }
+        } else {
+            return ActionResult.fail("请填写收款明细");
+        }
         String mainId = RandomUtil.uuId();
         UserInfo userInfo = userProvider.get();
         collectionCrForm.setCreatorUserName(userInfo.getUserId());
@@ -341,9 +345,6 @@ public class CollectionController {
         }
         return ActionResult.success("创建成功");
     }
-        }
-        return ActionResult.fail("请填写收款明细");
-}
 
 
 

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)
       },