廖井涛
2024-05-16 b79c8277a4a7a2e137e20055fbcd7339daaab7da
修改前端增删改返回true处理
31个文件已修改
405 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue
@@ -65,6 +65,9 @@
      ElMessage.success('保存成功')
      emit('gaveParent', true)
    }
  }).catch((err)=>{
    ElMessage.error('系统错误')
    router.push("/login")
  })
}
const updateBasicData =  () =>{
@@ -80,6 +83,9 @@
        ElMessage.success('修改成功')
        emit('gaveParent', true)
      }
    }).catch((err)=>{
      ElMessage.error('系统错误')
      router.push("/login")
    })
  }
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
@@ -133,7 +133,7 @@
    }
    case 'delete': {
      request.post(`/BasicWarehouse/deleteBasicWarehouse`,row).then((res) => {
        if(res.code==200){
        if(res.code==200 && res.data===true){
          ElMessage.success(t('searchOrder.msgDeleteSuccess'))
          router.push({
            path:'/main/warehouseBasicData/warehouseSearchBasicData',
@@ -143,6 +143,9 @@
        }else{
          ElMessage.warning(t('searchOrder.msgDeleteFail'))
        }
      }).catch((err)=>{
        ElMessage.error('系统错误')
        router.push("/login")
      })
      break
    }
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
@@ -120,12 +120,15 @@
  if(isBool){
    request.post("/MaterialStore/saveMaterialStore", materialStore).then((res) => {
      if(res.code==200){
      if(res.code==200 && res.data===true){
        resetForm()
        ElMessage.success('保存成功')
      }else{
        ElMessage.warning(res.msg)
        ElMessage.warning("保存失败")
      }
    }).catch((err)=>{
      ElMessage.error('系统错误')
      router.push("/login")
    })
  }
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
@@ -26,13 +26,16 @@
        id: row.id
      })
      request.post("/MaterialStore/deleteMaterialStore",flowData.value).then((res) => {
        if(res.code==200){
        if(res.code==200 && res.data===true){
          ElMessage.success("删除成功")
          router.push({path:'/main/ingredients/SelectIngredients',query:{random:Math.random()}})
        }else{
          ElMessage.warning(res.msg)
          ElMessage.warning("删除失败")
          router.push("/login")
        }
      }).catch((err)=>{
        ElMessage.error('系统错误')
        router.push("/login")
      })
      return
    }
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
@@ -335,13 +335,16 @@
          })
          request.post("/MaterialInventory/updateMaterialOutboundToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.ReviewSuccess'))
              router.push({path: '/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("审核失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
@@ -352,13 +355,16 @@
          })
          request.post("/MaterialInventory/updateMaterialOutboundToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
              router.push({path: '/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("反审失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
@@ -29,13 +29,16 @@
        materialOutboundId:row.materialOutboundId
      })
      request.post("/MaterialInventory/deleteMaterialOutbound",flowData.value).then((res) => {
        if(res.code==200){
        if(res.code==200 && res.data===true){
          ElMessage.success(t('searchOrder.msgDeleteSuccess'))
          router.push({path:'/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
        }else{
          ElMessage.warning(res.msg)
          ElMessage.warning("删除失败")
          router.push("/login")
        }
      }).catch((err)=>{
        ElMessage.error('系统错误')
        router.push("/login")
      })
      return
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
@@ -342,13 +342,16 @@
          })
          request.post("/MaterialInventory/saveReturningWarehouse", flowData.value).then((res) => {
            if(res.code==200){
            if(res.code==200 && res.data===true){
              ElMessage.success('保存成功')
              router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
            }else{
              ElMessage.warning(res.msg)
              ElMessage.warning("保存失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
@@ -360,13 +363,16 @@
          })
          request.post("/MaterialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.ReviewSuccess'))
              router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("审核失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
@@ -377,13 +383,16 @@
          })
          request.post("/MaterialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
              router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("反审失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
@@ -271,11 +271,11 @@
            })
              request.post("/FinishedGoodsInventory/addSelectWarehousing",flowData.value).then((res) => {
                if(res.code==200){
                if(res.code==200 && res.data===true){
                  ElMessage.success(t('productStock.receivedSuccessfully'))
                  router.push({path:'/main/productStock/CreateProductStock',query:{random:Math.random()}})
                }else{
                  ElMessage.warning(res.msg)
                  ElMessage.warning("入库失败")
                  router.push("/login")
                }
              })
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue
@@ -66,13 +66,16 @@
          })
          request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryTakeOut",flowData.value).then((res) => {
            if(res.code==200){
            if(res.code==200 && res.data===true){
              ElMessage.success(t('productStock.successfullyRetrieved'))
              router.push({path:'/main/productStock/FinishedGoodsIssue',query:{random:Math.random()}})
            }else{
              ElMessage.warning(res.msg)
              ElMessage.warning("领出失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          return
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -283,13 +283,16 @@
              orderDetail: selectRecords
            })
            request.post("/FinishedGoodsInventory/addDeliveryDetail", orderDetailData.value).then((res) => {
              if (res.code == 200) {
              if (res.code == 200 && res.data===true) {
                ElMessage.success(t('productStock.deliverySuccessful'))
                router.push({path: '/main/productStock/FinishedProductOut', query: {random: Math.random()}})
              } else {
                ElMessage.warning(res.msg)
                ElMessage.warning("发货失败")
                router.push("/login")
              }
            }).catch((err)=>{
              ElMessage.error('系统错误')
              router.push("/login")
            })
          }
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue
@@ -66,13 +66,16 @@
          })
          request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryRework", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('productStock.reworkSuccessful'))
              router.push({path:'/main/productStock/FinishedProductRework',query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("返工失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue
@@ -281,14 +281,17 @@
              orderDetail: selectRecords
            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryAllocate", flowData.value).then((res) => {
              if (res.code == 200) {
              if (res.code == 200 && res.data===true) {
                ElMessage.success(t('productStock.transferSuccessful'))
                router.push({path:'/main/productStock/OrderAllocation',query:{random:Math.random()}})
              } else {
                ElMessage.warning(res.msg)
                ElMessage.warning("调拨失败")
                router.push("/login")
              }
            }).catch((err)=>{
              ElMessage.error('系统错误')
              router.push("/login")
            })
          return;
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue
@@ -260,14 +260,17 @@
            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
              if(res.code==200){
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.reverseReviewSuccessful'))
                router.push({path:'/main/productStock/ReworkRecord',query:{random:Math.random()}})
              }else{
                ElMessage.warning(res.msg)
                ElMessage.warning("反审失败")
                router.push("/login")
              }
            }).catch((err)=>{
              ElMessage.error('系统错误')
              router.push("/login")
            })
          }
          return;
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue
@@ -277,14 +277,17 @@
            })
            request.post("/FinishedGoodsInventory/cancelFinishedGoodsInventoryStorage",flowData.value).then((res) => {
              if(res.code==200){
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.invalidSuccessfully'))
                router.push({path:'/main/productStock/storageRecord',query:{random:Math.random(),storageType: type.value}})
              }else{
                ElMessage.warning(res.msg)
                ElMessage.warning("反作废失败")
                router.push("/login")
              }
            }).catch((err)=>{
              ElMessage.error('系统错误')
              router.push("/login")
            })
          }
          return;
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
@@ -270,14 +270,17 @@
            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
              if(res.code==200){
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.reviewSuccessful'))
                router.push({path:'/main/productStock/TakeOutRecord',query:{random:Math.random()}})
              }else{
                ElMessage.warning(res.msg)
                ElMessage.warning("审核失败")
                router.push("/login")
              }
            }).catch((err)=>{
              ElMessage.error('系统错误')
              router.push("/login")
            })
          }
          return;
