ERP_override.git

			@@ -25,7 +25,6 @@
			import com.example.erp.service.userInfo.LogService;
			import com.example.erp.service.userInfo.SysErrorService;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.interceptor.TransactionAspectSupport;
			@@ -139,24 +138,48 @@
			//是第一道工序，查询流程卡数据
			map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process,reportType));
			} else {
			//不是第一道工序，查询报工数据
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess);
			if(process.equals("中空")){
			String orderId = processIdStr.substring(0,10);
			details.forEach( detail -> {
			Integer glassId = orderGlassDetailMapper.
			getMinIdByGroup(orderId,
			String.valueOf(detail.get("order_number")),
			String.valueOf(detail.get("group")));
			int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
			if(listGlassId !=glassId){
			detail.put("rowClass","latter");
			ReportingWork retrievedData = (ReportingWork) map.get("data");
			if (retrievedData!=null){
			Integer reviewedState = retrievedData.getReviewedState();
			//根据审核状态查询未审核数据
			if (reviewedState==1){//已审核
			//不是第一道工序，查询报工数据
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess);
			if(process.equals("中空")){
			String orderId = processIdStr.substring(0,10);
			details.forEach( detail -> {
			Integer glassId = orderGlassDetailMapper.
			getMinIdByGroup(orderId,
			String.valueOf(detail.get("order_number")),
			String.valueOf(detail.get("group")));
			int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
			if(listGlassId !=glassId){
			detail.put("rowClass","latter");
			}
			});
			}
			});
			map.put("Detail",details );
			}else {
			//不是第一道工序，查询报工数据
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess);
			if(process.equals("中空")){
			String orderId = processIdStr.substring(0,10);
			details.forEach( detail -> {
			Integer glassId = orderGlassDetailMapper.
			getMinIdByGroup(orderId,
			String.valueOf(detail.get("order_number")),
			String.valueOf(detail.get("group")));
			int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
			if(listGlassId !=glassId){
			detail.put("rowClass","latter");
			}
			});
			}


			map.put("Detail",details );
			}
			}


			map.put("Detail",details );
			}

			// 第一道工序（流程卡数+补片数量-完工数-次破数-返工未完成数-禁用数量）
			@@ -178,9 +201,21 @@
			}

			//查询工序
			public Map<String, Object> SelectProcessSv() {
			public Map<String, Object> SelectProcessSv(String userId) {
			Map<String, Object> map = new HashMap<>();
			map.put("process", reportingWorkMapper.SelectProcessMp());
			String process = reportingWorkMapper.selectUserProcess(userId);
			if (process==null) {
			map.put("process", reportingWorkMapper.SelectProcessMp());
			}
			else {
			if (process.equals("夹胶")){
			map.put("process",reportingWorkMapper.getSelectProcessJiajiao() );
			}
			if (process.equals("技术部多曲")){
			map.put("process",reportingWorkMapper.getSelectProcessDuoqu() );
			}
			}

			return map;
			}

			@@ -199,7 +234,8 @@
			String formattedDate = dateFormat.format(currentDate);
			String reportingWorkId = "BG" + formattedDate + formattedNumber;
			reportingWork.setReportingWorkId(reportingWorkId);
			reportingWork.setProcessId(reportingWork.getProcessId().substring(0, 14));
			String[] processIdStr = reportingWork.getProcessId().split("/");
			reportingWork.setProcessId(processIdStr[0]);

			int reviewState = (int) reportingWorkJson.get("type");
			if (reviewState == 1) {
			@@ -208,6 +244,8 @@
			} else {
			reportingWork.setReviewedState(0);
			}

			reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
			//主表插入
			reportingWorkMapper.insert(reportingWork);
			//副表循环插入，并且插入次破信息表。再根据次破信息修改订单玻璃流程表的完工数量与刺破数量
			@@ -389,7 +427,7 @@
			//根据报工编号获取层
			map.put("layer", reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId));
			map.put("numberList", flowCardMapper.getGlassNumber(reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId),reportingWork.getProcessId()));

			map.put("title", "补片状态");
			return map;

			}