ERP_override.git

			@@ -126,8 +126,9 @@
			map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
			//班组下拉框
			map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));

			//次破类型
			map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
			//次破原因
			map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));

			//查询本工序报工需要哪几层，上工序是什么
			@@ -148,7 +149,8 @@
			//不是第一道工序，查询报工数据
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating);
			if(process.equals("中空")){
			String orderId = processIdStr.substring(0,10);
			//获取该流程卡订单号
			String orderId = reportingWorkMapper.selectOrderid(processIdStr);
			details.forEach( detail -> {
			Integer glassId = orderGlassDetailMapper.
			getMinIdByGroup(orderId,
			@@ -165,7 +167,7 @@
			//不是第一道工序，查询报工数据
			List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
			if(process.equals("中空")){
			String orderId = processIdStr.substring(0,10);
			String orderId = reportingWorkMapper.selectOrderid(processIdStr);
			details.forEach( detail -> {
			Integer glassId = orderGlassDetailMapper.
			getMinIdByGroup(orderId,
			@@ -177,8 +179,6 @@
			}
			});
			}


			map.put("Detail",details );
			}
			}
			@@ -197,8 +197,6 @@
			//历史工序
			map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
			}


			return map;
			}

			@@ -210,6 +208,7 @@
			map.put("process", reportingWorkMapper.SelectProcessMp());
			}
			else {
			//对指定工序单独查询
			if (process.equals("夹胶")){
			map.put("process",reportingWorkMapper.getSelectProcessJiajiao() );
			}
			@@ -240,11 +239,15 @@
			reportingWork.setProcessId(processIdStr[0]);

			int reviewState = (int) reportingWorkJson.get("type");
			if (reviewState == 1) {
			if (reviewState == 1) {//审核通过
			reportingWork.setReviewed(reportingWork.getCreator());
			reportingWork.setReviewedState(1);
			} else {
			reportingWork.setReviewedState(0);
			}
			if(reportingWork.getReportingWorkTime()==null){
			LocalDateTime localDateTime = LocalDateTime.now();
			reportingWork.setReportingWorkTime(localDateTime);
			}

			reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
			@@ -252,14 +255,6 @@
			reportingWorkMapper.insert(reportingWork);
			//副表循环插入，并且插入次破信息表。再根据次破信息修改订单玻璃流程表的完工数量与刺破数量
			reportingWorkDetails.forEach(reportingWorkDetail -> {
			// reportingWork.setThisProcessQuantity(
			// reportingWork.getThisProcessQuantity()
			// +reportingWorkDetail.getCompletedQuantity()
			// +reportingWorkDetail.getBreakageQuantity());
			// reportingWork.setThisCompletedQuantity(
			// reportingWork.getThisCompletedQuantity()+reportingWorkDetail.getCompletedQuantity());
			// reportingWork.setThisWornQuantity(
			// reportingWork.getThisWornQuantity()+reportingWorkDetail.getBreakageQuantity());

			int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
			reportingWorkDetail.setReportingWorkId(reportingWorkId);
			@@ -330,7 +325,7 @@
			//根据订单id，订单序号，以及小片序号更新小片流程的完工数量以及刺破数量
			LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
			updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
			.eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14))
			.eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())
			.eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
			.eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
			.eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
			@@ -338,7 +333,6 @@
			.setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum())
			.setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());
			orderProcessDetailMapper.update(null, updateWrapper);

			//判断完工数量和刺破数量是否为0，为0则不插入到数据库
			if (!(reportingWorkDetail.getCompletedQuantity() == 0 && reportingWorkDetail.getBreakageQuantity() == 0)) {
			reportingWorkDetailMapper.insert(reportingWorkDetail);
			@@ -378,19 +372,20 @@
			int index = processId.lastIndexOf("/") + 1;
			String result = processId.substring(index);
			String technologyStr = reportingWork.get("technologyStr");

			String[] processIdStr = processId.split("/");
			//合片工序
			if (thisProcess.equals("夹胶") \|\| thisProcess.equals("中空") \|\| thisProcess.equals("包装")){
			LambdaUpdateWrapper
			<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
			updateWrapper
			.eq(ReportingWork::getProcessId, processId.substring(0, 14))
			.eq(ReportingWork::getProcessId, processIdStr[0])
			.eq(ReportingWork::getThisProcess, reportingWork.get("process"))
			.eq(ReportingWork::getReviewedState, 0)
			.setSql("reviewed_state =1")
			.set(ReportingWork::getReviewed, userName);
			reportingWorkMapper.update(null, updateWrapper);
			}else {
			reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr,userName);
			reportingWorkMapper.ReviewReportingWorkMp(processIdStr[0],reportingWork.get("process"),technologyStr,userName);

			}
			return true;
			@@ -422,8 +417,11 @@
			});

			Map<String, Object> map = new HashMap<>();
			//报工主表
			map.put("reportingWork", reportingWork);
			//报工明细
			map.put("reportingWorkDetails", reportingWorkDetails);
			//报工下拉框数据
			map.put("basic", getReportingWorkBase(reportingWork.getProcessId(), reportingWork.getThisProcess()));
			//根据报工编号获取层
			map.put("layer", reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId));
			@@ -440,8 +438,9 @@
			map.put("deviceType", reportingWorkMapper.SelectWorkBasicDeviceMp(thisProcess));
			//班组下拉框
			map.put("teamsType", reportingWorkMapper.SelectWorkBasicTeamsMp(thisProcess));

			//次破类型
			map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
			//次破原因
			map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));

			//获取该流程卡号历史报工工序
			@@ -477,7 +476,7 @@
			.delete(new LambdaQueryWrapper<ReportingWorkDetail>()
			.eq(ReportingWorkDetail::getReportingWorkId, reportingWork.getReportingWorkId()));

			//更细报工主表
			//更新报工主表
			int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
			reportingWorkMapper.updateById(reportingWork);
			reportingWorkDetails.forEach(reportingWorkDetail -> {
			@@ -490,6 +489,7 @@
			damageDetail.setProcessId(reportingWork.getProcessId());
			damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
			damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
			//是否修改质检状态
			if (!Objects.equals(reportingWork.getThisProcess(), damageDetail.getResponsibleProcess()) && qualityInsStatus==2) {
			damageDetail.setQualityInsStatus(1);
			}
			@@ -758,7 +758,7 @@
			//根据订单id，订单序号，以及小片序号更新小片流程的完工数量以及刺破数量
			LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
			updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
			.eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14))
			.eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())
			.eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
			.eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
			.eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())