@@ -305,14 +308,17 @@
            })
            request.post("/FinishedGoodsInventory/cancelFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
              if(res.code==200){
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.invalidSuccessfully'))
                router.push({path:'/main/productStock/TakeOutRecord',query:{random:Math.random()}})
              }else{
                ElMessage.warning(res.msg)
                ElMessage.warning("作废失败")
                router.push("/login")
              }
            }).catch((err)=>{
              ElMessage.error('系统错误')
              router.push("/login")
            })
          }
          return;
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue
@@ -251,14 +251,17 @@
            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
              if(res.code==200){
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.reverseReviewSuccessful'))
                router.push({path:'/main/productStock/TransferRecord',query:{random:Math.random()}})
              }else{
                ElMessage.warning(res.msg)
                ElMessage.warning("反审失败")
                router.push("/login")
              }
            }).catch((err)=>{
              ElMessage.error('系统错误')
              router.push("/login")
            })
          }
          return;
north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue
@@ -166,11 +166,11 @@
          })
          request.post("/Replenish/saveReplenish", flowData.value).then((res) => {
            if(res.code==200){
            if(res.code==200 && res.data===true){
              ElMessage.success(t('basicData.msg.saveSuccess'))
              router.push({path:'/main/Replenish/AddReplenish',query:{random:Math.random()}})
            }else{
              ElMessage.warning(res.msg)
              ElMessage.warning("保存失败")
              router.push("/login")
            }
          })
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -195,12 +195,12 @@
            })
            request.post("/Replenish/updateReplenish",flowData.value).then((res) => {
              if(res.code==200){
              if(res.code==200 && res.data===true){
                ElMessage.success(t('basicData.msg.ReviewSuccess'))
                router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})
              }else{
                ElMessage.warning(res.msg)
                ElMessage.warning("审核失败")
                router.push("/login")
              }
            })
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -185,13 +185,16 @@
          })
          request.post("/rework/saveRework", flowData.value).then((res) => {
            if(res.code==200){
            if(res.code==200 && res.data===true){
              ElMessage.success(t('basicData.msg.saveSuccess'))
              router.push({path:'/main/rework/AddRework',query:{random:Math.random()}})
            }else{
              ElMessage.warning(res.msg)
              ElMessage.warning("保存失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -203,14 +203,17 @@
            })
            request.post("/rework/updateRework",flowData.value).then((res) => {
              if(res.code==200){
              if(res.code==200 && res.data===true){
                ElMessage.success(t('basicData.msg.ReviewSuccess'))
                router.push({path:'/main/rework/SelectRework',query:{random:Math.random()}})
              }else{
                ElMessage.warning(res.msg)
                ElMessage.warning("审核失败")
                router.push("/login")
              }
            }).catch((err)=>{
              ElMessage.error('系统错误')
              router.push("/login")
            })
          }
          return;
north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
@@ -89,13 +89,16 @@
  })
  request.post("/customer/insertCustomer", flowData.value).then((res) => {
    if(res.code==200){
    if(res.code==200 && res.data===true){
      resetForm()
      ElMessage.success(t('basicData.msg.saveSuccess'))
    }else{
      ElMessage.warning(res.msg)
      ElMessage.warning("保存失败")
      router.push("/login")
    }
  }).catch((err)=>{
    ElMessage.error('系统错误')
    router.push("/login")
  })
}
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -47,13 +47,16 @@
      })
      request.post("/customer/deleteCustomer", flowData.value).then((res) => {
        if(res.code==200){
        if(res.code==200 && res.data===true){
          ElMessage.success("删除成功")
          router.push({path:'/main/customer/selectCustomer',query:{random:Math.random()}})
        }else{
          ElMessage.warning(res.msg)
          ElMessage.warning("删除失败")
          router.push("/login")
        }
      }).catch((err)=>{
        ElMessage.error('系统错误')
        router.push("/login")
      })
      break
    }
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -393,13 +393,13 @@
    custom: true
  },
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['deliveryDetail.quantity','quantity']
    //let footList=['deliveryDetail.quantity','quantity']
    let footList=[]
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        console.log(column.field)
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        }
@@ -464,13 +464,16 @@
          })
           request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
             if(res.code==200){
             if(res.code==200 && res.data===true){
               ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
               router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
             }else{
               ElMessage.warning(res.msg)
               ElMessage.warning("保存失败")
               router.push("/login")
             }
           }).catch((err)=>{
             ElMessage.error('系统错误')
             router.push("/login")
           })
          break
        }
