From 587aee0ab3223b1895eb41e99d9d083e38c87649 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Tue, 26 May 2026 10:51:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=9B=B6=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/dashboard/mapper/DsPartMapper.java | 2 ++ .../org/springblade/desk/dashboard/mapper/PartMapper.xml | 8 ++++++++ .../desk/dashboard/service/IDsPartService.java | 6 ++++++ .../desk/dashboard/service/impl/DsPartServiceImpl.java | 5 +++++ .../desk/dashboard/service/impl/DsTaskingServiceImpl.java | 6 ++++++ 5 files changed, 27 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartMapper.java index 6095ff0fc..bc767504e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartMapper.java @@ -153,4 +153,6 @@ public interface DsPartMapper extends BaseMapper { List selectDsPartSub(@Param("partCode") String partCode); List selectListPartByCodeLike(@Param("zPartCode") String zPartCode); + + List selectOldMesPartSubBySubCode(@Param("subCode") String subCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml index 6c0d4fe0e..dbb48505e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml @@ -405,6 +405,14 @@ AND STATUS = 1 ORDER BY PART_CODE + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java index c866e984c..fc07b66ca 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java @@ -303,4 +303,10 @@ public interface IDsPartService extends BaseService { */ List selectDsProcessProjectByCraftId(Long creatId,String processNo); + /** + * 根据子件号查询 + * @param subCode + * @return + */ + List selectOldMesPartSubBySubCode(String subCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index e7a716b32..a7fae8015 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -923,6 +923,11 @@ public class DsPartServiceImpl extends BaseServiceImpl selectOldMesPartSubBySubCode(String subCode) { + return dsPartMapper.selectOldMesPartSubBySubCode(subCode); + } + /** * 根据工艺获取工序ID列表(支持返工工艺和正常工艺) */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index e4722e975..bdd490a48 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -2186,6 +2186,12 @@ public class DsTaskingServiceImpl extends BaseServiceImpl dsPartSubList = partService.selectOldMesPartSubBySubCode(oldMesPartEntity.getPartCode()); + if(!CollectionUtils.isEmpty(dsPartSubList)){ + DsPartSub dsPartSub = dsPartSubList.get(0); + oldMesPartEntity.setSinTerType(dsPartSub.getSinTerType()); + } + boolean saved = partService.save(oldMesPartEntity); if (!saved) { log.error("零件新增失败:{}", oldMesPartEntity.getPartCode());