|
@@ -195,7 +195,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
return success(processInspecion);
|
|
return success(processInspecion);
|
|
}
|
|
}
|
|
|
|
|
|
- @PostMapping("/selectOutsourcedInspecion")
|
|
|
|
|
|
+// @PostMapping("/selectOutsourcedInspecion")
|
|
public AjaxResult selectOutsourcedInspecion(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
public AjaxResult selectOutsourcedInspecion(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).eq("is_outsourced_inspection", 1).list();
|
|
List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).eq("is_outsourced_inspection", 1).list();
|
|
List<BizDayworkItemReject> itemRejects = bizDayworkItemRejectService.query().eq("process_inspection_id", processInspecion.getId()).list();
|
|
List<BizDayworkItemReject> itemRejects = bizDayworkItemRejectService.query().eq("process_inspection_id", processInspecion.getId()).list();
|
|
@@ -227,7 +227,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
return success(processInspecion);
|
|
return success(processInspecion);
|
|
}
|
|
}
|
|
|
|
|
|
-// @PostMapping("/selectOutsourcedInspecion")
|
|
|
|
|
|
+ @PostMapping("/selectOutsourcedInspecion")
|
|
public AjaxResult selectOutsourcedInspecionV1(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
public AjaxResult selectOutsourcedInspecionV1(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).eq("is_outsourced_inspection", 1).list();
|
|
List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).eq("is_outsourced_inspection", 1).list();
|
|
List<BizDayworkItemReject> itemRejects = bizDayworkItemRejectService.query().eq("process_inspection_id", processInspecion.getId()).list();
|
|
List<BizDayworkItemReject> itemRejects = bizDayworkItemRejectService.query().eq("process_inspection_id", processInspecion.getId()).list();
|
|
@@ -544,7 +544,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
@Transactional
|
|
@Transactional
|
|
-// @PostMapping("/saveOutsourcedInspecion")
|
|
|
|
|
|
+ @PostMapping("/saveOutsourcedInspecion")
|
|
public AjaxResult saveOutsourcedInspectionV3(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
public AjaxResult saveOutsourcedInspectionV3(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
// // 判断是否已有未确认外协检查
|
|
// // 判断是否已有未确认外协检查
|
|
// if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {
|
|
// if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {
|
|
@@ -724,7 +724,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
|
|
|
|
@Transactional
|
|
@Transactional
|
|
- @PostMapping("/saveOutsourcedInspecion")
|
|
|
|
|
|
+// @PostMapping("/saveOutsourcedInspecion")
|
|
public AjaxResult saveOutsourcedInspectionV2(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
public AjaxResult saveOutsourcedInspectionV2(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
// // 判断是否已有未确认外协检查
|
|
// // 判断是否已有未确认外协检查
|
|
// if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {
|
|
// if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {
|