From f28d0612931d9de5f20ee773a7e75aa78f0e0c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Mon, 30 Mar 2026 16:22:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/desk/produce/mapper/DisTaskingMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml index 816fffb4..6a881b6b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml @@ -62,7 +62,7 @@ INNER JOIN MES_WORK_ORDER b ON a.WO_ID = b.ID INNER JOIN MES_YIELD_ORDER c ON b.yo_id = c.id LEFT JOIN BS_PROCESS_SET d ON a.PPS_ID = d.ID - LEFT JOIN BA_TEAM_SET e ON a.MAKE_TEAM = e.ID + LEFT JOIN BS_TEAM_SET e ON a.MAKE_TEAM = e.ID WHERE a.WO_ID = #{id} + + 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 47ed052d..18de1a05 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 @@ -286,5 +286,5 @@ public interface IDsPartService extends BaseService { * @param partVersion * @return */ - List getClassCake(String partCode,String roamNo,String partVersion); + List getClassCakeWork(String partCode,String roamNo,String partVersion); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java index 4f727183..dcea70e1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java @@ -97,4 +97,11 @@ public interface IDsProcessService extends BaseService { * @return */ List selectOldMesProcessByOldMesCraftId(Long oldMesCraftId); + + /** + * 根据工艺ID集合查询 + * @param craftIds + * @return + */ + List selectDsProcessByCraftIdList(List craftIds); } 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 7835442d..b9e0035d 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 @@ -100,6 +100,9 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsPartPage(IPage page, DsPartVO dsPart) { @@ -432,29 +435,31 @@ public class DsPartServiceImpl extends BaseServiceImpl partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); - List idList = partRelationEntityList.stream() - .map(DsPartRelationEntity::getChildPartId) - .collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(partRelationEntityList)){ + List idList = partRelationEntityList.stream() + .map(DsPartRelationEntity::getChildPartId) + .collect(Collectors.toList()); - List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); + List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); - List dsPartVOList = dsPartEntityList.stream() - .map(entity -> { - DsPartVO vo = new DsPartVO(); - BeanUtils.copyProperties(entity, vo); + List dsPartVOList = dsPartEntityList.stream() + .map(entity -> { + DsPartVO vo = new DsPartVO(); + BeanUtils.copyProperties(entity, vo); - if (vo.getUpdateUser() != null) { - String userName = userClient.userInfo(Func.toLong(vo.getUpdateUser())) - .getData() - .getUser() - .getName(); - vo.setUpdateUserStr(userName); - } - return vo; - }) - .collect(Collectors.toList()); + if (vo.getUpdateUser() != null) { + String userName = userClient.userInfo(Func.toLong(vo.getUpdateUser())) + .getData() + .getUser() + .getName(); + vo.setUpdateUserStr(userName); + } + return vo; + }) + .collect(Collectors.toList()); - dsPartSynthesisVO.setDsPartVOList(dsPartVOList); + dsPartSynthesisVO.setDsPartVOList(dsPartVOList); + } } dsPartSynthesisVO.setDsPartEntity(partEntity); @@ -718,12 +723,12 @@ public class DsPartServiceImpl extends BaseServiceImpl getPartSubList(String partCode, String partVersion) { //校验零件号 if(StringUtils.isEmpty(partCode)){ - throw new ServiceException("零件号不能为空"); + return null; } //查询零件是否存在 List dsPartEntityList = this.selectDsPartByPatCode(partCode); if(CollectionUtils.isEmpty(dsPartEntityList)){ - throw new ServiceException("零件不存在"); + return null; } //查询零件 @@ -742,7 +747,61 @@ public class DsPartServiceImpl extends BaseServiceImpl getClassCake(String partCode, String roamNo, String partVersion) { + public List getClassCakeWork(String partCode, String roamNo, String partVersion) { + + //校验零件号 + if(StringUtils.isEmpty(partCode)){ + return null; + } + + //查询零件是否存在 + List dsPartEntityList = this.selectDsPartByPatCode(partCode); + if(CollectionUtils.isEmpty(dsPartEntityList)){ + return null; + } + + //查询零件 + DsPartEntity partEntity = this.selectDsPartByPatCodeAndVersion(partCode, partVersion); + + //不是玻璃饼 + if(null == partEntity.getSinTerType()){ + return null; + } + + //校验是否是玻璃饼 + if (DsPartSub.SIN_TER_TYPE_BLB.intValue() == partEntity.getSinTerType()) { + List dsCraftEntityList = null; + if(!StringUtils.isEmpty(roamNo)){ + dsCraftEntityList = craftService.selectDsCraftByPartIdAndRoamNo(partEntity.getId(), roamNo); + }else { + dsCraftEntityList = craftService.listByPartId(partEntity.getId()); + } + + if(CollectionUtils.isEmpty(dsCraftEntityList)){ + return null; + } + List craftIds = dsCraftEntityList.stream() + .map(DsCraftEntity::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + //查询工序 + List processList = processService.selectDsProcessByCraftIdList(craftIds); + if(CollectionUtils.isEmpty(processList)){ + return null; + } + + List processIds = processList.stream() + .map(DsProcessEntity::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + //查询工装 + List processMoldToolEntityList = processMoldToolService.selectDsProcessMoldToolByProcessIds(processIds); + + return processMoldToolEntityList; + } + return null; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java index 37ca2a90..6e21aa07 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java @@ -165,4 +165,9 @@ public class DsProcessServiceImpl extends BaseServiceImpl selectDsProcessByCraftIdList(List craftIds) { + return processMapper.selectDsProcessByCraftIdList(craftIds); + } + } From 5480ff508f55c69ba143f39dc87ff0cc08d41c89 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 30 Mar 2026 17:12:47 +0800 Subject: [PATCH 4/4] RequestBody --- .../springblade/desk/order/feign/IApsOrderClient.java | 9 +++++---- .../erpdata/service/impl/ErpMesRbWoServiceImpl.java | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java index 2c7800f0..bc1200d9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java @@ -8,6 +8,7 @@ import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -43,14 +44,14 @@ public interface IApsOrderClient { String UP_DATE_MAX = API_PREFIX + "/upByDateMax"; @PostMapping(SYNC_PLAN_FROM_SAVE) - void saveList(List yieldOrderList); + void saveList(@RequestBody List yieldOrderList); @GetMapping(GET_CRAFT_LIST) List getDsCraftList(); @GetMapping(GET_PLAN_LIST) List getPlanList(); @GetMapping(GET_PART_LIST_BY_PARAM) - List getPartListByParam(List partCodeList); + List getPartListByParam(@RequestParam("partCodeList") List partCodeList); @GetMapping(GET_PART_LIST) List getPartList(); @GetMapping(UPDATE_BY_ID) @@ -69,7 +70,7 @@ public interface IApsOrderClient { @GetMapping(GET_CRAFT_CODE) List getDsCraftListByCode(@RequestParam("prtno") String prtno); @PostMapping(SAVE_ORDER_LIST) - void saveOrderList(List yieldOrderList); + void saveOrderList(@RequestBody List yieldOrderList); @GetMapping (UP_DATE_MAX) void upByDateMax(@RequestParam("max") String max,@RequestParam("code") String code); @@ -83,5 +84,5 @@ public interface IApsOrderClient { * @param yieldOrderList */ @PostMapping(SAVE_ORDER) - void saveOrder(List yieldOrderList); + void saveOrder(@RequestBody List yieldOrderList); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index 3b412001..6e9a3904 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -566,6 +566,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { // } yieldOrderList.add(yieldOrder); }); + log.info("qyl:同步工艺工单 data: {}", gson.toJson(yieldOrderList)); //调用通用保存方法，保存生产订单 // this.saveOrder(yieldOrderList); apsOrderClient.saveOrderList(yieldOrderList);