bug

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

@@ -655,8 +655,10 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                 new LinkedBlockingQueue<Runnable>());
         try {
             cxjList.forEach(cxj -> {
-                Runnable run = () -> changeTransferResultFunc(cxj);
+                if(cxj.getEquipmentCode().equals("C4")){
-                executorService.execute(run);
+                    Runnable run = () -> changeTransferResultFunc(cxj);
+                    executorService.execute(run);
+                }
             });
         } catch (Exception e) {
             logger.error("service == changeTransferResultTask == exception", e);

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

@@ -153,11 +153,11 @@ public class MesBoradServiceImpl implements IMesBoradService {
     public List<BoardDTO> getHFQcInfo(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
         List<BoardDTO> dtos = mesMapper.getHFQcInfo(boardDTO);
-        if(!CollectionUtils.isEmpty(dtos)){
+//        if(!CollectionUtils.isEmpty(dtos)){
-            //不合格
+//            //不合格
-            List<BoardDTO> isquas = dtos.stream().filter(a -> a.getIsqua().equals("0")).collect(Collectors.toList());
+//            List<BoardDTO> isquas = dtos.stream().filter(a -> a.getIsqua().equals("0")).collect(Collectors.toList());
-            dtos.get(0).setTaskNum(isquas.size()+"");
+//            dtos.get(0).setTaskNum(isquas.size()+"");
-        }
+//        }
         return dtos;
     }
 

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

@@ -397,6 +397,8 @@
                create_time createTime
         from qc_pro_check
         where CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+           and isqua = '0'
+           order by create_time desc
     </select>
     <select id="getHFxlInfo" resultType="com.op.system.api.domain.dto.BoardDTO">
         select t2.totalNum0,t1.* from
@@ -432,7 +434,7 @@
              select shift_code shiftId,min(change_time) startTime,work_date,device_code deviceCode
              from mes_changeshift_info
              where device_code = #{equipmentCode}
-               and work_date in (${ymd})
+               and CONVERT(varchar(10),change_time, 120) in (${ymd})
              group by shift_code,work_date,device_code
          ) t order by t.startTime
     </select>

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

@@ -266,14 +266,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			mrw.unit,
 			mrw.quantity,
 			mrw.quantity_feedback quantityFeedback,
-			bpa.iei,
+			ISNULL(bpa.iei, '0') iei,
-			bpa.man_standar manStandar,
+			ISNULL(bpa.man_standar, '0') manStandar,
 			mrw.use_man useMan,
 			mrw.work_time workTime
 		from mes_report_work mrw
 		left join pro_order_workorder ow on ow.workorder_code = mrw.workorder_code
 		left join base_team_t tm on mrw.team_code = tm.Team_Code
-		left join base_product_attached bpa on bpa.product_code = mrw.product_code
+		left join base_product_attached bpa on bpa.product_code = right(mrw.product_code,11)
 		where CONVERT(varchar(10),ow.product_date, 23) = CONVERT(varchar(10), #{productDateStr}, 23)
 		  and mrw.work_center = #{workCenter} and mrw.parent_order != '0'
          order by ow.workorder_code

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -403,8 +403,8 @@
 			qct.check_loc checkLoc,
 		    qct.remark
 		from qc_check_task qct
-		left join pro_order_workorder pow on pow.workorder_code = qct.order_no
+		left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0'
-		where qct.record_id = #{recordId} and pow.del_flag = '0'
+		where qct.record_id = #{recordId}
 	</select>
     <select id="getCkeckTaskXJList" resultType="com.op.quality.domain.QcCheckTaskIncome">
 		select