派生自 ERP_override
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -20,7 +20,6 @@ import com.example.erp.mapper.sd.OrderMapper; import com.example.erp.mapper.sd.OrderProcessDetailMapper; import com.example.erp.service.sd.OrderProcessDetailService; import lombok.val; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,15 +40,16 @@ OrderProcessDetailMapper orderProcessDetailMapper; final ReportingWorkDetailMapper reportingWorkDetailMapper; reportingWorkDetailMapper; final OrderMapper orderMapper; orderMapper; final FlowCardMapper flowCardMapper; final OrderProcessDetailService orderProcessDetailService; public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper) { @@ -96,8 +96,8 @@ } //System.out.println("当前工序：" + process + " 上一道工序：" + previousProcess + " 下一道工序：" + nextProcess); //查询当前工序的表头数据 //System.out.println(reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr,previousProcess,nextProcess,process)); map.put("data", 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; } @@ -108,19 +108,20 @@ //班组下拉框 map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process)); map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype")); map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason")); map.put("breakageType",reportingWorkMapper.selectBasicNameByType("breakagetype")); map.put("breakageReason",reportingWorkMapper.selectBasicNameByType("breakagereason")); //查询本工序报工需要哪几层，上工序是什么 String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr); String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr); //判断本工序是不是第一道工序 if (interceptProcess.equals(process)) { //是第一道工序，查询流程卡数据 map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process)); } else { map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr,technologyStr,process)); } else { //不是第一道工序，查询报工数据 map.put("Detail", reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process)); map.put("Detail", reportingWorkMapper.SelectReworlDetailMp(processIdStr,technologyStr,process)); } // 第一道工序（流程卡数+补片数量-完工数-次破数-返工未完成数-禁用数量） @@ -128,13 +129,14 @@ // 后续工序（上工序报工数-完工数-次破数-返工未完成数） //获取该流程卡号历史报工工序 String historyProcess = reportingWorkMapper.historyProcessMp(processIdStr); String historyProcess =reportingWorkMapper.historyProcessMp(processIdStr); //历史报工工序设备 map.put("historyDevice", reportingWorkMapper.historyDeviceMp(historyProcess, process)); map.put("historyDevice",reportingWorkMapper.historyDeviceMp(historyProcess,process)); //历史报工工序班组 map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process)); map.put("historyTeams",reportingWorkMapper.historyTeamsMp(processIdStr,process)); //历史工序 map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process)); map.put("historyProcess",reportingWorkMapper.SelectHistoryProcessMp(historyProcess,process)); return map; @@ -154,31 +156,41 @@ ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class); List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class); //获取当前最大报工单号生成报工单号 String formattedNumber = String.format("%04d", reportingWorkMapper.selectMaxReportingWorkId() + 1); String formattedNumber = String.format("%04d", reportingWorkMapper.selectMaxReportingWorkId()+1); //格式化当前日期 Date currentDate = new Date(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd"); String formattedDate = dateFormat.format(currentDate); String reportingWorkId = "BG" + formattedDate + formattedNumber; String reportingWorkId = "BG"+formattedDate+formattedNumber; reportingWork.setReportingWorkId(reportingWorkId); reportingWork.setProcessId(reportingWork.getProcessId().substring(0, 13)); reportingWork.setProcessId(reportingWork.getProcessId().substring(0,13)); int reviewState = (int) reportingWorkJson.get("type"); if (reviewState == 1) { if(reviewState==1){ reportingWork.setReviewed(reportingWork.getCreator()); reportingWork.setReviewedState(1); } else { }else{ reportingWork.setReviewedState(0); } //主表插入 reportingWorkMapper.insert(reportingWork); //副表循环插入，并且插入次破信息表。再根据次破信息修改订单玻璃流程表的完工数量与刺破数量 reportingWorkDetails.forEach(reportingWorkDetail -> { // reportingWork.setThisProcessQuantity( // reportingWork.getThisProcessQuantity() // +reportingWorkDetail.getCompletedQuantity() // +reportingWorkDetail.getBreakageQuantity()); // reportingWork.setThisCompletedQuantity( // reportingWork.getThisCompletedQuantity()+reportingWorkDetail.getCompletedQuantity()); // reportingWork.setThisWornQuantity( // reportingWork.getThisWornQuantity()+reportingWorkDetail.getBreakageQuantity()); reportingWorkDetail.setReportingWorkId(reportingWorkId); List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails(); if (damageDetails != null && !damageDetails.isEmpty()) { damageDetails.forEach(damageDetail -> { //次破明细表插入数据 if(damageDetails!=null && !damageDetails.isEmpty()){ damageDetails.forEach(damageDetail ->{ damageDetail.setReportingWorkId(reportingWorkId); damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber()); damageDetail.setProcessId(reportingWork.getProcessId()); @@ -202,7 +214,7 @@ reportingWork.getProcessId(), reportingWork.getThisProcess() ); } else { }else{ processNum = reportingWorkMapper.selectGlassProcessNum( reportingWorkDetail.getOrderNumber(), reportingWorkDetail.getTechnologyNumber(), @@ -213,14 +225,14 @@ //判断是否大于当前数量并且抛出异常 if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) { 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()); if(processNum<(reportingWorkDetail.getBreakageQuantity()+reportingWorkDetail.getCompletedQuantity())){ 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); throw new ServiceException(Constants.Code_600,msg); } OrderProcessDetail orderProcessDetail = new OrderProcessDetail(); @@ -231,68 +243,142 @@ //根据订单id，订单序号，以及小片序号 更新小片流程的完工数量以及刺破数量 LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber()) .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 13)) .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0,13)) .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 =reporting_work_num +" + orderProcessDetail.getReportingWorkNum()) .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum()); orderProcessDetailMapper.update(null, updateWrapper); .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(), "")) { 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); .setSql("inventory_quantity = inventory_quantity +"+orderProcessDetail.getReportingWorkNum()); flowCardMapper.update(null,flowCardLambdaUpdateWrapper); } }); return true; return true; } //下工序审核方法 public boolean ReviewReportingWorkSv(Map<String, String> reportingWork) { String processId = reportingWork.get("processId"); 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) .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); reportingWorkMapper.update(null,updateWrapper); return true; return true; } public Map<String, Object> selectUpdateReportingWorkSv(String reportingWorkId) { ReportingWork reportingWork = reportingWorkMapper.selectOne(new LambdaQueryWrapper<ReportingWork>() .eq(ReportingWork::getReportingWorkId, reportingWorkId)); //报工修改查询 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()))); orderMapper.selectOne(new LambdaQueryWrapper<Order>() .eq(Order::getOrderId,reportingWork.getOrderId()))); reportingWork.setFlowCard(new FlowCard()); List<ReportingWorkDetail> reportingWorkDetails = reportingWorkDetailMapper.selectByreportingWorkId(reportingWorkId); List<Map<String,Object>> reportingWorkDetails = reportingWorkMapper.selectByReportingWorkId(reportingWorkId,reportingWork.getNextProcess()); reportingWorkDetails.forEach(reportingWorkDetail ->{ List<DamageDetails> damageDetailsList = new ArrayList<>(); damageDetailsList = damageDetailsMapper.selectList(new LambdaQueryWrapper<DamageDetails>() .eq(DamageDetails::getReportingWorkId,reportingWorkId) .eq(DamageDetails::getOrderNumber,reportingWorkDetail.get("order_number")) .eq(DamageDetails::getTechnologyNumber,reportingWorkDetail.get("technology_number")) ); reportingWorkDetail.put("damageDetails",damageDetailsList); }); Map<String, Object> map = new HashMap<>(); map.put("reportingWork", reportingWork); map.put("reportingWorkDetails", reportingWorkDetails); Map<String,Object> map = new HashMap<>(); map.put("reportingWork",reportingWork); map.put("reportingWorkDetails",reportingWorkDetails); map.put("basic",getReportingWorkBase(reportingWork.getProcessId(),reportingWork.getThisProcess())); return map; } private Map<String,Object> getReportingWorkBase(String processId, String thisProcess) { Map<String,Object> map = new HashMap<>(); //设备下拉框 map.put("deviceType", reportingWorkMapper.SelectWorkBasicDeviceMp(thisProcess)); //班组下拉框 map.put("teamsType", reportingWorkMapper.SelectWorkBasicTeamsMp(thisProcess)); map.put("breakageType",reportingWorkMapper.selectBasicNameByType("breakagetype")); map.put("breakageReason",reportingWorkMapper.selectBasicNameByType("breakagereason")); //获取该流程卡号历史报工工序 String historyProcess =reportingWorkMapper.historyProcessMp(processId); //历史报工工序设备 map.put("historyDevice",reportingWorkMapper.historyDeviceMp(historyProcess,thisProcess)); //历史报工工序班组 map.put("historyTeams",reportingWorkMapper.historyTeamsMp(processId,thisProcess)); //历史工序 map.put("historyProcess",reportingWorkMapper.SelectHistoryProcessMp(historyProcess,thisProcess)); return map; } @Transactional //报工修改 public Boolean updateReportingWork(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); //删除刺破明细表刺破数据 damageDetailsMapper.delete( new LambdaQueryWrapper<DamageDetails>() .eq(DamageDetails::getReportingWorkId,reportingWork.getReportingWorkId()) ); //修改小片流程表数量 orderProcessDetailMapper.updateQuantity(reportingWork.getReportingWorkId(),reportingWork.getThisProcess(),"delete"); //删除报工明细表数据 reportingWorkDetailMapper .delete(new LambdaQueryWrapper<ReportingWorkDetail>() .eq(ReportingWorkDetail::getReportingWorkId,reportingWork.getReportingWorkId())); //更细报工主表 reportingWorkMapper.updateById(reportingWork); reportingWorkDetails.forEach(reportingWorkDetail->{ List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails(); //每一条报工数据循环插入次破明细表 if(damageDetails!=null && !damageDetails.isEmpty()){ damageDetails.forEach(damageDetailsMapper::insert); } //插入报工数据 reportingWorkDetailMapper.insert(reportingWorkDetail); }); //修改小片流程表数量为报工明细表数量 orderProcessDetailMapper.updateQuantity(reportingWork.getReportingWorkId(),reportingWork.getThisProcess(),"add"); return true; } //报工管理查询 public Map<String, Object> selectReportingWorkSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, String orderId, ReportingWork reportingWork) { Integer offset = (pageNum - 1) * pageSize;
