车间问题处理

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskProgressServiceImpl.java

@@ -39,7 +39,7 @@ public class ProductionTaskProgressServiceImpl extends ServiceImpl<ProductionTas
     @Override
     public List<ProductionTaskProgressVo> workshopReportStatistics(ProductionTaskProgressSelectDto dto) {
         IWrapper<ProductionTaskProgress> wrapper = getWorkshopReportWrapper(dto);
-        wrapper.eq("DATEDIFF( now(), ps.scheduling_date )", 0);
+        wrapper.eq("DATEDIFF(  ps.scheduling_date,now() )", 0);
         wrapper.groupBy("ptp.processes_id");
         List<ProductionTaskProgressVo> workshopReportStatistics = baseMapper.workshopReportStatistics(wrapper);
         return workshopReportStatistics;
@@ -50,7 +50,7 @@ public class ProductionTaskProgressServiceImpl extends ServiceImpl<ProductionTas
         IWrapper<ProductionTaskProgress> wrapper = getWorkshopReportWrapper(dto);
 
         //过滤 昨天 今天 明天
-        wrapper.in("DATEDIFF( now(), ps.scheduling_date )", -1, 0, 1);
+        wrapper.in("DATEDIFF(ps.scheduling_date, now())", -1, 0, 1);
         wrapper.groupBy("ptp.id");
 
         Page<WorkshopReportBo> workshopReportBoPage = baseMapper.workshopReport(dto.getPage(), wrapper);

hx-mes/src/main/resources/mapper/production/ProductionTaskProgressMapper.xml

@@ -15,40 +15,40 @@
     </select>
     <select id="workshopReport" resultType="com.fjhx.mes.entity.production.bo.WorkshopReportBo">
         SELECT ptp.id,
-               pod.id                                                    AS task_id,
+               pod.id                                                       AS task_id,
                pod.produce_order_id,
-               pp.id                                                     AS progressId,
-               pp.`name`                                                 AS progressName,
-               po.`code`                                                 AS orderCode,
+               pp.id                                                        AS progressId,
+               pp.`name`                                                    AS progressName,
+               po.`code`                                                    AS orderCode,
                pod.product_id,
                pod.quantity,
                ptp.finish_quantity,
-               (pod.quantity - ptp.finish_quantity)                      AS residueQuantity,
+               (pod.quantity - ptp.finish_quantity)                         AS residueQuantity,
                IFNULL((SELECT sum(quantity)
                        FROM production_scheduling ps
                        WHERE ps.task_id = pod.id
                          AND ps.processes_id = ptp.processes_id
-                         AND DATEDIFF(now(), scheduling_date) = - 1), 0) as yesterdaySchedulingQuantity,
+                         AND DATEDIFF(ps.scheduling_date, now()) = - 1), 0) as yesterdaySchedulingQuantity,
                IFNULL((SELECT sum(finish_quantity)
                        FROM production_scheduling ps
                        WHERE ps.task_id = pod.id
                          AND ps.processes_id = ptp.processes_id
-                         AND DATEDIFF(now(), scheduling_date) = - 1), 0) as yesterdayFinishQuantity,
+                         AND DATEDIFF(ps.scheduling_date, now()) = - 1), 0) as yesterdayFinishQuantity,
                IFNULL((SELECT sum(quantity)
                        FROM production_scheduling ps
                        WHERE ps.task_id = pod.id
                          AND ps.processes_id = ptp.processes_id
-                         AND DATEDIFF(now(), scheduling_date) = 0), 0)   as todaySchedulingQuantity,
+                         AND DATEDIFF(ps.scheduling_date, now()) = 0), 0)   as todaySchedulingQuantity,
                IFNULL((SELECT sum(finish_quantity)
                        FROM production_scheduling ps
                        WHERE ps.task_id = pod.id
                          AND ps.processes_id = ptp.processes_id
-                         AND DATEDIFF(now(), scheduling_date) = 0), 0)   as todayFinishQuantity,
+                         AND DATEDIFF(ps.scheduling_date, now()) = 0), 0)   as todayFinishQuantity,
                IFNULL((SELECT sum(quantity)
                        FROM production_scheduling ps
                        WHERE ps.task_id = pod.id
                          AND ps.processes_id = ptp.processes_id
-                         AND DATEDIFF(now(), scheduling_date) = 1), 0)   as tomorrowSchedulingQuantity
+                         AND DATEDIFF(ps.scheduling_date, now()) = 1), 0)   as tomorrowSchedulingQuantity
         FROM production_task_progress ptp
                  LEFT JOIN production_processes pp ON ptp.processes_id = pp.id
                  LEFT JOIN production_order_detail pod ON ptp.task_id = pod.id