From a9f55fb1ab24f43fee70b16e1a8c58a33fc59fa6 Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期二, 13 五月 2025 18:12:14 +0800 Subject: [PATCH] 钣金工单计划管理:新增 查看上下阶需求接口 --- aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 50 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java index defb7ec..6fda182 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java @@ -1,33 +1,37 @@ package com.aps.core.service.impl; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - - +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.aps.common.core.utils.DateUtils; import com.aps.common.core.utils.uuid.IdUtils; import com.aps.common.security.utils.DictUtils; +import com.aps.core.domain.ApsMaterialStorageManagement; +import com.aps.core.domain.ApsPlatePlan; import com.aps.core.domain.ApsPlatePlanTemp; +import com.aps.core.domain.ApsPlateStandardRequire; import com.aps.core.mapper.ApsPartPlanTempMapper; +import com.aps.core.mapper.ApsPlatePlanMapper; import com.aps.core.mapper.ApsPlatePlanTempMapper; +import com.aps.core.service.IApsPlatePlanService; import com.aps.system.api.domain.SysDictData; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import com.aps.core.mapper.ApsPlatePlanMapper; -import com.aps.core.domain.ApsPlatePlan; -import com.aps.core.service.IApsPlatePlanService; + +import java.util.List; +import java.util.Optional; /** * 閽i噾璁″垝绠$悊Service涓氬姟灞傚鐞� - * + * * @author ruoyi * @date 2025-04-08 */ @Service -public class ApsPlatePlanServiceImpl implements IApsPlatePlanService +public class ApsPlatePlanServiceImpl implements IApsPlatePlanService { @Autowired private ApsPlatePlanMapper apsPlatePlanMapper; @@ -39,7 +43,7 @@ /** * 鏌ヨ閽i噾璁″垝绠$悊 - * + * * @param id 閽i噾璁″垝绠$悊涓婚敭 * @return 閽i噾璁″垝绠$悊 */ @@ -51,7 +55,7 @@ /** * 鏌ヨ閽i噾璁″垝绠$悊鍒楄〃 - * + * * @param apsPlatePlan 閽i噾璁″垝绠$悊 * @return 閽i噾璁″垝绠$悊 */ @@ -63,21 +67,21 @@ /** * 鏂板閽i噾璁″垝绠$悊 - * + * * @param apsPlatePlan 閽i噾璁″垝绠$悊 * @return 缁撴灉 */ @Override public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan) { - apsPlatePlan.setId(IdUtils.fastUUID()); + apsPlatePlan.setId(IdUtil.getSnowflakeNextId()); apsPlatePlan.setCreateTime(DateUtils.getNowDate()); return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan); } /** * 淇敼閽i噾璁″垝绠$悊 - * + * * @param apsPlatePlan 閽i噾璁″垝绠$悊 * @return 缁撴灉 */ @@ -89,7 +93,7 @@ /** * 鎵归噺鍒犻櫎閽i噾璁″垝绠$悊 - * + * * @param ids 闇�瑕佸垹闄ょ殑閽i噾璁″垝绠$悊涓婚敭 * @return 缁撴灉 */ @@ -101,7 +105,7 @@ /** * 鍒犻櫎閽i噾璁″垝绠$悊淇℃伅 - * + * * @param id 閽i噾璁″垝绠$悊涓婚敭 * @return 缁撴灉 */ @@ -124,7 +128,7 @@ ids[i]=apsPartPlanTemps.get(i).getId(); ApsPlatePlan platePlan=new ApsPlatePlan(); BeanUtils.copyProperties(apsPartPlanTemps.get(i), platePlan); - platePlan.setId(IdUtils.fastUUID()); + platePlan.setId(IdUtil.getSnowflakeNextId()); platePlan.setCreateTime(DateUtils.getNowDate()); //鎻掑叆姝e紡琛紝骞惰褰� apsPlatePlanMapper.insertApsPlatePlan(platePlan); @@ -183,4 +187,14 @@ return Strings.EMPTY; } } + + /** + * 閽i噾鍐椾綑宸ュ崟鎶ヨ〃 + * @param apsPlatePlan + * @return + */ + @Override + public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan) { + return apsPlatePlanMapper.selectPlateRedundantOrderList(apsPlatePlan); + } } -- Gitblit v1.9.3