提交代码

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

@@ -185,4 +185,12 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
      * @Description:复刻出厂数
     */
     List<Map<String, Object>>   getCapacityByDefend(Map<String, Object> map);
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-10-28
+     * @Description:复刻进厂数
+    */
+    int getSteelOrderNum();
 }

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

@@ -447,7 +447,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @Date:
      * @Description:做一个定时任务向两块大屏赋予值
      */
-    @Scheduled(cron = "0 */10 * * * ?")
+    @Scheduled(cron = "0 */5 * * * ?")
     public void sendDataToLargeCreen(){
         Map<String,Object> mapValue=new HashMap<>();
         List<Map<String, Object>> datalist =new ArrayList<>();

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.controller.QmsQueueResultController;
 import com.steerinfo.dil.feign.AmsFeign;
-import com.steerinfo.dil.feign.DaZhouFeign;
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.feign.LargeScreenFeign;
 import com.steerinfo.dil.mapper.QmsQueueListMapper;
@@ -64,9 +63,6 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
     @Autowired
     AmsFeign amsFeign;
 
-    @Autowired
-    DaZhouFeign daZhouFeign;
-
     @Autowired
     private QueueInterfaceMapper queueInterfaceMapper;
 
@@ -257,12 +253,25 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             map1.put("entity",date);
             RESTfulResult haveCarTruckNoList = amsFeign.getHaveCarTruckNoList(map1, 466, null, null, null, null, null);
             Map<String,Object> data = (Map<String, Object>) haveCarTruckNoList.getData();
-            int SentCarNumber = (int) data.get("total");
+            List<Map<String,Object>> data1 = (List<Map<String, Object>>) data.get("list");
+            int SentCarNumber=0;
+            try {
+                for (int i=0;i<data1.size();i++){
+                    for (int j=i+1;j<data1.size();j++){
+                        if (data1.get(i).get("capacityNumber").equals(data1.get(j).get("capacityNumber"))){
+                            data1.remove(j);
+                            j--;
+                        }
+                    }
+                }
+                SentCarNumber=data1.size();
+            }catch (Exception e){
+                e.printStackTrace();
+            }
             //int SentCarNumber = qmsQueueResultMapper.querySentCarNumber();
-            //查询出销售钢材的进厂数
-            RESTfulResult steelOrderNum = daZhouFeign.getSteelOrderNum();
-            int IntoFactoryNumber= (int) steelOrderNum.getData();
             //int IntoFactoryNumber=qmsQueueResultMapper.queryIntoFactoryNumber();
+            //查询出销售钢材的进厂数(由于呼叫进厂页面的数据不止)
+            int IntoFactoryNumber = qmsQueueResultMapper.getSteelOrderNum();
             //查询出销售钢材的出厂数
             //先把时间格式化
             SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -275,7 +284,7 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             map.put("sentCarNumber",SentCarNumber);
             map.put("intoFactoryNumber",IntoFactoryNumber);
             map.put("leaveFactoryNumber",LeaveFactoryNumber);
-            map.put("waitIntoFactoryNumber",SentCarNumber-IntoFactoryNumber);
+            map.put("waitIntoFactoryNumber",SentCarNumber-IntoFactoryNumber-LeaveFactoryNumber);
         }catch (Exception e){
             e.printStackTrace();
         }

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

@@ -956,6 +956,20 @@
        and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
     </select>
 
+    <select id="getSteelOrderNum" resultType="java.lang.Integer">
+        SELECT
+            COUNT( * )
+        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
+        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>
+
     <select id="getCapacityByDefend" resultType="java.util.Map" parameterType="java.util.Map">
         select distinct * from(
         select rc.CAPACITY_NUMBER "capacityNumber",
@@ -1068,7 +1082,7 @@
                 ORDER BY  QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP,  "listNodeOrder"
             </if>
             <if test="locationId == null">
-                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME,QQL.IS_VIP, "listNodeOrder"
+                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME,QQSL.IS_VIP, "listNodeOrder"
             </if>
     </select>