ERP_override.git

			@@ -10,6 +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;
			@@ -19,10 +20,7 @@
			import com.example.erp.mapper.mm.FinishedOperateLogMapper;
			import com.example.erp.mapper.pp.*;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.example.erp.mapper.sd.OrderDetailMapper;
			import com.example.erp.mapper.sd.OrderGlassDetailMapper;
			import com.example.erp.mapper.sd.OrderMapper;
			import com.example.erp.mapper.sd.OrderProcessDetailMapper;
			import com.example.erp.mapper.sd.*;
			import com.example.erp.mapper.userInfo.LogMapper;
			import com.example.erp.service.sd.OrderProcessDetailService;
			import com.example.erp.service.userInfo.LogService;
			@@ -71,6 +69,7 @@
			private final RestTemplate restTemplate;
			private final PatchLogMapper patchLogMapper;
			private final ReworkMapper reworkMapper;
			private final BasicDateMapper basicDataMapper;


			/*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) {
			@@ -218,6 +217,8 @@
			public Map<String, Object> SelectProcessSv(String userId) {
			Map<String, Object> map = new HashMap<>();
			String process = reportingWorkMapper.selectUserProcess(userId);
			//工序列表
			List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
			if (process==null) {
			map.put("process", reportingWorkMapper.SelectProcessMp());
			}
			@@ -230,7 +231,7 @@
			map.put("process",reportingWorkMapper.getSelectProcessDuoqu() );
			}
			}

			map.put("processNameList", processNameList);
			return map;
			}

			@@ -404,7 +405,7 @@
			//获取报工工序是否为复合工程
			String laminating = reportingWorkMapper.getProcessLaminating(thisProcess);
			//合片工序
			if (laminating.equals("laminating")){
			if (laminating.indexOf("step")!=-1){
			LambdaUpdateWrapper
			<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
			updateWrapper
			@@ -577,8 +578,8 @@
			}
			Map<String, Object> map = new HashMap<>();
			map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
			map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
			map.put("footSum" ,reportingWorkMapper.getFootSum(selectTime1, selectTime2, orderId,reportingWork));
			// map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
			map.put("total" ,reportingWorkMapper.getFootSum(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
			return map;
			}

			@@ -1163,7 +1164,9 @@
			date.add(startDate);
			date.add(endDate);
			Map<String, Object> result = new HashMap<>();
			result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate));
			BasicData basicData = basicDataMapper
			.selectOne(new QueryWrapper<BasicData>().eq("basic_name", reportingWork.get("process")));
			result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate,basicData.getNickname()));
			result.put("date",date);
			return result;
			}