修改产线大屏产线查询逻辑

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java

@@ -120,4 +120,6 @@ public interface MesMapper {
 
 
     Map getProductionNumberPLC(BoardDTO mesBoard);
+
+    List<String> getproductLineList();
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java

@@ -55,6 +55,15 @@ public class MesBoradServiceImpl implements IMesBoradService {
         try {
             boardDTO.setEquipmentTypeCode("equ_type_bzx");
             List<BoardDTO> lineList = mesMapper.getLineList(boardDTO);
+            if (boardDTO.getIsqua()!=null){
+                //查询当天生产的产线
+                List<String> productLineList = mesMapper.getproductLineList();
+                // 使用Stream过滤lineList，只保留equCode在productLineList中的数据
+                lineList = lineList.stream()
+                        .filter(item -> productLineList.contains(item.getEquCode()))
+                        .collect(Collectors.toList());
+            }
+
             return lineList;
         }finally {
             DynamicDataSourceContextHolder.poll();
@@ -65,6 +74,7 @@ public class MesBoradServiceImpl implements IMesBoradService {
     @Override
     public BoardDTO getProduction15Days(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
+        try {
             BoardDTO dto = new BoardDTO();
 
             String nowDate = DateUtils.getDate();
@@ -109,11 +119,16 @@ public class MesBoradServiceImpl implements IMesBoradService {
             dto.setPlans(plans);
             dto.setActs(acts);
             return dto;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override
     public Map<String,BoardDTO> getProductionLineInfo(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
+        try {
             Map<String,BoardDTO> dtoMap = new HashMap<>();
             //当前工单信息
             BoardDTO workOrder = mesMapper.getWorkOrder(boardDTO);
@@ -183,39 +198,56 @@ public class MesBoradServiceImpl implements IMesBoradService {
             dtoMap.put("piedata",task4);//巡检结果
 
             return dtoMap;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override
     public List<ProOrderWorkorder> getPorOrderList(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
+        try{
             List<ProOrderWorkorder> dtos = mesMapper.getPorOrderList(boardDTO);
             return dtos;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
 
     @Override
     public List<BoardDTO> getHFProInfo(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
+        try {
             List<BoardDTO> dtos = mesMapper.getHFProInfo(boardDTO);
             return dtos;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
 
     @Override
     public List<BoardDTO> getHFQcInfo(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
+        try {
             List<BoardDTO> dtos = mesMapper.getHFQcInfo(boardDTO);
-//        if(!CollectionUtils.isEmpty(dtos)){
-//            //不合格
-//            List<BoardDTO> isquas = dtos.stream().filter(a -> a.getIsqua().equals("0")).collect(Collectors.toList());
-//            dtos.get(0).setTaskNum(isquas.size()+"");
-//        }
             return dtos;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override
     public List<BoardDTO> getHFxlInfo(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
+        try {
             List<BoardDTO> dtos = mesMapper.getHFxlInfo(boardDTO);
             return dtos;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
 
@@ -240,24 +272,12 @@ public class MesBoradServiceImpl implements IMesBoradService {
     @Override
     public Map getProductionNumberPLC(BoardDTO mesBoard) {
         DynamicDataSourceContextHolder.push(mesBoard.getFactoryCode());
+        try {
             Map mapList = mesMapper.getProductionNumberPLC(mesBoard);
             return mapList;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
 
-    public static void main(String[] args){
-        List<String> days = new ArrayList<>();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-        Calendar cal = Calendar.getInstance();
-        //获取前面的时间用-负号
-        Date date = new Date();
-        for(int num=0;num<15;num++){
-            cal.setTime(date);
-            cal.add(Calendar.DAY_OF_MONTH, -num);
-            days.add(sdf.format(cal.getTime()));
-        }
-        Collections.reverse(days);
-
-        System.out.println(JSONObject.toJSONString(days));
-    }
 }

op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml

@@ -387,7 +387,7 @@
                   and del_flag = '0'
                 group by workorder_code,batch
             )t on t0.workorderCode = t.workorder_code and t0.batchCode = t.batch
-        order by t0.batchCode
+        order by t0.workorderCodeSap ASC,t0.batchCode
     </select>
     <select id="getHFProInfo" resultType="com.op.system.api.domain.dto.BoardDTO">
         select t.*,isnull(be.unit_working_hours,0) unitPro from
@@ -543,6 +543,14 @@
             line_code =#{ equCode }
             AND workorder_code =#{ workorderCode}
     </select>
+    <select id="getproductLineList" resultType="java.lang.String">
+        SELECT DISTINCT
+            workorder_name
+        FROM
+            pro_order_workorder
+        WHERE
+            product_date = CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 )
+    </select>
 
 
 </mapper>