生产质量检验,故障类型修改

liweidong
pangyang 2 weeks ago
parent c37c87bdac
commit a2418325a6
  1. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java
  2. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java
  3. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@ -28,7 +28,7 @@ public interface ReviewSheetConst {
/**
* 新建 内部 ERP 都用
*/
Integer S_NEW = 1;
Integer S_NEW = 0;
/**
* 待审理 内部用 ERP不用
*/

@ -148,9 +148,11 @@ public class NgController extends BladeController {
@GetMapping("/listForSelectWTDL")
@ApiOperationSupport(order = 22)
@Operation(summary = "[问题大类]list下拉选择", description = "")
public R<List<NgVO>> listForSelectWTDL() {
public R<List<NgVO>> listForSelectWTDL(@Parameter(description = "parentId", required = true)
@RequestParam Long parentId) {
LambdaQueryWrapper<Ng> qw = Wrappers.lambdaQuery(Ng.class);
qw.eq(Ng::getNgType, NgConst.TYPE_3);
qw.eq(Ng::getParentId, parentId);
qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE);
List<Ng> list = service.list(qw);
List<NgVO> listVO = NgWrapper.build().listVO(list);
@ -164,7 +166,7 @@ public class NgController extends BladeController {
@ApiOperationSupport(order = 22)
@Operation(summary = "[问题小类]list下拉选择", description = "")
public R<List<NgVO>> listForSelectWTXL(
@Parameter(description = "parentId", required = true) @RequestParam Integer parentId) {
@Parameter(description = "parentId", required = true) @RequestParam Long parentId) {
LambdaQueryWrapper<Ng> qw = Wrappers.lambdaQuery(Ng.class);
qw.eq(Ng::getNgType, NgConst.TYPE_4);
qw.eq(Ng::getParentId, parentId);

@ -1879,7 +1879,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
if (!rsSubService.existTaskId(id)) {
ReviewSheet rs = new ReviewSheet();
// rs.setRsCode("RS" + System.currentTimeMillis());
// rs.setStatus(ReviewSheetConst.STATUS.S_INIT);
rs.setStatus(ReviewSheetConst.STATUS.S_INIT);
rs.setStatus(ReviewSheetConst.STATUS.S_NEW);
rs.setReviewStatus(ReviewSheetConst.ERP_REVIEW_S.REVIEW_STATUS_INIT);
WorkPlan plan = workPlanMapper.selectById(task.getWpId());

Loading…
Cancel
Save