ERP_override.git

			@@ -485,7 +485,9 @@
			JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
			ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
			List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);

			//查询该报工是否为报工转移订单
			Integer transferState = reportingWorkMapper.selectReviewedState(reportingWork.getReportingWorkId());
			if (transferState !=3){
			//删除刺破明细表刺破数据
			damageDetailsMapper.delete(
			new LambdaQueryWrapper<DamageDetails>()
			@@ -552,6 +554,10 @@
			logService.saveLog(log);

			return true;
			} else {
			return false;
			}

			}

			//报工管理查询
			@@ -578,6 +584,9 @@
			String lastProcess = reportingWorkMapper.selectLastProcess(processId);
			//获取是否有已补片或返工
			Integer countStates= Integer.valueOf(reportingWorkMapper.getPatchConditionMp(reportingWorkId));
			//查询该报工是否为报工转移订单
			Integer transferState = reportingWorkMapper.selectReviewedState(reportingWorkId);
			if (transferState !=3){
			//判断是否有补片返工数据
			if (countStates==0){
			//判断是否是入库工序
			@@ -646,6 +655,10 @@
			else {
			return false;
			}
			} else {
			return false;
			}


			} else {
			return false;