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

生产处置单提交erp修改

Browse Source
liweidong
pangyang 4 weeks ago
parent 466b209d5d
commit 87cf873711
5 changed files with 239 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java
  2. 39
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java
  3. 93
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java
  4. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java
  5. 85
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

43
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java
Unescape View File

@ -20,5 +20,48 @@ import java.io.Serial;
public class ReviewDutyDTO extends ReviewDuty {
@Serial
private static final long serialVersionUID = 1L;
/**
* 审理单Id
*/
private String trialId;
/**
* 序号
*/
private String trialSeq;
/**
* 物料号
*/
private String mdsItemCode;
/**
* 批次号
*/
private String batchNo;
/**
* 相关物料号
*/
private String corrMdsItemCode;
/**
* 相关批次号
*/
private String corrBatchNo;
/**
* 备注
*/
private String note;
/**
* 数量
*/
private Short reqQty;
/**
* 单位
*/
private String unit;
}

39
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java
Unescape View File

@ -20,5 +20,44 @@ import java.io.Serial;
public class ReviewFaultDTO extends ReviewFault {
@Serial
private static final long serialVersionUID = 1L;
/**
* 审理单Id
*/
private String trialId;
/**
* 序号
*/
private String trialSeq;
/**
* 故障类别
*/
private String faultType;
/**
* 问题大类
*/
private String questClass;
/**
* 问题小类
*/
private String questSubclass;
/**
* 比例
*/
private Double proportion;
/**
* 数量
*/
private Long faultQty;
/**
* 描述
*/
private String describe;
}

93
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java
Unescape View File

@ -21,4 +21,97 @@ public class ReviewSheetDTO extends ReviewSheet {
@Serial
private static final long serialVersionUID = 1L;
/**
* 批次号
*/
private String batchNo;
/**
* 车间订单号/外协交件号.业务号
*/
private String businessNo;
/**
* 检验员编码
*/
private String checkUserCode;
/**
* 物料编码
*/
private String mdsItemCode;
/**
* 物料名称
*/
private String mdsItemName;
/**
* 质量等级
*/
private String levels;
/**
* 发现部门
*/
private String findWorkShop;
/**
* 是否质量问题
*/
private Boolean qualityquestion;
/**
* 审理单状态
*/
private String trialStatus = "21";
/**
* 总数量
*/
private Double needQty;
/**
* 上级编号
*/
private String preCode;
/**
* 比例
*/
private Double proporTion;
/**
* 不合格数量
*/
private Double subQty;
/**
* 简单原因
*/
private String easyReason;
/**
* 处置单类型（1-零件模式/2-装配模式/5-售后模式）
*/
private String trialType;
/**
* 工序号
*/
private String seqNo;
/**
* 工序名称
*/
private String seqName;
/**
* 发现人
*/
private String findUserCode;
/**
* 处置单类型（1-提交质保/2-提交工艺/3-提交设计）
*/
private String hearDis;
}

2
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java
Unescape View File

@ -423,4 +423,6 @@ public class ReviewSheet extends BaseEntity {
//当前工序id
private Long ppsId;
private Integer submitType;
}

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

@ -33,6 +33,9 @@ import org.springblade.desk.quality.constant.InspectionTaskConst;
import org.springblade.desk.quality.constant.ReviewSheetConst;
import org.springblade.desk.quality.excel.ReviewSheetExcel;
import org.springblade.desk.quality.mapper.ReviewSheetMapper;
import org.springblade.desk.quality.pojo.dto.ReviewDutyDTO;
import org.springblade.desk.quality.pojo.dto.ReviewFaultDTO;
import org.springblade.desk.quality.pojo.dto.ReviewSheetDTO;
import org.springblade.desk.quality.pojo.entity.InspectionTask;
import org.springblade.desk.quality.pojo.entity.ReviewDuty;
import org.springblade.desk.quality.pojo.entity.ReviewFault;
@ -378,29 +381,65 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
rs.setHasSaved(BaseValue.YES);
// 处置单
saveOrUpdate(rs);
// if (ReviewSheetConst.BizType.T_ERP.equals(rs.getBizType())) {
// HttpHeaders headers = new HttpHeaders();
// headers.setContentType(MediaType.APPLICATION_JSON);
// JSONObject obj = new JSONObject();
// obj.put("qmsRepairApplyDTO", rs);
// obj.put("qmsRepairPartList", listD);
// obj.put("qmsRepairMalfList", listF);
// HttpEntity<JSONObject> entity = new HttpEntity<>(obj, headers);
// ResponseEntity<JSONObject> responseEntity;
// JSONObject responseBody;
// try {
// responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" +
// "/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");
// }
// }
if (ReviewSheetConst.BizType.T_ERP.equals(rs.getBizType())) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
ReviewSheetDTO dto = new ReviewSheetDTO();
dto.setBusinessNo(rs.getWoCode());
dto.setMdsItemCode(dto.getPreCode());
dto.setTrialStatus(rs.getReviewStatus().toString());
dto.setHearDis(rs.getSubmitType().toString());
dto.setTrialType(rs.getReviewOrderMode()+"");
dto.setPreCode(rs.getUpCode());
dto.setProporTion(rs.getScale());
dto.setSubQty(rs.getUnqualifiedQty());
List<ReviewDutyDTO> vods = new ArrayList<>();
for(ReviewDuty vod : listD){
ReviewDutyDTO vodDTO = new ReviewDutyDTO();
vodDTO.setTrialId(vod.getReviewSheetId()+"");
vodDTO.setReqQty(vod.getQty());
vodDTO.setUnit(vod.getUnit());
vodDTO.setCorrBatchNo(vod.getRelevantBatch());
vods.add(vodDTO);
}
List<ReviewFaultDTO> vofs = new ArrayList<>();
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.setProportion(vof.getScale());
vofDTO.setFaultQty(vof.getQty());
vofDTO.setDescribe(vof.getMemo());
vofs.add(vofDTO);
}
JSONObject obj = new JSONObject();
obj.put("qmsRepairApplyDTO", dto);
obj.put("qmsRepairPartList", vods);
obj.put("qmsRepairMalfList", vofs);
HttpEntity<JSONObject> entity = new HttpEntity<>(obj, headers);
ResponseEntity<JSONObject> responseEntity;
JSONObject responseBody;
try {
responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" +
"/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");
}
}
return R.success("成功");
}

Write Preview
Loading…
Cancel
Save