ERP_override.git

			@@ -102,6 +102,9 @@
			}
			}

			//工艺流程
			map.put("technologicalProcess", technologicalProcess);

			//设备下拉框
			map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
			//班组下拉框
			@@ -112,6 +115,8 @@

			//查询本工序报工需要哪几层，上工序是什么
			String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);

			map.put("numberList", flowCardMapper.getGlassNumber(Integer.valueOf(technologyStr),processIdStr));

			//判断本工序是不是第一道工序
			if (interceptProcess.equals(process)) {
			@@ -303,6 +308,8 @@
			.eq(Order::getOrderId, reportingWork.getOrderId())));
			reportingWork.setFlowCard(new FlowCard());



			List<Map<String, Object>> reportingWorkDetails = reportingWorkMapper.selectByReportingWorkId(reportingWorkId, reportingWork.getNextProcess());
			reportingWorkDetails.forEach(reportingWorkDetail -> {
			List<DamageDetails> damageDetailsList = new ArrayList<>();
			@@ -312,8 +319,8 @@
			.eq(DamageDetails::getTechnologyNumber, reportingWorkDetail.get("technology_number"))
			);
			reportingWorkDetail.put("damageDetails", damageDetailsList);
			});

			});

			Map<String, Object> map = new HashMap<>();
			map.put("reportingWork", reportingWork);
			@@ -321,7 +328,7 @@
			map.put("basic", getReportingWorkBase(reportingWork.getProcessId(), reportingWork.getThisProcess()));
			//根据报工编号获取层
			map.put("layer", reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId));

			map.put("numberList", flowCardMapper.getGlassNumber(reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId),reportingWork.getProcessId()));

			return map;