|
|
|
|
@ -5,7 +5,6 @@ package org.springblade.desk.quality.controller; |
|
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.injector.methods.UpdateById; |
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
|
|
|
|
import io.swagger.v3.oas.annotations.Operation; |
|
|
|
|
@ -34,19 +33,13 @@ import org.springblade.desk.quality.pojo.entity.ReviewDuty; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.ReviewFault; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.ReviewSheet; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.ReviewSheetRedoSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.ReviewSheetScrapSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.ReviewSheetSelfSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.ReviewSheetInitListVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.*; |
|
|
|
|
import org.springblade.desk.quality.service.IReviewDutyService; |
|
|
|
|
import org.springblade.desk.quality.service.IReviewFaultService; |
|
|
|
|
import org.springblade.desk.quality.service.IReviewSheetService; |
|
|
|
|
import org.springblade.desk.quality.wrapper.ReviewDutyWrapper; |
|
|
|
|
import org.springblade.desk.quality.wrapper.ReviewSheetInitListWrapper; |
|
|
|
|
import org.springblade.desk.quality.wrapper.ReviewSheetWrapper; |
|
|
|
|
import org.springblade.desk.quality.wrapper.*; |
|
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
@ -84,10 +77,10 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@GetMapping("/detail") |
|
|
|
|
@ApiOperationSupport(order = 10) |
|
|
|
|
@Operation(summary = "详情", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<ReviewSheetVO> detail(ReviewSheet reviewSheet) { |
|
|
|
|
public R<ReviewSheetDetailVO> detail(ReviewSheet reviewSheet) { |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(reviewSheet); |
|
|
|
|
ReviewSheet detail = service.getOne(qw); |
|
|
|
|
ReviewSheetVO detailVO = ReviewSheetWrapper.build().entityVO(detail); |
|
|
|
|
ReviewSheetDetailVO detailVO = ReviewSheetDetailWrapper.build().entityVO(detail); |
|
|
|
|
service.setVOValue(detailVO); |
|
|
|
|
return R.data(detailVO); |
|
|
|
|
} |
|
|
|
|
@ -118,13 +111,13 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@PostMapping("/listInit") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetInitListVO>> listInit(@Parameter(hidden = true) @RequestParam(required = false) |
|
|
|
|
ReviewSheetInitSearch search, Query query) { |
|
|
|
|
public R<IPage<ReviewSheetInitVO>> listInit(@Parameter(hidden = true) @RequestBody |
|
|
|
|
ReviewSheetInitSearch search, Query query) { |
|
|
|
|
Map demo = new HashMap(); |
|
|
|
|
demo.put("status", ReviewSheetConst.S_INIT); |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class); |
|
|
|
|
IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw); |
|
|
|
|
IPage<ReviewSheetInitListVO> pagesVO = ReviewSheetInitListWrapper.build().pageVO(pages); |
|
|
|
|
IPage<ReviewSheetInitVO> pagesVO = ReviewSheetInitWrapper.build().pageVO(pages); |
|
|
|
|
|
|
|
|
|
// todo:
|
|
|
|
|
// pagesVO.getRecords()
|
|
|
|
|
@ -135,41 +128,22 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [生产处置单] 返工审理list分页 |
|
|
|
|
* [生产处置单] 返工报废审理list分页 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/listRedo") |
|
|
|
|
@PostMapping("/listReviewRedoScrap") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetVO>> listRedo(@Parameter(hidden = true) @RequestParam(required = false) |
|
|
|
|
ReviewSheetRedoSearch search, Query query) { |
|
|
|
|
@Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetRedoScrapVO>> listReviewRedoScrap(@Parameter(hidden = true) @RequestBody |
|
|
|
|
ReviewSheetRedoScrapSearch search, Query query) { |
|
|
|
|
Map demo = new HashMap(); |
|
|
|
|
demo.put("bizType", ReviewSheetConst.BizType.T_1); |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class); |
|
|
|
|
qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType()); |
|
|
|
|
qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); |
|
|
|
|
IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw); |
|
|
|
|
IPage<ReviewSheetVO> pagesVO = ReviewSheetWrapper.build().pageVO(pages); |
|
|
|
|
IPage<ReviewSheetRedoScrapVO> pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages); |
|
|
|
|
pagesVO.getRecords() |
|
|
|
|
.stream() |
|
|
|
|
.peek(service::setVOValue) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [生产处置单] 返工审理list分页 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/listScrap") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetVO>> listScrap(@Parameter(hidden = true) @RequestParam(required = false) |
|
|
|
|
ReviewSheetScrapSearch search, Query query) { |
|
|
|
|
Map demo = new HashMap(); |
|
|
|
|
demo.put("bizType", ReviewSheetConst.BizType.T_2); |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class); |
|
|
|
|
IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw); |
|
|
|
|
IPage<ReviewSheetVO> pagesVO = ReviewSheetWrapper.build().pageVO(pages); |
|
|
|
|
pagesVO.getRecords() |
|
|
|
|
.stream() |
|
|
|
|
.peek(service::setVOValue) |
|
|
|
|
.peek(service::setRedoScrapVOValue) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
@ -180,16 +154,16 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@PostMapping("/listSelf") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetVO>> listSelf(@Parameter(hidden = true) @RequestParam(required = false) |
|
|
|
|
ReviewSheetSelfSearch search, Query query) { |
|
|
|
|
public R<IPage<ReviewSheetSelfVO>> listSelf(@Parameter(hidden = true) @RequestBody |
|
|
|
|
ReviewSheetSelfSearch search, Query query) { |
|
|
|
|
Map demo = new HashMap(); |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class); |
|
|
|
|
qw.in("bizType", ReviewSheetConst.BizType.T_1, ReviewSheetConst.BizType.T_2); |
|
|
|
|
qw.in("bizType", ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); |
|
|
|
|
IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw); |
|
|
|
|
IPage<ReviewSheetVO> pagesVO = ReviewSheetWrapper.build().pageVO(pages); |
|
|
|
|
IPage<ReviewSheetSelfVO> pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages); |
|
|
|
|
pagesVO.getRecords() |
|
|
|
|
.stream() |
|
|
|
|
.peek(service::setVOValue) |
|
|
|
|
.peek(service::setSelfVOValue) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
@ -199,16 +173,16 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/listErp") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "ERPlist分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetVO>> listErp(@Parameter(hidden = true) @RequestParam Map<String, Object> reviewSheet, |
|
|
|
|
Query query) { |
|
|
|
|
@Operation(summary = "Erplist分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetErpVO>> listErp(@Parameter(hidden = true) @RequestParam Map<String, Object> reviewSheet, |
|
|
|
|
Query query) { |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); |
|
|
|
|
qw.eq("bizType", ReviewSheetConst.BizType.T_3); |
|
|
|
|
qw.eq("bizType", ReviewSheetConst.BizType.T_ERP); |
|
|
|
|
IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw); |
|
|
|
|
IPage<ReviewSheetVO> pagesVO = ReviewSheetWrapper.build().pageVO(pages); |
|
|
|
|
IPage<ReviewSheetErpVO> pagesVO = ReviewSheetErpWrapper.build().pageVO(pages); |
|
|
|
|
pagesVO.getRecords() |
|
|
|
|
.stream() |
|
|
|
|
.peek(service::setVOValue) |
|
|
|
|
.peek(service::setErpVOValue) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
@ -232,9 +206,9 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@GetMapping("/listForSelect") |
|
|
|
|
@ApiOperationSupport(order = 22) |
|
|
|
|
@Operation(summary = "list下拉选择", description = "") |
|
|
|
|
public R<List<ReviewSheetVO>> listForSelect() { |
|
|
|
|
public R<List<ReviewSheetDetailVO>> listForSelect() { |
|
|
|
|
List<ReviewSheet> list = service.list(); |
|
|
|
|
List<ReviewSheetVO> listVO = ReviewSheetWrapper.build().listVO(list); |
|
|
|
|
List<ReviewSheetDetailVO> listVO = ReviewSheetDetailWrapper.build().listVO(list); |
|
|
|
|
return R.data(listVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -288,7 +262,7 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@PostMapping("/submitInternal") |
|
|
|
|
@ApiOperationSupport(order = 50) |
|
|
|
|
@Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") |
|
|
|
|
public R submitInternal(@Valid @RequestBody ReviewSheetVO vo) { |
|
|
|
|
public R submitInternal(@Valid @RequestBody ReviewSheetDetailVO vo) { |
|
|
|
|
{ |
|
|
|
|
//
|
|
|
|
|
dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class)); |
|
|
|
|
@ -308,7 +282,7 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@PostMapping("/submitErp") |
|
|
|
|
@ApiOperationSupport(order = 50) |
|
|
|
|
@Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") |
|
|
|
|
public R submitErp(@Valid @RequestBody ReviewSheetVO vo) { |
|
|
|
|
public R submitErp(@Valid @RequestBody ReviewSheetDetailVO vo) { |
|
|
|
|
{ |
|
|
|
|
//
|
|
|
|
|
dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class)); |
|
|
|
|
@ -322,16 +296,13 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
return R.status(service.saveOrUpdate(vo)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@GetMapping("/review") |
|
|
|
|
@GetMapping("/reviewSelf") |
|
|
|
|
@ApiOperationSupport(order = 22) |
|
|
|
|
@Operation(summary = "审批", description = "") |
|
|
|
|
public R review(@RequestParam Long id, |
|
|
|
|
@RequestParam Integer status, |
|
|
|
|
@RequestParam String memo) { |
|
|
|
|
ReviewSheet rs = service.getById(id); |
|
|
|
|
rs.setStatus(status); |
|
|
|
|
rs.setMemo(memo); |
|
|
|
|
return R.status(service.updateById(rs)); |
|
|
|
|
@Operation(summary = "内部审批", description = "") |
|
|
|
|
public R reviewSelf(@Parameter(description = "id") @RequestParam Long id, |
|
|
|
|
@Parameter(description = "selfReviewFlag 1 or 2") @RequestParam Integer selfReviewFlag, |
|
|
|
|
@Parameter(description = "memo") @RequestParam String memo) { |
|
|
|
|
return service.reviewSelf(id, selfReviewFlag, memo); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@ -402,12 +373,14 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [生产处置单] 修改一条 |
|
|
|
|
* 填报[生产处置单] |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/fill") |
|
|
|
|
@ApiOperationSupport(order = 40) |
|
|
|
|
@Operation(summary = "fill", description = "ReviewSheetVO Obj") |
|
|
|
|
public R fill(@Valid @RequestBody ReviewSheetVO vo) { |
|
|
|
|
@Operation(summary = "填报[生产处置单]", description = "ReviewSheetVO Obj") |
|
|
|
|
public R fill(@Valid @RequestBody ReviewSheetDetailVO vo) { |
|
|
|
|
return service.fill(vo); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public R getHisWO( ) |
|
|
|
|
} |
|
|
|
|
|
Tom Li
5 months ago