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

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

@@ -188,6 +188,15 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     */
     List<Map<String, Object>>   getCapacityByDefend(Map<String, Object> map);
 
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-10-27
+     * @Description:复刻进厂车
+     */
+    List<Map<String, Object>>  getCapacityNum();
+
+
     /**
      * @author:zyf
      * @version:1.0

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

@@ -460,14 +460,15 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         List<Map<String, Object>> datalist =new ArrayList<>();
         List<Map<String, Object>> queueListByQueueUp = qmsQueueResultService.getQueueListByQueueUp(mapValue);
         List<Map<String, Object>> queueListByQueueUpSpelling = qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue);
+        List<Map<String, Object>> queueListByQueueUpSpellingNew = qmsQueueResultService.getQueueListByQueueUpSpellingNew(mapValue);
         //求出所有的数据
         Map<String, Object> getnumber = qmsQueueResultService.getnumber();
         datalist.add(getnumber);
         HashSet<Map<String,Object>> set=new HashSet<>(queueListByQueueUpSpelling);
-        //queueListByQueueUp=queueListByQueueUp.stream().distinct().collect(Collectors.toList());
+        HashSet<Map<String,Object>> set1=new HashSet<>(queueListByQueueUpSpellingNew);
         datalist.addAll(queueListByQueueUp);
-        //queueListByQueueUpSpelling=queueListByQueueUpSpelling.stream().distinct().collect(Collectors.toList());
         datalist.addAll(set);
+        datalist.addAll(set1);
         System.out.println(datalist.toString());
         //更新大屏(钢材科与东门)
         try{

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

@@ -250,7 +250,7 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @version:1.0
      * @Date:2022-09-27
      * @Description:查询出来所有的数据
-    */
+     */
     public Map<String,Object> getnumber(){
         Map<String,Object> map=new HashMap<>();
         try{
@@ -259,14 +259,13 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             Date now=new Date();
             Calendar call=Calendar.getInstance();
             call.setTime(now);
-            call.set(Calendar.HOUR_OF_DAY,0);
+            call.set(Calendar.HOUR_OF_DAY,8);
             call.set(Calendar.MINUTE,0);
             call.set(Calendar.SECOND,0);
             call.set(Calendar.MILLISECOND,0);
             Date date=call.getTime();
             Map<String,Object> map1=new HashMap<>();
             map1.put("oneDate",date);
-            map1.put("entity",date);
             RESTfulResult haveCarTruckNoList = amsFeign.getHaveCarTruckNoList(map1, 466, null, null, null, null, null);
             Map<String,Object> data = (Map<String, Object>) haveCarTruckNoList.getData();
             List<Map<String,Object>> data1 = (List<Map<String, Object>>) data.get("list");
@@ -284,8 +283,6 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             }catch (Exception e){
                 e.printStackTrace();
             }
-            //int SentCarNumber = qmsQueueResultMapper.querySentCarNumber();
-            //int IntoFactoryNumber=qmsQueueResultMapper.queryIntoFactoryNumber();
             //查询出销售钢材的进厂数(由于呼叫进厂页面的数据不止)
             int IntoFactoryNumber = qmsQueueResultMapper.getSteelOrderNum();
             //查询出销售钢材的出厂数
@@ -295,8 +292,21 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             Map<String,Object> map2=new HashMap<>();
             map2.put("oneDate",format);
             List<Map<String, Object>> capacityByDefend = qmsQueueResultMapper.getCapacityByDefend(map2);
-            int LeaveFactoryNumber = capacityByDefend.size();
-            //int LeaveFactoryNumber=qmsQueueResultMapper.queryLeaveFactoryNumber();
+            int LeaveFactoryNumber=0;
+            try{
+                //获得进厂车
+                List<Map<String, Object>> capacityNum = qmsQueueResultMapper.getCapacityNum();
+                for (int i=0;i<capacityNum.size();i++){
+                    for (int j=0;j<capacityByDefend.size();j++){
+                        if (capacityNum.get(i).get("capacityNumber").equals(capacityByDefend.get(j).get("capacityNumber"))){
+                            capacityByDefend.remove(j);
+                        }
+                    }
+                }
+                LeaveFactoryNumber=capacityByDefend.size();
+            }catch (Exception e){
+                e.printStackTrace();
+            }
             map.put("sentCarNumber",SentCarNumber);
             map.put("intoFactoryNumber",IntoFactoryNumber);
             map.put("leaveFactoryNumber",LeaveFactoryNumber);

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

@@ -2394,4 +2394,21 @@
                 order by ter.RESULT_ENTRY_GATE_TIME desc
                 )
             </select>
+
+    <!--获得进厂车的号码-->
+    <select id="getCapacityNum" resultType="java.util.Map">
+        SELECT
+            RC.CAPACITY_NUMBER "capacityNumber"
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                LEFT JOIN RMS_CAPACITY RC
+                          ON RC.CAPACITY_ID=OO.CAPACITY_ID
+        WHERE
+            OO.ORDER_LINE_SEQUENCE >= 1
+          AND OO.ORDER_STATUS = 5
+          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+          AND OO.ORDER_TYPE = 1
+    </select>
 </mapper>