Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

7 天以前 ca412ade3b178fbc8ba0a4b6215a040acdede954

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuotePlanServiceImpl.java

@@ -121,20 +121,14 @@
        tmsQuotePlan.setCreateBy(SecurityUtils.getUsername());
        tmsQuotePlan.setCreateTime(DateUtils.getNowDate());
        tmsQuotePlanMapper.insertTmsQuotePlan(tmsQuotePlan);
        if (tmsQuotePlan.getPlanType() == 0){

            List<TmsQuoteItem> quoteItems = tmsQuotePlan.getQuoteItems();
            if (quoteItems != null && !quoteItems.isEmpty()){
                quoteItems.forEach(tmsQuoteItem -> {
                    tmsQuoteItem.setQuotePlanId(tmsQuotePlan.getId());
                });
                tmsQuoteItemService.insertTmsQuoteItemBatch(quoteItems);
            }else{
                throw new RuntimeException("请至少选择一个报价方案");
            }

        List<TmsQuoteItem> quoteItems = tmsQuotePlan.getQuoteItems();
        if (quoteItems != null && !quoteItems.isEmpty()){
            quoteItems.forEach(tmsQuoteItem -> {
                tmsQuoteItem.setQuotePlanId(tmsQuotePlan.getId());
            });
            tmsQuoteItemService.insertTmsQuoteItemBatch(quoteItems);
        }

        return 1;
    }

@@ -165,7 +159,7 @@
        int i = tmsQuotePlanMapper.updateTmsQuotePlan(tmsQuotePlan);


        if (tmsQuotePlan.getPlanType() == 0){

            List<TmsQuoteItem> quoteItems = tmsQuotePlan.getQuoteItems();
            if (quoteItems != null && !quoteItems.isEmpty()){
                List<TmsQuoteItem> tmsQuoteItems = tmsQuoteItemService.selectTmsQuoteItemList(new TmsQuoteItem() {{
@@ -195,10 +189,7 @@
                }


            }else{
                throw new RuntimeException("请至少选择一个报价方案");
            }
        }
        return i;
    }