From d5420a8fef6d680e5bdce86b36cb8e90d7e22419 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期六, 16 八月 2025 09:49:25 +0800
Subject: [PATCH] 安灯发起-工单-飞书发送消息（一级响应/二级响应/三级响应) 飞书安灯消息模板相关代码
---
src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java b/src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java
index 876678d..dfc6bee 100644
--- a/src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java
@@ -2,10 +2,11 @@
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.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsMaterialProcess;
import org.jeecg.modules.pms.mapper.PmsMaterialProcessMapper;
@@ -14,8 +15,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -30,25 +29,6 @@
public class PmsMaterialProcessServiceImpl extends ServiceImpl<PmsMaterialProcessMapper, PmsMaterialProcess> implements IPmsMaterialProcessService {
@Override
- public IPage<Map<String, Object>> getpmsMaterialProcessListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
- IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
- Map<String, String> paramMap = new HashMap<String, String>();
- Map<String, String[]> parameterMap = req.getParameterMap();
- if (null != parameterMap) {
- if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
- paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
- }
- if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
- paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
- }
- if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
- paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
- }
- }
- return super.getBaseMapper().getpmsMaterialProcessListData(pageData, paramMap);
- }
-
- @Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateOrderProcess(Map<String, MesProductionOrder> orderMap, List<OrderProcessDTO> orderProcessDTOList) {
for (Map.Entry<String, MesProductionOrder> entry : orderMap.entrySet()) {
@@ -58,7 +38,7 @@
//閲嶆柊鏂板宸ュ簭淇℃伅
List<OrderProcessDTO> collect = orderProcessDTOList.stream().filter(orderProcessDTO -> entry.getKey().equals(orderProcessDTO.getAUFNR())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(collect)) {
- List<PmsMaterialProcess> list = collect.stream().map(orderBomDTO -> new PmsMaterialProcess(entry.getKey(), order.getMaterialName(), orderBomDTO)).collect(Collectors.toList());
+ List<PmsMaterialProcess> list = collect.stream().map(orderBomDTO -> new PmsMaterialProcess(order.getId(), order.getMaterialName(), orderBomDTO)).collect(Collectors.toList());
super.saveBatch(list);
}
}
@@ -72,4 +52,29 @@
queryWrapper.eq(PmsMaterialProcess::getOrderId, orderId);
super.remove(queryWrapper);
}
+
+ @Override
+ public IPage<PmsMaterialProcess> queryPageList(Page<PmsMaterialProcess> page, PmsMaterialProcess query) {
+ QueryWrapper<PmsMaterialProcess> queryWrapper = new QueryWrapper<>();
+ queryWrapper.orderByDesc("pbm.create_time");
+ if (query != null) {
+ //鐗╂枡缂栫爜 妯＄硦鏌ヨ
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getMaterialNumber())) {
+ queryWrapper.like("pbm.material_number", query.getMaterialNumber());
+ }
+ //鐗╂枡鍚嶇О 妯＄硦鏌ヨ
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getMaterialName())) {
+ queryWrapper.like("pbm.material_name", query.getMaterialName());
+ }
+ //宸ュ簭鍙� 妯＄硦鏌ヨ
+ if (StringUtils.isNotBlank(query.getProcessCode())) {
+ queryWrapper.like("pbm.process_code", query.getProcessCode());
+ }
+ //璁㈠崟鍙� 妯＄硦鏌ヨ
+ if (StringUtils.isNotBlank(query.getOrderCode())) {
+ queryWrapper.like("po.order_code", query.getOrderCode());
+ }
+ }
+ return this.getBaseMapper().queryPageList(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3