From 5f1edfec21b921ec885b40b0a86c7ffe4aa5a7de Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 11:52:06 +0800
Subject: [PATCH] 齐套性检查排除已检查过且齐套的物料
---
src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java
index 1835695..c6025eb 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java
@@ -1,5 +1,9 @@
package org.jeecg.modules.mes.service.impl;
+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.mes.entity.MesKittingCompletenessCheck;
@@ -8,9 +12,11 @@
import org.jeecg.modules.mes.service.IMesKittingCompletenessCheckService;
import org.jeecg.modules.mes.service.IMesProductionWorkOrderService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
/**
* @Description: 榻愬鎬ф鏌ヨ褰�
@@ -22,6 +28,7 @@
public class MesKittingCompletenessCheckServiceImpl extends ServiceImpl<MesKittingCompletenessCheckMapper, MesKittingCompletenessCheck> implements IMesKittingCompletenessCheckService {
@Autowired
+ @Lazy
private IMesProductionWorkOrderService mesProductionWorkOrderService;
@Override
@@ -44,4 +51,31 @@
//淇濆瓨榻愬妫�鏌ヨ褰�
saveBatch(mesKittingCompletenessCheckList);
}
+
+ @Override
+ public IPage<MesKittingCompletenessCheck> queryPageList(Page<MesKittingCompletenessCheck> page, Map<String, String[]> parameterMap) {
+ QueryWrapper<MesKittingCompletenessCheck> queryWrapper = Wrappers.query();
+ String[] factoryIds = parameterMap.get("factoryId");
+ if (factoryIds != null && factoryIds.length > 0) {
+ queryWrapper.eq("t2.factory_id", factoryIds[0]);
+ }
+ String[] workOrderIds = parameterMap.get("workOrderId");
+ if (workOrderIds != null && workOrderIds.length > 0) {
+ queryWrapper.eq("t1.work_order_id", workOrderIds[0]);
+ }
+ String[] materialNumbers = parameterMap.get("materialNumber");
+ if (materialNumbers != null && materialNumbers.length > 0) {
+ queryWrapper.like("t1.material_number", materialNumbers[0]);
+ }
+ String[] materialNames = parameterMap.get("materialName");
+ if (materialNames != null && materialNames.length > 0) {
+ queryWrapper.like("t1.material_name", materialNames[0]);
+ }
+ String[] checkFlags = parameterMap.get("checkFlag");
+ if (checkFlags != null && checkFlags.length > 0) {
+ queryWrapper.eq("t1.check_flag", checkFlags[0]);
+ }
+ queryWrapper.orderByDesc("t1.create_time");
+ return this.baseMapper.queryPageList(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3