liyg 2 سال پیش
والد
کامیت
cbe69b7532

+ 0 - 2
src/main/java/com/steerinfo/dil/controller/QmsQueueListController.java

@@ -48,8 +48,6 @@ public class QmsQueueListController extends BaseRESTfulController {
         int i = qmsQueueListService.addQueueList(new BigDecimal(resultId));
         if(i == 0){
             return failed("该车已有排队!");
-        }else if(i == 1){
-            return failed("钢材未轧,暂时无法排队,请等待!");
         }
         return success(i);
     }

+ 0 - 10
src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

@@ -113,16 +113,6 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         //通过订单查询有几种物资
         Map<String, Object> mesMap = qmsQueueListMapper.getMaterialNumByOrderId(resultId);
         int materialNum = DataChange.dataToBigDecimal(mesMap.get("materialNum")).intValue();
-//        Map<String,Object> isUnrolled=null;
-//        try{
-//            isUnrolled=qmsModelUnrooledMapper.existUnrolled(mesMap);
-//        }catch (Exception e){
-//            System.out.println("查询未轧规格出现异常,不抛出异常,允许继续排队。");
-//        }
-//        if(isUnrolled!=null){
-//            //存在未轧钢材,不允许排队
-//            return 1;
-//        }
         if(materialNum == 1){
             //单拼进入链表
             //判断单拼链表中是否有已存在此辆车正在排队