|
|
@@ -2747,6 +2747,52 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
bizDayworkCarrierService.save(newDayworkCarrier);
|
|
|
}
|
|
|
}
|
|
|
+ //移交仪器室
|
|
|
+ if (processInspecion.getFlag() != null && processInspecion.getFlag()) {
|
|
|
+ BizProcessInspecion inspection = new BizProcessInspecion();
|
|
|
+ inspection.setUserId(processInspecion.getLot().getUserId());
|
|
|
+ inspection.setTenantId(processInspecion.getTenantId());
|
|
|
+ inspection.setNickName(processInspecion.getLot().getNickName());
|
|
|
+ inspection.setCarrierId(processInspecion.getCarrierId());
|
|
|
+ inspection.setCarrierCode(processInspecion.getCarrierCode());
|
|
|
+ inspection.setDayworkId(daywork.getId());
|
|
|
+ inspection.setProcessStepNumber(processInspecion.getLot().getProcessStepNumber());
|
|
|
+ inspection.setProductionPlanId(daywork.getProductionPlanId());
|
|
|
+ inspection.setDayworkItemId(dayworkItem.getId());
|
|
|
+ inspection.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
|
|
|
+ inspection.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
|
|
|
+ inspection.setProductDescription(processInspecion.getLot().getProductDescription());
|
|
|
+ inspection.setLotId(processInspecion.getLot().getId());
|
|
|
+ inspection.setLotCode(processInspecion.getLot().getLotCode());
|
|
|
+ inspection.setDeptId(processInspecion.getDeptId() != null && !processInspecion.getDeptId().equals(0L) ? processInspecion.getDeptId() : daywork.getDeptId());
|
|
|
+ inspection.setProductId(processInspecion.getLot().getProductId());
|
|
|
+ inspection.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
|
|
|
+ inspection.setInspectionCarrierCode(processInspecion.getInspectionCarrierCode());
|
|
|
+ inspection.setInspectionCarrierId(processInspecion.getInspectionCarrierId());
|
|
|
+ inspection.setProcessStepNumber(processInspecion.getProcessStepNumber());
|
|
|
+ inspection.setEquipmentDetailCode(processInspecion.getLot().getEquipmentDetailCode());
|
|
|
+ inspection.setEquipmentDetailId(processInspecion.getLot().getEquipmentDetailId());
|
|
|
+ inspection.setInspectionChamberId(processInspecion.getInspectionChamberId());
|
|
|
+ //inspection.setReviewerId(SecurityUtils.getLoginUser().getUserId());
|
|
|
+ inspection.setProcessStepNumber(processInspecion.getProcessStepNumber());
|
|
|
+ inspection.setFromId(processInspecion.getId());
|
|
|
+ inspection.setType("instrumentRoomInspection");
|
|
|
+ if (inspection.getStartTime() == null) {
|
|
|
+ inspection.setStartTime(new Date());
|
|
|
+ }
|
|
|
+ bizProcessInspecionService.save(inspection);
|
|
|
+ //绑定检测载具
|
|
|
+ BizDayworkCarrier newDayworkCarrier = new BizDayworkCarrier();
|
|
|
+ newDayworkCarrier.setDayworkId(inspection.getDayworkId());
|
|
|
+ newDayworkCarrier.setCarrierCode(inspection.getInspectionCarrierCode());
|
|
|
+ newDayworkCarrier.setCarrierId(inspection.getInspectionCarrierId());
|
|
|
+ newDayworkCarrier.setTenantId(inspection.getTenantId());
|
|
|
+ newDayworkCarrier.setLotCode(inspection.getLotCode());
|
|
|
+ newDayworkCarrier.setLotId(inspection.getLotId());
|
|
|
+ newDayworkCarrier.setProductionPlanDetailId(inspection.getProductionPlanDetailId());
|
|
|
+ newDayworkCarrier.setProcessInspectionId(inspection.getId());
|
|
|
+ bizDayworkCarrierService.save(newDayworkCarrier);
|
|
|
+ }
|
|
|
|
|
|
// 判断假设已经全项检查
|
|
|
if (processInspecion.getIsAllChecked() != null && processInspecion.getIsAllChecked().equals(1)) {
|
