Quellcode durchsuchen

fix:合同变更时,收款判断逻辑提前

ly vor 10 Monaten
Ursprung
Commit
ed651d2c76

+ 7 - 7
src/main/java/cn/ezhizao/project/business/order/controller/BizArchiveInputController.java

@@ -405,6 +405,13 @@ public class BizArchiveInputController extends BaseController {
                         .eq(BizWorkOrderDetail::getContractDetailId, item.getId())
                         .eq(BizWorkOrderDetail::getIsStop, 0));
 
+                List<BizCollectionDetail> collectionDetailList = bizCollectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>()
+                        .eq(BizCollectionDetail::getContractId, newBizArchiveInput.getId())
+                        .eq(BizCollectionDetail::getContractDetailId, item.getId())
+                        .eq(BizCollectionDetail::getTaskTypeId, item.getTaskTypeId()));
+                if (CollectionUtils.isNotEmpty(collectionDetailList)) {
+                    throw new RuntimeException("您已经收款,无法修改合同价格!");
+                }
 
                 //通过明细查询workorderID 进而查询record表
                 if (one != null) {
@@ -432,13 +439,6 @@ public class BizArchiveInputController extends BaseController {
                         throw new ServiceException("存在已开始的任务,不能修改该合同明细");
                     }
                 }
-                List<BizCollectionDetail> list = bizCollectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>()
-                        .eq(BizCollectionDetail::getContractId, newBizArchiveInput.getId())
-                        .eq(BizCollectionDetail::getContractDetailId, item.getId())
-                        .eq(BizCollectionDetail::getTaskTypeId, item.getTaskTypeId()));
-                if (CollectionUtils.isNotEmpty(list)) {
-                    throw new RuntimeException("您已经收款,无法修改合同价格!");
-                }
             }
 
             // 假设是循环任务判断修改数量的任务是否和已完成的任务数量相符