问题处理

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -127,7 +127,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                     .eq("wo", WorkOrder::getIsCustomized, 0)
             );
             //过滤调需要人工干预生产数量的工单
-            wrapper.isNotNull("wo.productionQuantity");
+            wrapper.isNotNull("wo.production_quantity");
         }
 
         //是否定制
@@ -271,7 +271,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         List<WorkOrderVo> records = page.getRecords();
         for (WorkOrderVo workOrderVo : records) {
             //赋值已计划数量
-            workOrderVo.setArrangedQuantity(workOrderVo.getQuantity().subtract(workOrderVo.getRemainingQuantity()));
+            workOrderVo.setArrangedQuantity(workOrderVo.getProductionQuantity().subtract(workOrderVo.getRemainingQuantity()));
             //赋值完成率
             long count = 0;
             //获取工单下的所有计划
@@ -287,7 +287,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                                     .eq(ProductionTaskDetail::getFinishStatus, 1));
                 }
             }
-            BigDecimal divide = BigDecimal.valueOf(count).divide(workOrderVo.getQuantity(), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+            BigDecimal divide = BigDecimal.valueOf(count).divide(workOrderVo.getProductionQuantity(), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
             workOrderVo.setCompletionRate(divide);
         }
         return page;

hx-mes/src/main/resources/mapper/work/WorkOrderMapper.xml

@@ -17,9 +17,10 @@
                      wo.is_customized,
                      sc.`code`                                 AS contractCode,
                      sc.create_time                            AS contractCreateTime,
-                     wo.quantity - ifnull(sum(pp.quantity), 0) AS remainingQuantity,
+                     wo.production_quantity - ifnull(sum(pp.quantity), 0) AS remainingQuantity,
                      wo.bom_status,
-                     wo.technology_status
+                     wo.technology_status,
+                     wo.production_quantity
               FROM work_order wo
                        LEFT JOIN bytesailing_jxst.sales_contract sc ON wo.source_id = sc.id
                        LEFT JOIN production_plan pp ON pp.work_order_id = wo.id