From 5ba99b525e1d351f6a99e40dab27838450dae338 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期四, 24 四月 2025 11:00:12 +0800
Subject: [PATCH] 【UPDATE】1.修改工单实体新增“作业（工序名称）”属性 2.修改工序实体新增“工作中心”属性 3.修改对应零件和钣金实体 4.修改mapping.xml字段
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
index dcaec74..a46d13c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
@@ -189,8 +189,9 @@
if (!processNames.isEmpty()) {
// 鏍规嵁宸ュ簭鍚嶇О锛屾煡璇㈣宸ュ崟涓嬫墍鏈夌殑宸ュ簭淇℃伅
List<ApsPlateProcessStat> processStats = statList.stream()
- .filter(x -> processNames.contains(x.getProcessName()) && x.getWorkOrderNo().equals(plan.getDocumentNumber()))
- .toList();
+ .filter(x -> processNames.contains(x.getProcessName()) && x.getWorkOrderNo().equals(plan.getDocumentNumber())
+ &&x.getProcessPlanStartDay()!=null&&x.getProcessPlanEndDay()!=null
+ ).toList();
if (!processStats.isEmpty()) {
// 鍙栧嚭宸ュ崟涓嬪伐搴忕殑鏈�灏忓紑濮嬫椂闂村拰鏈�澶х粨鏉熸椂闂�
List<Date> startDayList = processStats.stream().map(ApsPlateProcessStat::getProcessPlanStartDay).filter(Objects::nonNull).toList();
@@ -272,7 +273,6 @@
return shopPlanStat;
})
.toList();
-
// 鏋勫缓杩斿洖缁撴灉
AjaxResult success = AjaxResult.success(shopPlanStats);
success.put("shopNames", shopList);
--
Gitblit v1.9.3