ERP_override.git

			@@ -17,7 +17,6 @@
			import com.example.erp.entity.userInfo.Log;
			import com.example.erp.entity.userInfo.SysError;
			import com.example.erp.exception.ServiceException;
			import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
			import com.example.erp.mapper.mm.FinishedOperateLogMapper;
			import com.example.erp.mapper.pp.*;
			import com.baomidou.dynamic.datasource.annotation.DS;
			@@ -71,7 +70,7 @@
			private final RestTemplate restTemplate;
			private final PatchLogMapper patchLogMapper;
			private final ReworkMapper reworkMapper;
			private final BasicDateMapper basicDataMapper;
			private final BasicDataMapper basicDataMapper;
			private final FinishedGoodsInventoryService finishedGoodsInventoryService;


			@@ -255,6 +254,8 @@
			reportingWork.setReportingWorkId(reportingWorkId);
			String[] processIdStr = reportingWork.getProcessId().split("/");
			reportingWork.setProcessId(processIdStr[0]);
			reportingWork.setThisWornQuantity(0);
			reportingWork.setThisCompletedQuantity(0);

			int reviewState = (int) reportingWorkJson.get("type");
			if (reviewState == 1) {//审核通过
			@@ -273,7 +274,13 @@
			//主表插入
			reportingWorkMapper.insert(reportingWork);
			//副表循环插入，并且插入次破信息表。再根据次破信息修改订单玻璃流程表的完工数量与刺破数量
			final Integer[] maxTechnologyNumber = {0,0};
			reportingWorkDetails.forEach(reportingWorkDetail -> {
			//合片数量汇总减少
			if(Integer.parseInt(reportingWorkDetail.getTechnologyNumber()) > maxTechnologyNumber[0]){
			maxTechnologyNumber[0] = Integer.valueOf(reportingWorkDetail.getTechnologyNumber());
			maxTechnologyNumber[1]+=1;
			}
			reportingWork.setThisCompletedQuantity(reportingWork.getThisCompletedQuantity() + reportingWorkDetail.getCompletedQuantity());
			reportingWork.setThisWornQuantity(reportingWork.getThisWornQuantity() + reportingWorkDetail.getBreakageQuantity());
			int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
			@@ -382,6 +389,11 @@


			});
			//获取报工工序是否为复合工程

			reportingWork.setThisCompletedQuantity(reportingWork.getThisCompletedQuantity()/maxTechnologyNumber[1]);


			reportingWorkMapper.update(reportingWork, new LambdaUpdateWrapper<ReportingWork>()
			.eq(ReportingWork::getId, reportingWork.getId()));

			@@ -1169,7 +1181,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;
			@@ -1203,10 +1218,12 @@

			}

			public List<BasicDataProduce> selectEquipmentByProcessSv(String process) {
			return reportingWorkMapper.SelectWorkBasicDeviceMp(process);
			}

			public String saveWorkStorage(Map<String, Object> object) {
			//List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
			//finishedGoodsInventoryService.addSelectWarehousing(object);
			return null;
			}
			}
			public String saveWorkStorage(Map<String, Object> object) {
			//List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
			//finishedGoodsInventoryService.addSelectWarehousing(object);
			return null;
			}}