From 3ca99a04cff5dc72a8f1a4b4448ca592f915237f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期六, 09 八月 2025 17:47:28 +0800
Subject: [PATCH] 生产管控 排产功能接口调整
---
src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
index 51adc5b..407a954 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
@@ -2,6 +2,10 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.base.entity.Factory;
@@ -99,4 +103,28 @@
}
return newProductionWorkOrderList;
}
+
+ @Override
+ public IPage<MesProductionWorkOrder> queryPageList(Page<MesProductionWorkOrder> page, Map<String, String[]> parameterMap) {
+ QueryWrapper<MesProductionWorkOrder> queryWrapper = Wrappers.query();
+ String[] factoryIds = parameterMap.get("factoryId");
+ if (factoryIds != null && factoryIds.length > 0) {
+ queryWrapper.eq("t1.factory_id", factoryIds[0]);
+ }
+ String[] startDates = parameterMap.get("startDate");
+ String[] endDates = parameterMap.get("endDate");
+ if (startDates != null && startDates.length > 0) {
+ queryWrapper.ge("t1.work_order_date", startDates[0]);
+ }
+ if (endDates != null && endDates.length > 0) {
+ queryWrapper.le("t1.work_order_date", endDates[0]);
+ }
+ String[] workOrderStatuses = parameterMap.get("workOrderStatus");
+ if (workOrderStatuses != null && workOrderStatuses.length > 0) {
+ queryWrapper.eq("t1.work_order_status", workOrderStatuses[0]);
+ }
+ queryWrapper.eq("t1.del_flag", CommonConstant.DEL_FLAG_0);
+ queryWrapper.orderByAsc("t1.work_order_date");
+ return this.baseMapper.queryPageList(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3