~admin/ERP_override.git

			@@ -2,6 +2,8 @@

			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
			import com.example.erp.entity.pp.DamageDetails;
			import com.example.erp.entity.pp.ReportingWork;
			import com.example.erp.entity.pp.ReportingWorkDetail;
			@@ -13,8 +15,11 @@
			import com.example.erp.mapper.pp.ReportingWorkDetailMapper;
			import com.example.erp.mapper.pp.ReportingWorkMapper;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.example.erp.mapper.sd.OrderProcessDetailMapper;
			import com.example.erp.service.sd.OrderProcessDetailService;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import java.text.SimpleDateFormat;
			import java.util.Date;
			@@ -32,15 +37,23 @@
			final
			DamageDetailsMapper damageDetailsMapper;
			final
			OrderProcessDetailMapper orderProcessDetailMapper;
			final
			ReportingWorkDetailMapper
			reportingWorkDetailMapper;

			final
			OrderProcessDetailService orderProcessDetailService;

			public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper) {


			public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService) {
			this.reportingWorkMapper = reportingWorkMapper;
			this.basicDateProduceMapper = basicDateProduceMapper;
			this.damageDetailsMapper = damageDetailsMapper;
			this.reportingWorkDetailMapper = reportingWorkDetailMapper;
			this.orderProcessDetailMapper = orderProcessDetailMapper;
			this.orderProcessDetailService = orderProcessDetailService;
			}

			public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {
			@@ -76,7 +89,7 @@
			}
			//System.out.println("当前工序：" + process + " 上一道工序：" + previousProcess + " 下一道工序：" + nextProcess);
			//查询当前工序的表头数据
			System.out.println(reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr,previousProcess,nextProcess,process));
			// System.out.println(reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr,previousProcess,nextProcess,process));
			map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr,previousProcess,nextProcess,process));
			map.put("thisProcess", processList);
			break;
			@@ -97,7 +110,7 @@
			//判断本工序是不是第一道工序
			if (interceptProcess.equals(process)) {
			//是第一道工序，查询流程卡数据
			map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr,technologyStr));
			map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr,technologyStr,process));
			}
			else {
			//不是第一道工序，查询报工数据
			@@ -128,11 +141,14 @@
			return map;
			}

			//报工新增
			@Transactional
			public boolean SaveReportingWorkSv(Map<String, Object> reportingWorkMap) {
			//接收解析主附表信息
			JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
			ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
			List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);
			//System.out.println(reportingWork);
			//获取当前最大报工单号生成报工单号
			String formattedNumber = String.format("%04d", reportingWorkMapper.selectMaxReportingWorkId()+1);
			//格式化当前日期
			Date currentDate = new Date();
			@@ -141,9 +157,10 @@
			String reportingWorkId = "BG"+formattedDate+formattedNumber;
			reportingWork.setReportingWorkId(reportingWorkId);
			reportingWork.setProcessId(reportingWork.getProcessId().substring(0,13));

			//主表插入
			reportingWorkMapper.insert(reportingWork);

			//副表循环插入，并且插入次破信息表。再根据次破信息修改订单玻璃流程表的完工数量与刺破数量
			reportingWorkDetails.forEach(reportingWorkDetail -> {
			reportingWorkDetail.setReportingWorkId(reportingWorkId);
			List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
			@@ -157,11 +174,24 @@
			});
			}
			//System.out.println(reportingWorkDetail);
			OrderProcessDetail orderProcessDetail = new OrderProcessDetail();
			orderProcessDetail.setBrokenNum(reportingWorkDetail.getBreakageQuantity());
			orderProcessDetail.setReportingWorkNum(reportingWorkDetail.getCompletedQuantity());
			orderProcessDetail.setReportingWorkNumCount(reportingWorkDetail.getCompletedQuantity());

			//根据订单id，订单序号，以及小片序号更新小片流程的完工数量以及刺破数量
			LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
			updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
			.eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
			.eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
			.eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
			.setSql("reporting_work_num_count =reporting_work_num_count +"+orderProcessDetail.getReportingWorkNumCount())
			.setSql("reporting_work_num =reporting_work_num +"+orderProcessDetail.getReportingWorkNum())
			.setSql("broken_num =broken_num +"+orderProcessDetail.getBrokenNum());

			orderProcessDetailMapper.update(null,updateWrapper);
			reportingWorkDetailMapper.insert(reportingWorkDetail);
			});



			return false;
			}
			}