@@ -481,13 +484,16 @@
          })
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.ReviewSuccess'))
              router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("审核失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
@@ -498,13 +504,16 @@
          })
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
              router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              ElMessage.warning("审核失败")
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error('系统错误')
            router.push("/login")
          })
          break
        }
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -34,15 +34,19 @@
        deliveryId:row.deliveryId
      })
      request.post("/Delivery/deleteDelivery",flowData.value).then((res) => {
        if(res.code==200){
        if(res.code==200 && res.data===true){
          ElMessage.success(t('searchOrder.msgDeleteSuccess'))
          router.push({path:'/main/delivery/selectDelivery',query:{random:Math.random()}})
        }else{
          ElMessage.warning(res.msg)
          ElMessage.warning("删除失败")
          router.push("/login")
        }
      }).catch((err)=>{
        ElMessage.error('系统错误')
        router.push("/login")
      })
      return
    }
  }
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -48,12 +48,8 @@
    @SaCheckPermission("CreateProductStock.add")
    @PostMapping("/addSelectWarehousing")
    public Result addSelectWarehousing( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addSelectWarehousing(object)){
            return Result.seccess();
        }else {
           throw new ServiceException(Constants.Code_500,"入库失败");
        return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
        }
    }
    /*查询可发货的成品数据*/
