提交修改

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

@@ -208,7 +208,12 @@ public class QmsQueueResultController extends BaseRESTfulController {
         return success(qmsQueueResultService.isInCircle(longitude,latitude,capacityNo));
     }
 
-
+    @ApiOperation(value="查询仓库排队列表")
+    @PostMapping("/getStoreQueueList")
+    public RESTfulResult getStoreQueueList(){
+        List<Map<String, Object>> storeQueueList = qmsQueueResultService.getStoreQueueList();
+        return success(storeQueueList);
+    }
 
 
 

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

@@ -151,4 +151,6 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     List<Map<String, Object>> getQueueListByQueueUpSpelling(Map<String, Object> map);
 
     List<Map<String,Object>> getMaterialId(BigDecimal orderId);
+
+    List<Map<String,Object>> getStoreQueueList();
 }

src/main/java/com/steerinfo/dil/service/IQmsQueueResultService.java

@@ -38,6 +38,8 @@ public interface IQmsQueueResultService{
 
     boolean isInCircle(String longitude, String latitude, String CapacityNo);
 
+    List<Map<String, Object>> getStoreQueueList();
+
 
     //通过实绩Id查询排队取消实绩
 //    List<Map<String, Object>> getQueueCancelByResultId(Integer resultId);

src/main/java/com/steerinfo/dil/service/impl/QmsQueueResultServiceImpl.java

@@ -255,7 +255,10 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         }
         return s;
     }
-
+    @Override
+    public List<Map<String, Object>> getStoreQueueList(){
+        return qmsQueueResultMapper.getStoreQueueList();
+    }
     /**
      * 新增仓库排队实绩
      * @param map orderNumber运输订单号  loadingId 装车点

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

@@ -2193,5 +2193,13 @@
         where QQR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
 
-
+    <select id="getStoreQueueList" resultType="java.util.Map">
+        select o2.material_priority "materialPriority",rw.WAREHOUSE_NAME "warehouseName",count(1) "carQueue"  from Omstruck_Order o1
+        left join Omstruck_Order_Material o2 on o1.order_id=o2.order_id
+        left join rms_warehouse rw on rw.warehouse_id=o2.material_priority
+        left join tmstruck_total_result ttr on ttr.order_id=o1.order_id
+        left join tmstruck_enfactory_result ter on ter.result_total_id=ttr.result_total_id
+        where o1.order_status=5 and o1.order_type=1 and ter.result_entry_gate_time is null and rw.WAREHOUSE_NAME is not null
+        group by o2.material_priority,rw.WAREHOUSE_NAME
+    </select>
 </mapper>