From 2330cde874d1c4ca6763fd9fc1590fc313751df3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 09 九月 2025 08:53:36 +0800
Subject: [PATCH] #erp.生产收料通知单页面查询完成
---
src/main/java/com/zy/asrs/controller/ICMOController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ICMOController.java b/src/main/java/com/zy/asrs/controller/ICMOController.java
index ff58840..272a526 100644
--- a/src/main/java/com/zy/asrs/controller/ICMOController.java
+++ b/src/main/java/com/zy/asrs/controller/ICMOController.java
@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import com.zy.asrs.entity.Department;
import com.zy.asrs.entity.ICMO;
+import com.zy.asrs.service.DepartmentService;
import com.zy.asrs.service.ICMOService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -20,12 +22,16 @@
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class ICMOController extends BaseController {
@Autowired
private ICMOService iCMOService;
+
+ @Autowired
+ private DepartmentService departmentService;
@RequestMapping(value = "/iCMO/{id}/auth")
@ManagerAuth
@@ -44,11 +50,22 @@
if (!Cools.isEmpty(param.get("FPlanCommitDate"))){
param.put("FPlanCommitDate", ERPDateUtils.getERPFiltterDate(param.get("FPlanCommitDate").toString()));
}
+ String fWorkShop = null;
+ if (!Cools.isEmpty(param.get("FWorkShop"))){
+ fWorkShop = param.get("FWorkShop").toString();
+ param.remove("FWorkShop");
+ }
EntityWrapper<ICMO> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(ICMO.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.eq("FStatus",1);
+ if (!Cools.isEmpty(fWorkShop)){
+ List<Department> departments = departmentService.selectList(new EntityWrapper<Department>().eq("FParentID", fWorkShop));
+ List<Integer> ids = departments.stream().map(Department::getFItemID).collect(Collectors.toList());
+ wrapper.in("FWorkShop",ids);
+ }
return R.ok(iCMOService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1