From 000504dea639d8b4a8a4a92fd7bb6bb365de30bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Fri, 24 Apr 2026 20:09:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ReviewSheetServiceImpl.java | 110 ++++++++---------- 1 file changed, 51 insertions(+), 59 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index c12445ec..9a76f214 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -55,15 +55,19 @@ import org.springblade.wms.pojo.entity.SyDockingLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpEntity; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import org.springframework.web.client.RestTemplate; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; + /** * [生产处置单] 服务实现类 * @@ -113,24 +117,24 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listplan = baseMapper.getByCardNo(woCode,ppsId); + List listplan = baseMapper.getByCardNo(woCode, ppsId); - ReviewSheetDetailVO detaiinit = new ReviewSheetDetailVO() ; + ReviewSheetDetailVO detaiinit = new ReviewSheetDetailVO(); // Long ppsId = vo.getPpsId(); // List detailVOList = new ArrayList<>(); // QueryWrapper qwplan = new QueryWrapper<>(); // qwplan.eq("PPS_ID", ppsId); // List listplan = workPlanService.list(qwplan); - if(listplan != null && listplan.size() > 0){ + if (listplan != null && listplan.size() > 0) { List ids = listplan.stream().map(ReviewSheetInitVO::getWpId).toList(); @@ -141,9 +145,9 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl list = list(qw); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { ReviewSheet rs = list.get(0); - ReviewSheetInitVO detailVO = baseMapper.getById( rs.getId()); + ReviewSheetInitVO detailVO = baseMapper.getById(rs.getId()); detaiinit = ReviewSheetDetailWrapper.build().entityVO(detailVO); setDetailVOValue(detaiinit); return detaiinit; @@ -181,16 +185,16 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl rUICR = userClient.userInfo(vo.getReviewUserId()); - if(null != rUICR && null !=rUICR.getData() && null != rUICR.getData().getUser()){ + if (null != rUICR && null != rUICR.getData() && null != rUICR.getData().getUser()) { vo.setReviewUserRealName(rUICR.getData().getUser().getRealName()); } - if(null != vo.getReviewStatus()){ - if(3==vo.getReviewStatus()){ + if (null != vo.getReviewStatus()) { + if (3 == vo.getReviewStatus()) { vo.setReviewStatusName("通过"); } - if(4==vo.getReviewStatus()){ + if (4 == vo.getReviewStatus()) { vo.setReviewStatusName("未通过"); } } @@ -484,7 +488,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listF = null; - if(null != vo.getFaultList() && vo.getFaultList().size() > 0){ + if (null != vo.getFaultList() && !vo.getFaultList().isEmpty()) { // 关联rsId for (ReviewFaultVO voF : vo.getFaultList()) { voF.setReviewSheetId(vo.getId()); @@ -494,16 +498,13 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listD = null; - if(null != vo.getDutyList() && vo.getDutyList().size() > 0){ + if (null != vo.getDutyList() && !vo.getDutyList().isEmpty()) { // 关联rsId for (ReviewDutyVO voD : vo.getDutyList()) { voD.setReviewSheetId(vo.getId()); @@ -513,7 +514,6 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl vods = new ArrayList<>(); - if(null != listD && listD.size() > 0){ - for(ReviewDuty vod : listD){ + if (null != listD && listD.size() > 0) { + for (ReviewDuty vod : listD) { ReviewDutyDTO vodDTO = new ReviewDutyDTO(); - vodDTO.setTrialId(vod.getReviewSheetId()+""); + vodDTO.setTrialId(vod.getReviewSheetId() + ""); vodDTO.setReqQty(vod.getQty()); vodDTO.setUnit(vod.getUnit()); vodDTO.setCorrBatchNo(vod.getRelevantBatch()); @@ -589,13 +586,13 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl vofs = new ArrayList<>(); - if(null != listF && listF.size() > 0){ - for(ReviewFault vof : listF){ + if (null != listF && listF.size() > 0) { + for (ReviewFault vof : listF) { ReviewFaultDTO vofDTO = new ReviewFaultDTO(); - vofDTO.setTrialId(vof.getReviewSheetId()+""); - vofDTO.setFaultType(vof.getNgType2Id()+""); - vofDTO.setQuestClass(vof.getNgType3Id()+""); - vofDTO.setQuestSubclass(vof.getNgType4Id()+""); + vofDTO.setTrialId(vof.getReviewSheetId() + ""); + vofDTO.setFaultType(vof.getNgType2Id() + ""); + vofDTO.setQuestClass(vof.getNgType3Id() + ""); + vofDTO.setQuestSubclass(vof.getNgType4Id() + ""); vofDTO.setProportion(vof.getScale()); vofDTO.setFaultQty(vof.getQty()); vofDTO.setDescribe(vof.getMemo()); @@ -603,29 +600,24 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl entity = new HttpEntity<>(obj, headers); -// ResponseEntity responseEntity; -// JSONObject responseBody; -// try { -//// responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" + -//// "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class); -// -// responseEntity = httpClientTemplate.postForEntity(newErpUrl + -// "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class); -// JSONObject result = responseEntity.getBody(); -// -// responseBody = result.getJSONObject("responseBody"); -// if (responseBody == null) { -// throw new BusinessException("审理单,接口返回值null"); -// } -// } catch (Exception e) { -// throw new RuntimeException("审理单,接口返回值null"); -// } + JSONObject obj = new JSONObject(); + obj.put("qmsRepairApplyDTO", dto); + obj.put("qmsRepairPartList", vods); + obj.put("qmsRepairMalfList", vofs); + HttpEntity entity = new HttpEntity<>(obj, headers); + ResponseEntity responseEntity; + JSONObject responseBody; + try { + responseEntity = httpClientTemplate.postForEntity(newErpUrl + "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class); + JSONObject result = responseEntity.getBody(); + + responseBody = result.getJSONObject("responseBody"); + if (responseBody == null) { + throw new ServiceException("审理单,接口返回值null"); + } + } catch (Exception e) { + throw new ServiceException("审理单,接口返回值null"); + } } return R.success("成功"); } @@ -642,10 +634,10 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listErp(IPage page, ReviewSheetErpSearch search) { // List listVO = baseMapper.listErpNew(page, search); ErpQueryRequest erpQueryRequest = new ErpQueryRequest(); - erpQueryRequest.setCurrent(Integer.parseInt(page.getCurrent()+"")); - erpQueryRequest.setSize(Integer.parseInt(page.getSize()+"")); + erpQueryRequest.setCurrent(Integer.parseInt(page.getCurrent() + "")); + erpQueryRequest.setSize(Integer.parseInt(page.getSize() + "")); erpQueryRequest.setSearch(search); List listVO = erpMesRbPkpqryClient.listErpNew(erpQueryRequest); for (PpmReportDetailDTO oneVO : listVO) {