|
|
@@ -113,16 +113,16 @@ 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;
|
|
|
- }
|
|
|
+// Map<String,Object> isUnrolled=null;
|
|
|
+// try{
|
|
|
+// isUnrolled=qmsModelUnrooledMapper.existUnrolled(mesMap);
|
|
|
+// }catch (Exception e){
|
|
|
+// System.out.println("查询未轧规格出现异常，不抛出异常，允许继续排队。");
|
|
|
+// }
|
|
|
+// if(isUnrolled!=null){
|
|
|
+// //存在未轧钢材，不允许排队
|
|
|
+// return 1;
|
|
|
+// }
|
|
|
if(materialNum == 1){
|
|
|
//单拼进入链表
|
|
|
//判断单拼链表中是否有已存在此辆车正在排队
|
