|
@@ -501,7 +501,8 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
reject.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
|
|
|
reject.setLotId(processInspecion.getLot().getId());
|
|
|
reject.setDayworkItemId(dayworkItem.getId());
|
|
|
- newRej.setRejectNum(newRej.getRejectNum() + reject.getRejectNum());
|
|
|
+ Long rejectNum = reject.getRejectNum() == null? 0L : reject.getRejectNum();
|
|
|
+ newRej.setRejectNum(newRej.getRejectNum());
|
|
|
newRej.setUserId(user == null ? 0L : user.getUserId());
|
|
|
newRej.setProcessInspectionId(processInspecion.getId());
|
|
|
newRej.setDayworkId(0L);
|
|
@@ -885,7 +886,17 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
*/
|
|
|
@Log(title = "序检主", businessType = BusinessType.DELETE)
|
|
|
@DeleteMapping("/{ids}")
|
|
|
+ @Transactional
|
|
|
public AjaxResult remove(@PathVariable List<Long> ids) {
|
|
|
+ List<BizProcessInspectionDetail> bizProcessInspectionDetails = processInspectionDetailService.query().in("process_inspection_id", ids).list();
|
|
|
+ List<BizDayworkCarrier> carriers = bizDayworkCarrierService.query().in("process_inspection_id", ids).list();
|
|
|
+ List<BizDayworkItemReject> rejects = bizDayworkItemRejectService.query().in("process_inspection_id", ids).list();
|
|
|
+ List<BizDayworkItemConsult> consults = bizDayworkItemConsultService.query().in("process_inspection_id", ids).list();
|
|
|
+
|
|
|
+ processInspectionDetailService.removeBatchByIds(bizProcessInspectionDetails);
|
|
|
+ bizDayworkItemRejectService.removeBatchByIds(rejects);
|
|
|
+ bizDayworkCarrierService.removeBatchByIds(carriers);
|
|
|
+ bizDayworkItemConsultService.removeBatchByIds(consults);
|
|
|
return toAjax(bizProcessInspecionService.removeBatchByIds(ids));
|
|
|
}
|
|
|
|