Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-QMS-API

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

@@ -2195,5 +2195,25 @@
         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_WEIGHT_RESULT twr ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+         AND O2.MATERIAL_ID = TWR.MATERIAL_ID
+        WHERE
+         o1.order_status = 5
+         AND o1.order_type = 1
+         AND TWR.RESULT_NET_WEIGHT IS NULL
+         AND rw.WAREHOUSE_NAME IS NOT NULL
+        GROUP BY
+         o2.material_priority,
+         rw.WAREHOUSE_NAME
+    </select>
 </mapper>