|
|
|
|
@ -32,6 +32,7 @@ import org.springblade.desk.quality.excel.ReviewSheetExcel; |
|
|
|
|
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.ReviewSheetErpSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.ReviewSheetSelfSearch; |
|
|
|
|
@ -44,6 +45,7 @@ import org.springframework.http.ResponseEntity; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
@ -111,7 +113,7 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@PostMapping("/listInit") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetInitVO>> listInit(@Parameter(hidden = true) @RequestBody |
|
|
|
|
public R<IPage<ReviewSheetInitVO>> listInit(@Parameter() @RequestBody |
|
|
|
|
ReviewSheetInitSearch search, Query query) { |
|
|
|
|
Map demo = new HashMap(); |
|
|
|
|
demo.put("status", ReviewSheetConst.S_INIT); |
|
|
|
|
@ -133,7 +135,7 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@PostMapping("/listReviewRedoScrap") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetRedoScrapVO>> listReviewRedoScrap(@Parameter(hidden = true) @RequestBody |
|
|
|
|
public R<IPage<ReviewSheetRedoScrapVO>> listReviewRedoScrap(@Parameter() @RequestBody |
|
|
|
|
ReviewSheetRedoScrapSearch search, Query query) { |
|
|
|
|
Map demo = new HashMap(); |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class); |
|
|
|
|
@ -154,7 +156,7 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@PostMapping("/listSelf") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetSelfVO>> listSelf(@Parameter(hidden = true) @RequestBody |
|
|
|
|
public R<IPage<ReviewSheetSelfVO>> listSelf(@Parameter() @RequestBody |
|
|
|
|
ReviewSheetSelfSearch search, Query query) { |
|
|
|
|
Map demo = new HashMap(); |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class); |
|
|
|
|
@ -174,9 +176,10 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@PostMapping("/listErp") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "Erplist分页", description = "传入ReviewSheet Obj") |
|
|
|
|
public R<IPage<ReviewSheetErpVO>> listErp(@Parameter(hidden = true) @RequestParam Map<String, Object> reviewSheet, |
|
|
|
|
public R<IPage<ReviewSheetErpVO>> listErp(@Parameter() @RequestBody ReviewSheetErpSearch search, |
|
|
|
|
Query query) { |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); |
|
|
|
|
Map demo = new HashMap(); |
|
|
|
|
QueryWrapper<ReviewSheet> qw = Condition.getQueryWrapper(demo, ReviewSheet.class); |
|
|
|
|
qw.eq("bizType", ReviewSheetConst.BizType.T_ERP); |
|
|
|
|
IPage<ReviewSheet> pages = service.page(Condition.getPage(query), qw); |
|
|
|
|
IPage<ReviewSheetErpVO> pagesVO = ReviewSheetErpWrapper.build().pageVO(pages); |
|
|
|
|
@ -187,6 +190,29 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
return R.data(pagesVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@PostMapping("/getHisWOList") |
|
|
|
|
@ApiOperationSupport(order = 20) |
|
|
|
|
@Operation(summary = "历史已经完成的车间订单", description = "Obj") |
|
|
|
|
public R<List<ReviewSheetHisWOVO>> getHisWOList(@Parameter() @RequestBody ReviewSheetErpSearch search, |
|
|
|
|
Query query) { |
|
|
|
|
List<ReviewSheetHisWOVO> list = new ArrayList<>(); |
|
|
|
|
list.add(new ReviewSheetHisWOVO()); |
|
|
|
|
list.add(new ReviewSheetHisWOVO()); |
|
|
|
|
return R.data(list); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@GetMapping("/sameCopyFromHiWO") |
|
|
|
|
@ApiOperationSupport(order = 10) |
|
|
|
|
@Operation(summary = "copy相同数据到from车间订单id", description = "传入 [车间订单]id") |
|
|
|
|
public R sameCopyFromHiWO(@Parameter(description = "列表id") @RequestParam Long id, |
|
|
|
|
@Parameter(description = "车间订单Id") @RequestParam Long woId) { |
|
|
|
|
// todo:
|
|
|
|
|
// 找到的历史审理单
|
|
|
|
|
Long rsId = 100L; |
|
|
|
|
|
|
|
|
|
return R.success(""); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* [生产处置单] page分页 |
|
|
|
|
*/ |
|
|
|
|
@ -300,8 +326,8 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
@ApiOperationSupport(order = 22) |
|
|
|
|
@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) { |
|
|
|
|
@Parameter(description = "selfReviewFlag") @RequestParam Integer selfReviewFlag, |
|
|
|
|
@Parameter(description = "memo") @RequestParam String memo) { |
|
|
|
|
return service.reviewSelf(id, selfReviewFlag, memo); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -381,6 +407,4 @@ public class ReviewSheetController extends BladeController { |
|
|
|
|
public R fill(@Valid @RequestBody ReviewSheetDetailVO vo) { |
|
|
|
|
return service.fill(vo); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public R getHisWO( ) |
|
|
|
|
} |
|
|
|
|
|
Tom Li
3 months ago