姚云青 před 3 roky
rodič
revize
f75a49f678

+ 6 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -336,6 +336,12 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R updateStatus(OrderUpdateDTO data) {
+        isFalse(data.getIds()==null,"请选择数据");
+
+        //验证是否有审核通过的
+        List<Order> list = baseMapper.selectList(Wraps.<Order>lbQ().in(Order::getId,data.getIds()).eq(Order::getAuditStatus,"2"));
+        isFalse(CollectionUtil.isNotEmpty(list),"请选择尚未审核通过的数据");
+
         for(Long id : data.getIds()){
             Order bean = new Order();
             bean.setId(id);

+ 7 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BBomServiceImpl.java

@@ -1,8 +1,10 @@
 package com.github.zuihou.business.productionReadyCenter.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.R;
+import com.github.zuihou.business.operationManagementCenter.entity.Order;
 import com.github.zuihou.business.operationManagementCenter.entity.Plan;
 import com.github.zuihou.business.productionReadyCenter.dao.BBomMapper;
 import com.github.zuihou.business.productionReadyCenter.dto.BBomUpdateDTO;
@@ -32,6 +34,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.github.zuihou.utils.BizAssert.isFalse;
+
 /**
  * <p>
  * 业务实现类
@@ -234,6 +238,9 @@ public class BBomServiceImpl extends SuperServiceImpl<BBomMapper, BBom> implemen
     @Transactional(rollbackFor = Exception.class)
     public R updateStatus(Map<String,Object> map){
         List<String> ids = (List<String>) map.get("ids");
+        List<BBom> list = baseMapper.selectList(Wraps.<BBom>lbQ().in(BBom::getId,ids).eq(BBom::getAuditStatus,"2"));
+        isFalse(CollectionUtil.isNotEmpty(list),"请选择尚未审核通过的数据");
+
         for(String id : ids){
             BBom bBom = new BBom();
             //前端必填了。