suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

生产管理修改

Browse Source
liweidong
李涛 4 days ago
parent 96ca75390e
commit 000504dea6
1 changed files with 51 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 110
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

110
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
Unescape View File

@ -55,15 +55,19 @@ import org.springblade.wms.pojo.entity.SyDockingLog;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
/** /**
* [生产处置单] 服务实现类 * [生产处置单] 服务实现类
* *
@ -113,24 +117,24 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
} }
@Resource @Resource
IWorkPlanService workPlanService; IWorkPlanService workPlanService;
@Override @Override
public ReviewSheetDetailVO getByCardNo(Long id,String woCode) { public ReviewSheetDetailVO getByCardNo(Long id, String woCode) {
ReviewSheet vo = baseMapper.getById(id); ReviewSheet vo = baseMapper.getById(id);
Long ppsId = vo.getPpsId(); Long ppsId = vo.getPpsId();
List<ReviewSheetInitVO> listplan = baseMapper.getByCardNo(woCode,ppsId); List<ReviewSheetInitVO> listplan = baseMapper.getByCardNo(woCode, ppsId);
ReviewSheetDetailVO detaiinit = new ReviewSheetDetailVO() ; ReviewSheetDetailVO detaiinit = new ReviewSheetDetailVO();
// Long ppsId = vo.getPpsId(); // Long ppsId = vo.getPpsId();
// List<ReviewSheetDetailVO> detailVOList = new ArrayList<>(); // List<ReviewSheetDetailVO> detailVOList = new ArrayList<>();
// QueryWrapper<WorkPlan> qwplan = new QueryWrapper<>(); // QueryWrapper<WorkPlan> qwplan = new QueryWrapper<>();
// qwplan.eq("PPS_ID", ppsId); // qwplan.eq("PPS_ID", ppsId);
// List<WorkPlan> listplan = workPlanService.list(qwplan); // List<WorkPlan> listplan = workPlanService.list(qwplan);
if(listplan != null && listplan.size() > 0){ if (listplan != null && listplan.size() > 0) {
List<Long> ids = listplan.stream().map(ReviewSheetInitVO::getWpId).toList(); List<Long> ids = listplan.stream().map(ReviewSheetInitVO::getWpId).toList();
@ -141,9 +145,9 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
qw.orderByDesc("CREATE_TIME"); qw.orderByDesc("CREATE_TIME");
List<ReviewSheet> list = list(qw); List<ReviewSheet> list = list(qw);
if(list != null && list.size() > 0){ if (list != null && list.size() > 0) {
ReviewSheet rs = list.get(0); ReviewSheet rs = list.get(0);
ReviewSheetInitVO detailVO = baseMapper.getById( rs.getId()); ReviewSheetInitVO detailVO = baseMapper.getById(rs.getId());
detaiinit = ReviewSheetDetailWrapper.build().entityVO(detailVO); detaiinit = ReviewSheetDetailWrapper.build().entityVO(detailVO);
setDetailVOValue(detaiinit); setDetailVOValue(detaiinit);
return detaiinit; return detaiinit;
@ -181,16 +185,16 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
@Override @Override
public void setInitVOValue(ReviewSheetInitVO vo) { public void setInitVOValue(ReviewSheetInitVO vo) {
if(null != vo.getReviewUserId()){ if (null != vo.getReviewUserId()) {
R<UserInfo> rUICR = userClient.userInfo(vo.getReviewUserId()); R<UserInfo> 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()); vo.setReviewUserRealName(rUICR.getData().getUser().getRealName());
} }
if(null != vo.getReviewStatus()){ if (null != vo.getReviewStatus()) {
if(3==vo.getReviewStatus()){ if (3 == vo.getReviewStatus()) {
vo.setReviewStatusName("通过"); vo.setReviewStatusName("通过");
} }
if(4==vo.getReviewStatus()){ if (4 == vo.getReviewStatus()) {
vo.setReviewStatusName("未通过"); vo.setReviewStatusName("未通过");
} }
} }
@ -484,7 +488,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
List<ReviewFault> listF = null; List<ReviewFault> listF = null;
if(null != vo.getFaultList() && vo.getFaultList().size() > 0){ if (null != vo.getFaultList() && !vo.getFaultList().isEmpty()) {
// 关联rsId // 关联rsId
for (ReviewFaultVO voF : vo.getFaultList()) { for (ReviewFaultVO voF : vo.getFaultList()) {
voF.setReviewSheetId(vo.getId()); voF.setReviewSheetId(vo.getId());
@ -494,16 +498,13 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
faultService.saveOrUpdateBatch(listF); faultService.saveOrUpdateBatch(listF);
} }
// 删除 // 删除
if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) { if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) {
dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds())); dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds()));
} }
List<ReviewDuty> listD = null; List<ReviewDuty> listD = null;
if(null != vo.getDutyList() && vo.getDutyList().size() > 0){ if (null != vo.getDutyList() && !vo.getDutyList().isEmpty()) {
// 关联rsId // 关联rsId
for (ReviewDutyVO voD : vo.getDutyList()) { for (ReviewDutyVO voD : vo.getDutyList()) {
voD.setReviewSheetId(vo.getId()); voD.setReviewSheetId(vo.getId());
@ -513,7 +514,6 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
dutyService.saveOrUpdateBatch(listD); dutyService.saveOrUpdateBatch(listD);
} }
// 审理单 // 审理单
ReviewSheet rs = getById(vo.getId()); // 从数据库中查到 ReviewSheet rs = getById(vo.getId()); // 从数据库中查到
log.info("ReviewSheet rs = {}", rs); log.info("ReviewSheet rs = {}", rs);
@ -525,10 +525,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
Integer bizType = vo.getBizType(); Integer bizType = vo.getBizType();
// biz类型 // biz类型
rs.setBizType(bizType); rs.setBizType(bizType);
if ( if (ReviewSheetConst.BizType.T_SELF_REDO.equals(rs.getBizType()) || ReviewSheetConst.BizType.T_SELF_SCRAP.equals(rs.getBizType())) {
ReviewSheetConst.BizType.T_SELF_REDO.equals(rs.getBizType()) ||
ReviewSheetConst.BizType.T_SELF_SCRAP.equals(rs.getBizType())
) {
if (ReviewSheetConst.SUBMIT_TYPE.T_SELF.equals(submitType)) { // 内部提交 if (ReviewSheetConst.SUBMIT_TYPE.T_SELF.equals(submitType)) { // 内部提交
// 当前状态 // 当前状态
rs.setStatus(ReviewSheetConst.STATUS.S_JUDGE); rs.setStatus(ReviewSheetConst.STATUS.S_JUDGE);
@ -570,17 +567,17 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
dto.setMdsItemCode(dto.getPreCode()); dto.setMdsItemCode(dto.getPreCode());
dto.setTrialStatus(rs.getReviewStatus().toString()); dto.setTrialStatus(rs.getReviewStatus().toString());
dto.setHearDis(rs.getSubmitType().toString()); dto.setHearDis(rs.getSubmitType().toString());
dto.setTrialType(rs.getReviewOrderMode()+""); dto.setTrialType(rs.getReviewOrderMode() + "");
dto.setPreCode(rs.getUpCode()); dto.setPreCode(rs.getUpCode());
dto.setProporTion(rs.getScale()); dto.setProporTion(rs.getScale());
dto.setSubQty(rs.getUnqualifiedQty()); dto.setSubQty(rs.getUnqualifiedQty());
List<ReviewDutyDTO> vods = new ArrayList<>(); List<ReviewDutyDTO> vods = new ArrayList<>();
if(null != listD && listD.size() > 0){ if (null != listD && listD.size() > 0) {
for(ReviewDuty vod : listD){ for (ReviewDuty vod : listD) {
ReviewDutyDTO vodDTO = new ReviewDutyDTO(); ReviewDutyDTO vodDTO = new ReviewDutyDTO();
vodDTO.setTrialId(vod.getReviewSheetId()+""); vodDTO.setTrialId(vod.getReviewSheetId() + "");
vodDTO.setReqQty(vod.getQty()); vodDTO.setReqQty(vod.getQty());
vodDTO.setUnit(vod.getUnit()); vodDTO.setUnit(vod.getUnit());
vodDTO.setCorrBatchNo(vod.getRelevantBatch()); vodDTO.setCorrBatchNo(vod.getRelevantBatch());
@ -589,13 +586,13 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
} }
List<ReviewFaultDTO> vofs = new ArrayList<>(); List<ReviewFaultDTO> vofs = new ArrayList<>();
if(null != listF && listF.size() > 0){ if (null != listF && listF.size() > 0) {
for(ReviewFault vof : listF){ for (ReviewFault vof : listF) {
ReviewFaultDTO vofDTO = new ReviewFaultDTO(); ReviewFaultDTO vofDTO = new ReviewFaultDTO();
vofDTO.setTrialId(vof.getReviewSheetId()+""); vofDTO.setTrialId(vof.getReviewSheetId() + "");
vofDTO.setFaultType(vof.getNgType2Id()+""); vofDTO.setFaultType(vof.getNgType2Id() + "");
vofDTO.setQuestClass(vof.getNgType3Id()+""); vofDTO.setQuestClass(vof.getNgType3Id() + "");
vofDTO.setQuestSubclass(vof.getNgType4Id()+""); vofDTO.setQuestSubclass(vof.getNgType4Id() + "");
vofDTO.setProportion(vof.getScale()); vofDTO.setProportion(vof.getScale());
vofDTO.setFaultQty(vof.getQty()); vofDTO.setFaultQty(vof.getQty());
vofDTO.setDescribe(vof.getMemo()); vofDTO.setDescribe(vof.getMemo());
@ -603,29 +600,24 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
} }
} }
JSONObject obj = new JSONObject();
// JSONObject obj = new JSONObject(); obj.put("qmsRepairApplyDTO", dto);
// obj.put("qmsRepairApplyDTO", dto); obj.put("qmsRepairPartList", vods);
// obj.put("qmsRepairPartList", vods); obj.put("qmsRepairMalfList", vofs);
// obj.put("qmsRepairMalfList", vofs); HttpEntity<JSONObject> entity = new HttpEntity<>(obj, headers);
// HttpEntity<JSONObject> entity = new HttpEntity<>(obj, headers); ResponseEntity<JSONObject> responseEntity;
// ResponseEntity<JSONObject> responseEntity; JSONObject responseBody;
// JSONObject responseBody; try {
// try { responseEntity = httpClientTemplate.postForEntity(newErpUrl + "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class);
//// responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" + JSONObject result = responseEntity.getBody();
//// "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class);
// responseBody = result.getJSONObject("responseBody");
// responseEntity = httpClientTemplate.postForEntity(newErpUrl + if (responseBody == null) {
// "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class); throw new ServiceException("审理单,接口返回值null");
// JSONObject result = responseEntity.getBody(); }
// } catch (Exception e) {
// responseBody = result.getJSONObject("responseBody"); throw new ServiceException("审理单,接口返回值null");
// if (responseBody == null) { }
// throw new BusinessException("审理单,接口返回值null");
// }
// } catch (Exception e) {
// throw new RuntimeException("审理单,接口返回值null");
// }
} }
return R.success("成功"); return R.success("成功");
} }
@ -642,10 +634,10 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
rs.setMemo(memo); rs.setMemo(memo);
// 修改状态， 内部审理没有审理状态概念。 // 修改状态， 内部审理没有审理状态概念。
rs.setStatus(ReviewSheetConst.STATUS.S_COMPLETE); rs.setStatus(ReviewSheetConst.STATUS.S_COMPLETE);
if(1==selfReviewFlag){ if (1 == selfReviewFlag) {
//通过 //通过
rs.setReviewStatus((short) 3); rs.setReviewStatus((short) 3);
}else{ } else {
//驳回 //驳回
rs.setReviewStatus((short) 4); rs.setReviewStatus((short) 4);
} }
@ -742,8 +734,8 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
public IPage<PpmReportDetailDTO> listErp(IPage<PpmReportDetailDTO> page, ReviewSheetErpSearch search) { public IPage<PpmReportDetailDTO> listErp(IPage<PpmReportDetailDTO> page, ReviewSheetErpSearch search) {
// List<PpmReportDetailDTO> listVO = baseMapper.listErpNew(page, search); // List<PpmReportDetailDTO> listVO = baseMapper.listErpNew(page, search);
ErpQueryRequest erpQueryRequest = new ErpQueryRequest(); ErpQueryRequest erpQueryRequest = new ErpQueryRequest();
erpQueryRequest.setCurrent(Integer.parseInt(page.getCurrent()+"")); erpQueryRequest.setCurrent(Integer.parseInt(page.getCurrent() + ""));
erpQueryRequest.setSize(Integer.parseInt(page.getSize()+"")); erpQueryRequest.setSize(Integer.parseInt(page.getSize() + ""));
erpQueryRequest.setSearch(search); erpQueryRequest.setSearch(search);
List<PpmReportDetailDTO> listVO = erpMesRbPkpqryClient.listErpNew(erpQueryRequest); List<PpmReportDetailDTO> listVO = erpMesRbPkpqryClient.listErpNew(erpQueryRequest);
for (PpmReportDetailDTO oneVO : listVO) { for (PpmReportDetailDTO oneVO : listVO) {

Write Preview
Loading…
Cancel
Save