@@ -69,12 +65,7 @@
    @SaCheckPermission("FinishedProductOut.add")
    @PostMapping("/addDeliveryDetail")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addDeliveryDetail(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"出库失败");
        }
        return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
    }
    /* 调拨查询*/
@@ -90,14 +81,7 @@
    @SaCheckPermission("OrderAllocation.add")
    @PostMapping("/updateFinishedGoodsInventoryAllocate")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"调拨失败,请检查订单输入是否正确");
        }
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
    }
    /*调拨记录查询*/
@@ -113,14 +97,7 @@
    @SaCheckPermission("FinishedGoodsIssue.add")
    @PostMapping("/updateFinishedGoodsInventoryTakeOut")
    public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"领出失败");
        }
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
    }
    /*领出记录查询*/
@@ -135,14 +112,7 @@
    @ApiOperation("订单返工查询接口")
    @PostMapping("/updateFinishedGoodsInventoryRework")
    public Result updateFinishedGoodsInventoryRework( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"返工失败");
        }
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
    }
@@ -152,28 +122,14 @@
    @SaCheckPermission("TakeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryToExamine")
    public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"审核")){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"领出失败");
        }
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"审核"));
    }
    /*订单反审*/
    @ApiOperation("订单反审接口")
    @SaCheckPermission("TakeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
    public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"反审")){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"领出失败");
        }
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"反审"));
    }
    /*订单作废*/
@@ -181,14 +137,7 @@
    @SaCheckPermission("TakeOutRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryToExamine")
    public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"领出失败");
        }
        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
    }
    /*出入库记录查询*/
@@ -204,14 +153,7 @@
    @SaCheckPermission("storageRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryStorage")
    public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"返回失败");
        }
        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
    }
    @ApiOperation("成品库存记录查询接口")
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
@@ -95,39 +95,21 @@
    @SaCheckPermission("CreateOutbound.review")
    @PostMapping("/updateMaterialOutboundToExamine")
    public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateMaterialOutboundToExamine(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");
        }
        return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
    }
    @ApiOperation("材料出库删除接口")
    @SaCheckPermission("MaterialOutbound.delete")
    @PostMapping("/deleteMaterialOutbound")
    public Result deleteMaterialOutbound( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.deleteMaterialOutbound(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");
        }
        return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
    }
    @ApiOperation("物料返库新增接口")
    @SaCheckPermission("ReturnToStorageCreate.add")
    @PostMapping("/saveReturningWarehouse")
    public Result saveReturningWarehouse( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveReturningWarehouse(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");
        }
        return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
    }
    @ApiOperation("物料返库新增查询接口")
