物料综合看板接口

mes/src/main/java/com/ximai/mes/kanban/service/KanbanMaterialService.java

@@ -63,7 +63,7 @@ public class KanbanMaterialService {
         if(basicRatio.getDenominator()!=null&&basicRatio.getDenominator().compareTo(BigDecimal.ZERO)!=0){
             rst.setStockInCompleteRatio(basicRatio.getNumerator().divide(basicRatio.getDenominator(), 3, BigDecimal.ROUND_DOWN).multiply(new BigDecimal("100")));
         }
-        List<MesDataDto.OrderInfoDto> orderInfoList = taskWorkunitMapper.selectTaskWorkUnitWithKanban(currMonth, nextMonth);
+        List<MesDataDto.OrderInfoDto> orderInfoList = taskWorkunitMapper.selectTaskWorkUnitWithKanban2(currMonth, nextMonth);
         rst.setOrderInfoList(orderInfoList);
         return rst;
     }

mes/src/main/java/com/ximai/mes/pro/mapper/task/ProTaskWorkunitMapper.java

@@ -217,7 +217,7 @@ public interface ProTaskWorkunitMapper extends BaseMapper<ProTaskWorkunit> {
 
     void deleteByTaskIds(@Param("taskIds")List<Long> taskIds);
     /**
-     * 物料综合看板专用
+     * 物料综合看板专用生产入库计划
      * @param startDate 开始时间
      * @param endDate 结束时间
      * @return
@@ -228,7 +228,7 @@ public interface ProTaskWorkunitMapper extends BaseMapper<ProTaskWorkunit> {
             "left join pro_workorder wo on wo.workorder_id = tw.workorder_id\n" +
             "where t1.schedule_end_date > #{startDate} and t1.schedule_end_date < #{endDate} \n" +
             "and t2.is_last_process = 1 group by t2.arrange_code,wo.product_name")
-    List<MesDataDto.OrderInfoDto> selectTaskWorkUnitWithKanban(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
+    List<MesDataDto.OrderInfoDto> selectTaskWorkUnitWithKanban2(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
 
     /**
      * 物料综合看板入库完成率