Merge remote-tracking branch 'origin/master'

src/main/java/com/steerinfo/dil/controller/QmsQueueListController.java

@@ -49,8 +49,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);
     }

src/main/java/com/steerinfo/dil/mapper/QmsModelUnrooledMapper.java

@@ -15,7 +15,7 @@ public interface QmsModelUnrooledMapper extends IBaseMapper<QmsModelUnrooled, Bi
     BigDecimal selectMaxId();
 
     //查询所有规格
-    List<String> getAllModel(Map<String,Object> map);
+    List<Map<String,Object>> getAllModel(Map<String,Object> map);
 
     //查询所有未轧规格
     List<Map<String, Object>> getAllModelUnrolled(Map<String, Object> map);

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){
             //单拼进入链表
             //判断单拼链表中是否有已存在此辆车正在排队

src/main/resources/com/steerinfo/dil/mapper/QmsModelUnrooledMapper.xml

@@ -135,9 +135,10 @@
   <select id="selectMaxId" resultType="java.math.BigDecimal">
     select SEQ_QMS_MODEL.nextval from dual
   </select>
-    <select id="getAllModel" resultType="java.lang.String">
+    <select id="getAllModel" resultType="java.util.Map">
     SELECT DISTINCT
-    MATERIAL_SPECIFICATION || MATERIAL_MODEL
+    MATERIAL_ID "materialId",
+    MATERIAL_NAME || MATERIAL_MODEL || '(' || MATERIAL_SPECIFICATION ||')' "materialName"
     from RMS_MATERIAL
     where MATERIAL_SPECIFICATION like 'Φ%'
     <if test="index !=null and index!=''.toString()">
@@ -145,12 +146,15 @@
     </if>
     </select>
   <select id="getAllModelUnrolled" resultType="java.util.Map">
-    select RESULT_ID "resultId",
-           SPECTIONS_MODEL "spectionsModel"
-    from QMS_MODEL_UNROOLED
+    select QMU.RESULT_ID "resultId",
+    RM.MATERIAL_ID "materialId",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_MODEL || '(' || RM.MATERIAL_SPECIFICATION ||')'		"spectionsModel"
+    from QMS_MODEL_UNROOLED QMU,RMS_MATERIAL RM
     <where>
+      RM.MATERIAL_ID||''=QMU.SPECTIONS_MODEL
       <if test="index !=null and index!=''.toString()">
-        MATERIAL_SPECIFICATION || MATERIAL_MODEL like CONCAT(CONCAT('%',#{index}),'%')
+      and  RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL like CONCAT(CONCAT('%',#{index}),'%')
       </if>
     </where>
   </select>

src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -891,6 +891,7 @@
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        AND RM.MATERIAL_ID||'' NOT IN (SELECT DISTINCT SPECTIONS_MODEL FROM QMS_MODEL_UNROOLED)
         <if test="capacityNumber != null">
             and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
         </if>
@@ -1003,6 +1004,14 @@
             LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
             where oo.ORDER_STATUS = 5
               AND ASO.SALE_ORDER_STATUS = 4
+              AND OO.ORDER_ID NOT IN (
+                    select OO.ORDER_ID
+                    from OMSTRUCK_ORDER OO
+                    left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
+                    left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
+                    where OO.ORDER_STATUS=5 and
+                    RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+                  )
             <if test="capacityNumber != null">
                 and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
             </if>