ERP_override.git

			@@ -67,6 +67,8 @@
			private final SysErrorService sysErrorService;
			private final FinishedOperateLogMapper finishedOperateLogMapper;
			private final RestTemplate restTemplate;
			private final PatchLogMapper patchLogMapper;
			private final ReworkMapper reworkMapper;


			/*public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper, SysErrorService sysErrorService, OrderDetailMapper orderDetailMapper, FinishedOperateLogMapper finishedOperateLogMapper, ReportingWorkTransferMapper reportingWorkTransferMapper) {
			@@ -153,7 +155,7 @@
			if (retrievedData!=null){
			Integer reviewedState = retrievedData.getReviewedState();
			//根据审核状态查询未审核数据
			if (reviewedState==1){//已审核
			// if (reviewedState==1){//已审核
			//不是第一道工序，查询报工数据
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating);
			if(process.equals("中空")){
			@@ -171,24 +173,24 @@
			});
			}
			map.put("Detail",details );
			}else {
			//不是第一道工序，查询报工数据
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
			if(process.equals("中空")){
			String orderId = reportingWorkMapper.selectOrderid(processIdStr);
			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,laminating);
			// if(process.equals("中空")){
			// String orderId = reportingWorkMapper.selectOrderid(processIdStr);
			// 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 );
			// }
			}
			}

			@@ -204,6 +206,8 @@
			map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
			//历史工序
			map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
			//是否合片工序
			map.put("laminating", laminating);
			}
			return map;
			}
			@@ -934,6 +938,17 @@
			result.put("data",false);
			return result;
			}
			List<ReportingWorkTransfer> reportingWorkTransferList = reportingWorkTransferMapper
			.selectList(new QueryWrapper<ReportingWorkTransfer>()
			.eq("old_order", reportingWork.get("newOrderId"))
			.eq("old_order_number", reportingWork.get("newOrderNumber"))
			);
			if(!reportingWorkTransferList.isEmpty()){
			result.put("msg","新订单序号之前已转出报工数据，无法进行转入");
			result.put("data",false);
			return result;
			}

			//获取旧订单报工数据汇总
			List<OrderProcessDetail> oldOrderProcessDetailForReport = orderProcessDetailMapper
			.selectList(new QueryWrapper<OrderProcessDetail>()
			@@ -941,6 +956,51 @@
			.eq("order_number", reportingWork.get("oldOrderNumber"))
			.gt("reporting_work_num",0)
			);

			if (oldOrderProcessDetailForReport.isEmpty()){
			result.put("msg","旧订单没有可转出的报工数据");
			result.put("data",false);
			return result;
			}
			List<String> oldOrderProcessIdList = new ArrayList<>();
			oldOrderProcessDetailList.forEach(oldOrderProcessDetail -> oldOrderProcessIdList.add(oldOrderProcessDetail.getProcessId()));

			//获取旧数据破损表是否存在破损
			List<DamageDetails> damageDetails = damageDetailsMapper.selectList(
			new QueryWrapper<DamageDetails>()
			.in("process_id",oldOrderProcessIdList)
			.eq("order_number", reportingWork.get("oldOrderNumber"))
			.eq("quantity",0)
			);
			if(!damageDetails.isEmpty()){
			result.put("msg","旧订单存在报工未处理破损数据");
			result.put("data",false);
			return result;
			}
			//获取补片表是否存在补片未审核状态
			List<PatchLog> patchLogs = patchLogMapper.selectList(
			new QueryWrapper<PatchLog>()
			.eq("order_id", reportingWork.get("oldOrderId"))
			.eq("order_sort", reportingWork.get("oldOrderNumber"))
			.eq("review_status",0)
			);
			if (patchLogs.isEmpty()){
			result.put("msg","旧订单存在补片未审核数据");
			result.put("data",false);
			return result;
			}
			List<Rework> reworks = reworkMapper.selectList(
			new QueryWrapper<Rework>()
			.eq("order_id", reportingWork.get("oldOrderId"))
			.eq("order_sort", reportingWork.get("oldOrderNumber"))
			.eq("review_status",0)
			);
			if (patchLogs.isEmpty()){
			result.put("msg","旧订单存在返工未审核数据，请先审核报工后再进行转出");
			result.put("data",false);
			return result;
			}


			Map<String,Object> log = new HashMap<>();
			log.put("oldOrderBeforeChange",oldOrderProcessDetailForReport);
			@@ -956,6 +1016,7 @@
			reportingWorkMapper.update(null,new UpdateWrapper<ReportingWork>()
			.set("reviewed_state",3)
			.eq("process_id",oldOrderProcessDetail.getProcessId())
			.gt("reviewed_state",0)
			);


			@@ -1033,7 +1094,6 @@
			orderNumberTransferList.add(orderNumberTransfer);

			}

			}
			}
			});
			@@ -1070,12 +1130,11 @@
			if(response.getStatusCode() == HttpStatus.OK){
			OrderNumberTransferDTO responseBody = response.getBody();
			result.put("data",true);
			return result;
			}else{
			result.put("msg","连接mes响应超时");
			result.put("data",false);
			return result;
			}

			return result;

			}
			}