优化

platform-service/src/main/java/com/platform/service/merge/impl/LongYanPurchaseOrderMergeServiceImpl.java

@@ -139,6 +139,15 @@ public class LongYanPurchaseOrderMergeServiceImpl extends BaseServiceImpl<LongYa
 
     @Override
     public void saveModelByList(String title,List<LongYanPurchaseOrder> longYanPurchaseOrders) {
+        List<String> idList = longYanPurchaseOrders.stream().map(LongYanPurchaseOrder::getId).collect(Collectors.toList());
+        Weekend<LongYanPurchaseOrder> weekend  = new Weekend<>(LongYanPurchaseOrder.class);
+        WeekendCriteria<LongYanPurchaseOrder,Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(LongYanPurchaseOrder::getId,idList);
+        weekendCriteria.andEqualTo(LongYanPurchaseOrder::getStatus,1);
+        List<LongYanPurchaseOrder> list = longYanPurchaseOrderMapper.selectByExample(weekend);
+        if (list!=null&&list.size()>0){
+            throw new BusinessException("存在非草稿的采购单，不可合并！");
+        }
         List<DictVO> dictVOS = DictCache.getChildren("MERGE_PARAM_JUGMENT");
         if (longYanPurchaseOrders==null||longYanPurchaseOrders.size()<2){
             throw new BusinessException("请选择至少两个请购单进行合并！");