chenlu
2024-05-16 4c34765701734c7909df0e7fecbfecf8ff0bd9b2
修改前端返回异常方法
5个文件已修改
56 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -60,17 +60,16 @@
    }
    case 'delete': {
      request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
        if (res.code == 200) {
        if (res.code == 200 && res.data===true) {
          ElMessage.success(t('workOrder.deleteOk'))
          router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
        } else {
          console.log(111)
          ElMessage.warning(res.msg)
          ElMessage.warning('删除失败,检查流程卡是否已报工')
        }
      }).catch((err) =>{
        ElMessage.warning('删除失败,检查是否已报工')
      })
      break
    }
  }
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -23,7 +23,7 @@
    }
    case 'delete':{
      request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${row.processId}/${row.thisProcess}`).then((res) => {
        if (res.code == 200 && res.code===true) {
        if (res.code == 200 && res.data===true) {
          ElMessage.success(t('workOrder.deleteOk'))
          router.push({path: '/main/reportingWorks/SelectReportingWorks', query: {random:Math.random()}})
        } else {
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -32,16 +32,15 @@
      let endTime = form.date1[1]
      let state = optionVal.value
        request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
        if (res.code == 200) {
          ElMessage.success(t('workOrder.deleteOk'))
          //location.reload();
          router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
        } else {
          ElMessage.warning(res.msg)
        }
      }).catch((err) =>{
          ElMessage.warning('删除失败,检查是否已分架')
        })
          if (res.code == 200 && res.data===true) {
            ElMessage.success(t('workOrder.deleteOk'))
            router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
          } else {
            ElMessage.warning('删除失败,检查是否已分架')
          }
      })
      break
    }
  }
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -70,12 +70,13 @@
            @PathVariable String orderId,
            @PathVariable String processId
    ){
        if(flowCardService.deleteFlowCardSv(orderId,processId)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败,请检查是否已报工");
        }
//        if(flowCardService.deleteFlowCardSv(orderId,processId)){
//            return Result.seccess();
//        }else {
//            throw new ServiceException(Constants.Code_500,"删除失败,请检查是否已报工");
//
//        }
        return  Result.seccess(flowCardService.deleteFlowCardSv(orderId,processId));
    }
    //修改排版状态
north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
@@ -67,11 +67,12 @@
            @PathVariable String orderId,
            @PathVariable String productionId
    ){
        if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");
        }
//        if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
//            return Result.seccess();
//        }else {
//            throw new ServiceException(Constants.Code_500,"删除失败");
//
//        }
        return  Result.seccess(workOrderService.deleteOrderWorkSv(orderId,productionId));
    }
}