From 1b6411703f22944eb0802d5e396c1a91fed19867 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 13:07:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java | 6 +++---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java | 24 +++++++++++++++++++-----
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
index dbcc902..7f3de63 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
@@ -132,9 +132,9 @@
@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
@PostMapping("/confirmData")
public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
-// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-// LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
- apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
+ apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
return AjaxResult.success("纭鎴愬姛锛�");
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java
index 22e9289..f99ba88 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java
@@ -112,11 +112,25 @@
ids[i]= apsProcessRouteTemps.get(i).getId();
ApsProcessRoute apsProcessRoute =new ApsProcessRoute();
BeanUtils.copyProperties(apsProcessRouteTemps.get(i), apsProcessRoute);
- apsProcessRoute.setId(IdUtils.fastUUID());
- //鎻掑叆姝ｅ紡琛紝骞惰褰�
- apsProcessRoute.setCreateTime(DateUtils.getNowDate());
- apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
- apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
+ ApsProcessRoute apsProcessRoutetmp =new ApsProcessRoute();
+ apsProcessRoutetmp.setWorkOrderNo(apsProcessRoute.getWorkOrderNo());
+ apsProcessRoutetmp.setProcessNumber(apsProcessRoute.getProcessNumber());
+ List<ApsProcessRoute> apsProcessRoutes =apsProcessRouteMapper.selectApsProcessRouteList(apsProcessRoutetmp);
+ if(apsProcessRoutes.size()>0){
+ apsProcessRoute.setId(apsProcessRoutes.get(0).getId());
+ //鎻掑叆姝ｅ紡琛紝骞惰褰�
+ apsProcessRoute.setCreateTime(DateUtils.getNowDate());
+ apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
+ apsProcessRouteMapper.updateApsProcessRoute(apsProcessRoute);
+ }else {
+ apsProcessRoute.setId(IdUtils.fastUUID());
+ //鎻掑叆姝ｅ紡琛紝骞惰褰�
+ apsProcessRoute.setCreateTime(DateUtils.getNowDate());
+ apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
+ apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
+ }
+
+
count++;
}
//鎻掑叆鏁伴噺涓庝复鏃惰〃鏌ヨ涓�鐩村垯鍒犻櫎涓存椂琛ㄦ暟鎹�
--
Gitblit v1.9.3