ERP_override.git

			@@ -10,10 +10,7 @@
			import com.example.erp.common.Constants;
			import com.example.erp.dto.pp.OrderNumberTransferDTO;
			import com.example.erp.entity.pp.*;
			import com.example.erp.entity.sd.BasicData;
			import com.example.erp.entity.sd.Order;
			import com.example.erp.entity.sd.OrderDetail;
			import com.example.erp.entity.sd.OrderProcessDetail;
			import com.example.erp.entity.sd.*;
			import com.example.erp.entity.userInfo.Log;
			import com.example.erp.entity.userInfo.SysError;
			import com.example.erp.exception.ServiceException;
			@@ -452,6 +449,7 @@




			List<Map<String, Object>> reportingWorkDetails = reportingWorkMapper.selectByReportingWorkId(reportingWorkId, reportingWork.getNextProcess());
			reportingWorkDetails.forEach(reportingWorkDetail -> {
			List<DamageDetails> damageDetailsList = new ArrayList<>();
			@@ -587,15 +585,29 @@
			}

			//报工管理查询
			public Map<String, Object> selectReportingWorkSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, String orderId, ReportingWork reportingWork) {
			public Map<String, Object> selectReportingWorkSv(Integer pageNum, Integer pageSize, List<String> selectDate, String orderId, ReportingWork reportingWork) {
			Integer offset = (pageNum - 1) * pageSize;
			if ("null".equals(orderId)) {
			orderId = "";
			}
			String endDate = LocalDate.now().toString();
			String startDate = LocalDate.now().minusDays(3).toString();
			if(selectDate !=null && selectDate.size()==2){
			if(!selectDate.get(0).isEmpty()){
			startDate = selectDate.get(0);
			}
			if(!selectDate.get(1).isEmpty()){
			endDate = selectDate.get(1);
			}
			}
			Map<String, Object> map = new HashMap<>();
			map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
			map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, startDate, endDate, orderId, reportingWork));
			// map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
			map.put("total" ,reportingWorkMapper.getFootSum(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
			map.put("total" ,reportingWorkMapper.getFootSum(offset, pageSize, startDate, endDate, orderId, reportingWork));
			List<String> list = new ArrayList<>();
			list.add(startDate);
			list.add(endDate);
			map.put("selectDate",list);
			return map;
			}

			@@ -615,6 +627,28 @@
			if (transferState !=3){
			//判断是否有补片返工数据
			if (countStates==0){
			//当下工序未审核则删除本工序
			ReportingWork reportingWork = reportingWorkMapper.selectOne(new LambdaQueryWrapper<ReportingWork>()
			.eq(ReportingWork::getReportingWorkId, reportingWorkId));
			//保存日志
			Log log = new Log();
			log.setContent(reportingWorkId+"-"+processId+"-"+thisProcess);
			log.setFunction("deleteWork报工删除");
			log.setOperatorId(userId);
			log.setOperator(userName);
			if(reportingWork.getReviewedState()==0){
			//查询当前报工编号完工次破数量的数据
			List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
			for (Map<String, Object> item : workDateList) {
			//更新报工流程表数据
			reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
			}
			//删除报工，将审核状态改为-1
			reportingWorkMapper.deleteWork(reportingWorkId);
			logService.saveLog(log);
			return true;
			}

			//判断是否是入库工序
			if (lastProcess.equals(thisProcess)) {//是入库工序
			//查询该流程卡数量、可入库数量、已入库数量
			@@ -641,12 +675,6 @@
			}
			//删除报工，将审核状态改为-1
			reportingWorkMapper.deleteWork(reportingWorkId);
			//保存日志
			Log log = new Log();
			log.setContent(reportingWorkId+"-"+processId+"-"+thisProcess);
			log.setFunction("deleteWork报工入库删除");
			log.setOperatorId(userId);
			log.setOperator(userName);
			logService.saveLog(log);
			return true;
			} else {
			@@ -662,15 +690,11 @@
			//更新报工流程表数据
			reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
			}
			System.out.println(1);
			//删除报工，将审核状态改为-1
			reportingWorkMapper.deleteWork(reportingWorkId);

			//保存日志
			Log log = new Log();
			log.setContent(reportingWorkId+"-"+processId+"-"+thisProcess);
			log.setFunction("deleteWork报工删除");
			log.setOperatorId(userId);
			log.setOperator(userName);

			logService.saveLog(log);
			return true;
			} else {
			@@ -1181,7 +1205,10 @@
			date.add(endDate);
			Map<String, Object> result = new HashMap<>();
			BasicData basicData = basicDataMapper
			.selectOne(new QueryWrapper<BasicData>().eq("basic_name", reportingWork.get("process")));
			.selectOne(new QueryWrapper<BasicData>()
			.eq("basic_name", reportingWork.get("process"))
			.last("limit 1")
			);
			result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate,basicData==null?null:basicData.getNickname()));
			result.put("date",date);
			return result;
			@@ -1201,14 +1228,20 @@
			date.add(startDate);
			date.add(endDate);
			Map<String, Object> result = new HashMap<>();
			result.put("data",reportingWorkMapper.selectList(
			List<ReportingWork> reportingWorkList = reportingWorkMapper.selectList(
			new QueryWrapper<ReportingWork>().nested(
			reportingWork.get("process")!=null,
			wrapper-> wrapper.eq("creator_id",reportingWork.get("userId"))//当工序为空时，查询所有报工信息
			)
			.gt("reviewed_state",-1)
			.between("date(reporting_work_time)",startDate,endDate)
			.orderByDesc("id")));
			.orderByDesc("id"));
			reportingWorkList.forEach(reportingWork1 -> {
			String Plies = reportingWorkDetailMapper.getGlassPliesCount(reportingWork1.getReportingWorkId());
			reportingWork1.setProcessId(reportingWork1.getProcessId()+'/'+Plies);
			});

			result.put("data",reportingWorkList);
			result.put("date",date);

			return result;