north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -87,8 +87,12 @@ const titleSelectJson = ref({ processType: [], }) let date = new Date(endTime); // 将日期字符串转为 Date 对象 // 使用 setDate 方法加一天 date.setDate(date.getDate() + 1); let newEndTime = date.toISOString().split('T')[0]; // 获取 YYYY-MM-DD 格式的字符串 //第一次加载数据 request.post(`/report/selectProcessToBeCompleted/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => { request.post(`/report/selectProcessToBeCompleted/${startTime}/${newEndTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => { if (res.code == 200) { // total.dataTotal = res.data.total.total*1 @@ -111,8 +115,11 @@ if (inputVal == '') { inputVal = null } request.post(`/report/selectProcessToBeCompleted/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => { let date = new Date(endTime); // 将日期字符串转为 Date 对象 // 使用 setDate 方法加一天 date.setDate(date.getDate() + 1); let newEndTime = date.toISOString().split('T')[0]; // 获取 YYYY-MM-DD 格式的字符串 request.post(`/report/selectProcessToBeCompleted/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${inputVal}`, filterData.value).then((res) => { if (res.code == 200) { @@ -138,7 +145,11 @@ if (inputProject == '') { inputProject = null } request.post(`/report/selectProcessToBeCompleted/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => { let date = new Date(endTime); // 将日期字符串转为 Date 对象 // 使用 setDate 方法加一天 date.setDate(date.getDate() + 1); let newEndTime = date.toISOString().split('T')[0]; // 获取 YYYY-MM-DD 格式的字符串 request.post(`/report/selectProcessToBeCompleted/${startTime}/${newEndTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => { if (res.code == 200) { // total.dataTotal = res.data.total.total*1 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -98,4 +98,6 @@ List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess, String laminating); String getProcessLaminating(String process); String selectOrderid(String processIdStr); } north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -169,7 +169,7 @@ List<OrderGlassDetail> orderGlassDetailList = orderGlassDetailMapper.selectList( new QueryWrapper<OrderGlassDetail>() .eq("order_id", flowCard.getProcessId().substring(0, 10)) .eq("order_id", orderId) .eq("order_number", flowCard.getOrderNumber()) ); List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetailList); north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -149,7 +149,8 @@ //不是第一道工序，查询报工数据 List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating); if(process.equals("中空")){ String orderId = processIdStr.substring(0,10); //获取该流程卡订单号 String orderId = reportingWorkMapper.selectOrderid(processIdStr); details.forEach( detail -> { Integer glassId = orderGlassDetailMapper. getMinIdByGroup(orderId, @@ -166,7 +167,7 @@ //不是第一道工序，查询报工数据 List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating); if(process.equals("中空")){ String orderId = processIdStr.substring(0,10); String orderId = reportingWorkMapper.selectOrderid(processIdStr); details.forEach( detail -> { Integer glassId = orderGlassDetailMapper. getMinIdByGroup(orderId, @@ -320,7 +321,7 @@ //根据订单id，订单序号，以及小片序号 更新小片流程的完工数量以及刺破数量 LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber()) .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14)) .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId()) .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId()) .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess()) .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber()) @@ -328,7 +329,6 @@ .setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum()) .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum()); orderProcessDetailMapper.update(null, updateWrapper); //判断完工数量和刺破数量是否为0，为0则不插入到数据库 if (!(reportingWorkDetail.getCompletedQuantity() == 0 && reportingWorkDetail.getBreakageQuantity() == 0)) { reportingWorkDetailMapper.insert(reportingWorkDetail); @@ -368,19 +368,20 @@ int index = processId.lastIndexOf("/") + 1; String result = processId.substring(index); String technologyStr = reportingWork.get("technologyStr"); String[] processIdStr = processId.split("/"); //合片工序 if (thisProcess.equals("夹胶") || thisProcess.equals("中空") || thisProcess.equals("包装")){ LambdaUpdateWrapper <ReportingWork> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper .eq(ReportingWork::getProcessId, processId.substring(0, 14)) .eq(ReportingWork::getProcessId, processIdStr[0]) .eq(ReportingWork::getThisProcess, reportingWork.get("process")) .eq(ReportingWork::getReviewedState, 0) .setSql("reviewed_state =1") .set(ReportingWork::getReviewed, userName); reportingWorkMapper.update(null, updateWrapper); }else { reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr,userName); reportingWorkMapper.ReviewReportingWorkMp(processIdStr[0],reportingWork.get("process"),technologyStr,userName); } return true; @@ -753,7 +754,7 @@ //根据订单id，订单序号，以及小片序号 更新小片流程的完工数量以及刺破数量 LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber()) .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14)) .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId()) .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId()) .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess()) .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber()) north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -537,7 +537,8 @@ on o.order_id = od.order_id where LENGTH(fc.process_id) = 14 and odpd.process = #{selectProcesses} and DATE_FORMAT((o.create_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2} and rw.reporting_work_time >= #{selectTime1} AND rw.reporting_work_time < #{selectTime2} and position(#{orderId} in od.order_id) and position(#{inputProject} in o.project) and fc.quantity - odpd.reporting_work_num>0 @@ -628,7 +629,8 @@ AND dd.order_number = ogd.order_number AND dd.technology_number = ogd.technology_number WHERE DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2} rw.reporting_work_time >= #{selectTime1} AND rw.reporting_work_time < #{selectTime2} AND dd.available = 0 AND LENGTH( rw.process_id )= 14 <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''"> north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -1004,4 +1004,8 @@ <select id="getProcessLaminating"> select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process} </select> <select id="selectOrderid"> select order_id from pp.flow_card where process_id=#{processIdStr} group by order_id </select> </mapper>
