| | |
| | | //暂时取消 |
| | | for(let item of uniqueByOrderNum){ |
| | | if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框')){ |
| | | ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':' |
| | | ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}: |
| | | ${item.order_number} |
| | | ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`) |
| | | return false |
| | |
| | | |
| | | } |
| | | |
| | | @ApiOperation("APP质检审核查询接口") |
| | | @SaCheckPermission("qualityInspectionReview.search") |
| | | @PostMapping ("qualityReviewSearch") |
| | | public Result qualityReviewSearch(){ |
| | | return Result.seccess(reportingWorkService.qualityReviewSearchSv()); |
| | | } |
| | | |
| | | @ApiOperation("质检审核审核") |
| | | @SaCheckPermission("qualityInspectionReview.review") |
| | | @PostMapping ("/updateQualityStatus/{reportingWorkId}/{username}") |
| | |
| | | Map<String,Float> getFootSum(Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork); |
| | | |
| | | Integer selectReviewedState(String reportingWorkId); |
| | | |
| | | List<ReportingWork> qualityReviewSearchMp(); |
| | | } |
| | |
| | | return map; |
| | | } |
| | | |
| | | public Map<String, Object> qualityReviewSearchSv() { |
| | | Map<String, Object> map = new HashMap<>(); |
| | | map.put("data", reportingWorkMapper.qualityReviewSearchMp()); |
| | | return map; |
| | | } |
| | | |
| | | //修改质检审核状态 |
| | | public Boolean updateQualityStatusSv(String reportingWorkId, String username) { |
| | | if (!reportingWorkId.isEmpty()) { |
| | |
| | | return result; |
| | | |
| | | } |
| | | |
| | | |
| | | } |
| | |
| | | <select id="selectReviewedState"> |
| | | select reviewed_state from pp.reporting_work where reporting_work_id=#{reportingWorkId}; |
| | | </select> |
| | | |
| | | <select id="qualityReviewSearchMp"> |
| | | select rw.reporting_work_id, |
| | | rw.reporting_work_time, |
| | | rw.process_id, |
| | | o.project, |
| | | o.customer_name, |
| | | rw.this_process, |
| | | ifnull(rw.this_completed_quantity,0) as this_completed_quantity, |
| | | rw.this_worn_quantity, |
| | | rw.teams_groups_name, |
| | | rw.device_name, |
| | | rw.previous_process, |
| | | rw.next_process, |
| | | rw.quality_inspector, |
| | | rw.quality_ins_time, |
| | | dd.quality_ins_status |
| | | from sd.order as o |
| | | left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id |
| | | left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id |
| | | |
| | | right join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id |
| | | where rw.reviewed_state != 2 |
| | | and dd.quality_ins_status = 1 |
| | | and rw.reviewed_state!=-1 |
| | | GROUP BY rw.reporting_work_id |
| | | ORDER BY rw.reporting_work_id desc |
| | | </select> |
| | | </mapper> |