@@ -141,13 +123,7 @@
    @SaCheckPermission("ReturnToStorageCreate.review")
    @PostMapping("/updateReturningWarehouseToExamine")
    public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateReturningWarehouseToExamine(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");
        }
        return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
    }
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
@@ -25,12 +25,7 @@
    @SaCheckPermission("CreateIngredients.add")
    @PostMapping("/saveMaterialStore")
    public Result saveMaterialStore( @RequestBody Map<String,Object>  object){
        if(materialStoreService.saveMaterialStore(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");
        }
        return Result.seccess(materialStoreService.saveMaterialStore(object));
    }
    @ApiOperation("物料查询接口")
@@ -44,14 +39,7 @@
    @SaCheckPermission("SelectIngredients.delete")
    @PostMapping("/deleteMaterialStore")
    public Result deleteMaterialStore( @RequestBody Map<String,Object>  object){
        if(materialStoreService.deleteMaterialStore(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");
        }
        return Result.seccess(materialStoreService.deleteMaterialStore(object));
    }
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -46,27 +46,13 @@
    @SaCheckPermission("AddReplenish.add")
    @PostMapping("/saveReplenish")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(replenishService.saveReplenish(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"补片失败");
        }
        return Result.seccess(replenishService.saveReplenish(object));
    }
    @ApiOperation("补片审核接口")
    @SaCheckPermission("SelectReplenish.review")
    @PostMapping("/updateReplenish")
    public Result updateReplenish( @RequestBody Map<String,Object> object){
        if(replenishService.updateReplenish(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");
        }
        return Result.seccess(replenishService.updateReplenish(object));
    }
}
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
@@ -46,27 +46,13 @@
    @SaCheckPermission("AddRework.add")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(reworkService.saveRework(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"返工失败");
        }
        return Result.seccess(reworkService.saveRework(object));
    }
    @ApiOperation("返工审核接口")
    @SaCheckPermission("SelectRework.review")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        if(reworkService.updateRework(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");
        }
        return Result.seccess(reworkService.updateRework(object));
    }
}
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
@@ -39,28 +39,14 @@
    @SaCheckPermission("CreateCustomer.add")
    @PostMapping("/insertCustomer")
    public Result insertCustomer( @RequestBody Map<String,Object>  object){
        if(customerService.insertCustomer(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"客户新增/修改失败");
        }
        return Result.seccess(customerService.insertCustomer(object));
    }
    @ApiOperation("客户删除接口")
    @SaCheckPermission("selectCustomer.delete")
    @PostMapping("/deleteCustomer")
    public Result deleteCustomer( @RequestBody Map<String,Object>  object){
        if(customerService.deleteCustomer(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"客户删除失败");
        }
        return Result.seccess(customerService.deleteCustomer(object));
    }
    @ApiOperation("客户订单查询接口")
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
@@ -70,38 +70,20 @@
    @SaCheckPermission("createDelivery.add")
    @PostMapping("/insertDelivery")
    public Result insertDelivery( @RequestBody Map<String,Object> object){
        if(deliveryService.insertDelivery(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"发货失败");
        }
        return Result.seccess(deliveryService.insertDelivery(object));
    }
    @ApiOperation("发货审核修改接口")
    @SaCheckPermission("createDelivery.review")
    @PostMapping("/updateDeliveryToExamine")
    public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
        if(deliveryService.updateDeliveryToExamine(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");
        }
        return Result.seccess(deliveryService.updateDeliveryToExamine(object));
    }
    @ApiOperation("发货删除接口")
    @SaCheckPermission("selectDelivery.delete")
    @PostMapping("/deleteDelivery")
    public Result deleteDelivery( @RequestBody Map<String,Object> object){
        if(deliveryService.deleteDelivery(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");
        }
        return Result.seccess(deliveryService.deleteDelivery(object));
    }
    @ApiOperation("发货订单查询接口")