|
@@ -140,6 +140,38 @@ public class BizProcessInspecionController extends BaseController
|
|
|
return success(processInspecion);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @PostMapping("/selectOutsourcedInspecion")
|
|
|
+ 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<BizDayworkItemReject> itemRejects=bizDayworkItemRejectService.query().eq("process_inspection_id",processInspecion.getId()).list();
|
|
|
+ processInspecion.setDayworkItemConsults(itemConsults);
|
|
|
+ processInspecion.setDayworkItemRejects(itemRejects);
|
|
|
+
|
|
|
+ BizDayworkItem dayworkItem=bizDayworkItemService.selById(processInspecion.getDayworkItemId());
|
|
|
+
|
|
|
+ BizLot lot=new BizLot();
|
|
|
+ lot.setId(processInspecion.getLotId());
|
|
|
+ lot = bizLotService.getAllList(lot).get(0);
|
|
|
+
|
|
|
+ if(lot.getIsAmend()==1 || lot.getIsWasteRecycling()==1){
|
|
|
+ BizLotTechnologicalProcessDetail process = bizLotTechnologicalProcessDetailService.getById(dayworkItem.getTechnologicalProcessDetailId());
|
|
|
+ lot.setProcessAlias(process.getProcessAlias());
|
|
|
+ }else{
|
|
|
+ BizTechnologicalProcessDetail process = bizTechnologicalProcessDetailService.getById(dayworkItem.getTechnologicalProcessDetailId());
|
|
|
+ lot.setProcessAlias(process.getProcessAlias());
|
|
|
+ }
|
|
|
+
|
|
|
+ lot.setAllCarrierName(dayworkItem.getCarrierName());
|
|
|
+ lot.setDayworkItemId(dayworkItem.getId());
|
|
|
+ lot.setCarrierCode(dayworkItem.getCarrierCode());
|
|
|
+ lot.setCarrierId(dayworkItem.getCarrierId());
|
|
|
+ lot.setPudName(dayworkItem.getProdNum()==0?lot.getProductionQuantity():dayworkItem.getProdNum());
|
|
|
+ processInspecion.setLot(lot);
|
|
|
+ return success(processInspecion);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
*
|
|
|
* 新增外协序检信息
|