~admin/ERP_override.git

			@@ -1,22 +1,23 @@
			package com.example.erp.service.pp;

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
			import com.example.erp.common.Constants;
			import com.example.erp.entity.pp.DamageDetails;
			import com.example.erp.entity.pp.FlowCard;
			import com.example.erp.entity.pp.ReportingWork;
			import com.example.erp.entity.pp.ReportingWorkDetail;
			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.exception.ServiceException;
			import com.example.erp.mapper.pp.BasicDateProduceMapper;
			import com.example.erp.mapper.pp.DamageDetailsMapper;
			import com.example.erp.mapper.pp.ReportingWorkDetailMapper;
			import com.example.erp.mapper.pp.ReportingWorkMapper;
			import com.example.erp.mapper.pp.*;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.example.erp.mapper.sd.OrderMapper;
			import com.example.erp.mapper.sd.OrderProcessDetailMapper;
			import com.example.erp.service.sd.OrderProcessDetailService;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -24,10 +25,7 @@
			import org.springframework.transaction.annotation.Transactional;

			import java.text.SimpleDateFormat;
			import java.util.Date;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.*;

			@Service
			@DS("pp")
			@@ -43,19 +41,26 @@
			final
			ReportingWorkDetailMapper
			reportingWorkDetailMapper;
			final OrderMapper
			orderMapper;

			final
			FlowCardMapper flowCardMapper;

			final
			OrderProcessDetailService orderProcessDetailService;



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

			public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {
			@@ -91,7 +96,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;
			@@ -159,6 +164,14 @@
			String reportingWorkId = "BG"+formattedDate+formattedNumber;
			reportingWork.setReportingWorkId(reportingWorkId);
			reportingWork.setProcessId(reportingWork.getProcessId().substring(0,13));

			int reviewState = (int) reportingWorkJson.get("type");
			if(reviewState==1){
			reportingWork.setReviewed(reportingWork.getCreator());
			reportingWork.setReviewedState(1);
			}else{
			reportingWork.setReviewedState(0);
			}
			//主表插入
			reportingWorkMapper.insert(reportingWork);

			@@ -203,25 +216,19 @@

			//判断是否大于当前数量并且抛出异常
			if(processNum<(reportingWorkDetail.getBreakageQuantity()+reportingWorkDetail.getCompletedQuantity())){
			// System.out.println(processNum);
			// System.out.println(reportingWorkDetail.getBreakageQuantity());
			// System.out.println(reportingWorkDetail.getCompletedQuantity());
			throw new ServiceException(Constants.Code_600,"当前工序数量大于流程卡表数量");
			Map<String,Object> map = new HashMap<>();
			map.put("orderNumber",reportingWorkDetail.getOrderNumber());
			map.put("technologyNumber",reportingWorkDetail.getOrderNumber());
			map.put("processNum",processNum);
			map.put("sumNum",reportingWorkDetail.getBreakageQuantity()+reportingWorkDetail.getCompletedQuantity());
			String msg = JSON.toJSONString(map);
			throw new ServiceException(Constants.Code_600,msg);
			}





			OrderProcessDetail orderProcessDetail = new OrderProcessDetail();
			orderProcessDetail.setBrokenNum(reportingWorkDetail.getBreakageQuantity());
			orderProcessDetail.setReportingWorkNum(reportingWorkDetail.getCompletedQuantity());
			orderProcessDetail.setReportingWorkNumCount(reportingWorkDetail.getCompletedQuantity());






			//根据订单id，订单序号，以及小片序号更新小片流程的完工数量以及刺破数量
			LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
			@@ -230,13 +237,61 @@
			.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.getReportingWorkNum())
			.setSql("reporting_work_num_count = reporting_work_num_count +"+orderProcessDetail.getReportingWorkNum())
			.setSql("reporting_work_num =reporting_work_num +"+orderProcessDetail.getReportingWorkNum())
			.setSql("broken_num =broken_num +"+orderProcessDetail.getBrokenNum());

			orderProcessDetailMapper.update(null,updateWrapper);
			reportingWorkDetailMapper.insert(reportingWorkDetail);
			//更新流程卡表的报工数量
			if(Objects.equals(reportingWork.getNextProcess(), "")){
			LambdaUpdateWrapper<FlowCard> flowCardLambdaUpdateWrapper =
			new LambdaUpdateWrapper<>();
			flowCardLambdaUpdateWrapper
			.eq(FlowCard::getProcessId, reportingWork.getProcessId())
			.eq(FlowCard::getOrderNumber, reportingWorkDetail.getOrderNumber())
			.eq(FlowCard::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
			.setSql("inventory_quantity = inventory_quantity +"+orderProcessDetail.getReportingWorkNum());
			flowCardMapper.update(null,flowCardLambdaUpdateWrapper);
			}


			});
			return false;
			return true;
			}

			//下工序审核方法
			public boolean ReviewReportingWorkSv(Map<String, String> reportingWork) {

			String processId = reportingWork.get("processId");

			LambdaUpdateWrapper
			<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
			updateWrapper
			.eq(ReportingWork::getProcessId, processId.substring(0,13))
			.eq(ReportingWork::getThisProcess,reportingWork.get("process"))
			.eq(ReportingWork::getReviewedState,0)
			.setSql("reviewed_state =1");
			reportingWorkMapper.update(null,updateWrapper);


			return true;
			}

			public Map<String,Object> selectUpdateReportingWorkSv(String reportingWorkId) {
			ReportingWork reportingWork =reportingWorkMapper.selectOne(new LambdaQueryWrapper<ReportingWork>()
			.eq(ReportingWork::getReportingWorkId,reportingWorkId));
			reportingWork.setOrder(
			orderMapper.selectOne(new LambdaQueryWrapper<Order>()
			.eq(Order::getOrderId,reportingWork.getOrderId())));
			reportingWork.setFlowCard(new FlowCard());

			List<ReportingWorkDetail> reportingWorkDetails = reportingWorkDetailMapper.selectByreportingWorkId(reportingWorkId);


			Map<String,Object> map = new HashMap<>();
			map.put("reportingWork",reportingWork);
			map.put("reportingWorkDetails",reportingWorkDetails);
			return map;

			}
			}