|
@@ -120,9 +120,8 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
}
|
|
|
wrapper.eq("wo", WorkOrder::getSource, dto.getSource());
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- if (ObjectUtil.isNotEmpty(dto.getIsHandle())) {
|
|
|
+
|
|
|
+ if (Objects.equals(dto.getIsRemaining(), 1)) {
|
|
|
|
|
|
wrapper.eq("wo", WorkOrder::getResearchStatus, 1);
|
|
|
|
|
@@ -136,25 +135,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
|
|
|
wrapper.isNotNull("wo.production_quantity");
|
|
|
wrapper.ne("wo.production_quantity", "");
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- if (Objects.equals(dto.getIsRemaining(), 1)) {
|
|
|
-
|
|
|
- wrapper.eq("wo", WorkOrder::getResearchStatus, 1);
|
|
|
|
|
|
+
|
|
|
wrapper.gt("wo.remainingQuantity", 0);
|
|
|
-
|
|
|
- wrapper.and(q -> q
|
|
|
- .and(q1 -> q1
|
|
|
- .eq("wo", WorkOrder::getIsCustomized, 1)
|
|
|
- .eq("wo", WorkOrder::getBomStatus, 1)
|
|
|
- .eq("wo", WorkOrder::getTechnologyStatus, 1)
|
|
|
- ).or()
|
|
|
- .eq("wo", WorkOrder::getIsCustomized, 0)
|
|
|
- );
|
|
|
-
|
|
|
- wrapper.isNotNull("wo.production_quantity");
|
|
|
}
|
|
|
|
|
|
|