Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-05-11 5efb25463fb6a6825ab8c85b880815af32d37515

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue

@@ -16,6 +16,7 @@
    ElMessage.warning(res.msg)
  }
})

</script>

<template>

 north-glass-erp/northglass-erp/src/layout/MainErpView.vue

@@ -17,11 +17,12 @@
const router = useRouter()
const userStore = useUserInfoStore()
const user = userStore.user.userName
//监听异步返回代码
watch(()=>userStore.responseCode,(newVal) => {
    switch (newVal){
      case 401:{
        if(userStore.msg.split('.')[1] === 'search'){
          router.push({path:'/main/order/notPermission'});
          router.push({path:'/main/user/notPermission'});
        }else{
          ElMessage.warning(t('error.Code_401'))
        }
@@ -41,6 +42,8 @@
)

store.createWebSocket();

// 退出登录
function quit(){
  userStore.$patch({
    user:null
@@ -59,7 +62,6 @@
let menuList=$ref([])
onMounted(()=>{
  request.get(`/menu/getMenu/${lang}`).then((res) => {

    if(res.code==200){
      menuList= deepClone(res.data)
    }

 north-glass-erp/northglass-erp/src/router/index.js

@@ -28,6 +28,11 @@
          component: () => import('../views/system/user/User.vue'),
          children:[
            {
              path: 'notPermission',
              name: 'notPermission',
              component: () => import('../views/system/user/NotPermission.vue'),
            },
            {
              path: 'userList',
              name: 'userList',
              component: () => import('../views/system/user/UserList.vue')
@@ -67,6 +72,11 @@
              path: 'searchBasicData',
              name: 'searchBasicData',
              component: () => import('../views/sd/basicData/SearchBasicData.vue')
            },
            {
              path: 'searchGlassType',
              name: 'searchGlassType',
              component: () => import('../views/sd/basicData/SearchGlassType.vue')
            },
            {
              name: 'OrderBasicData',
@@ -117,11 +127,7 @@
          name: 'order',
          component: () => import('../views/sd/order/Order.vue'),
          children:[
            {
              path: 'notPermission',
              name: 'notPermission',
              component: () => import('../views/sd/order/NotPermission.vue'),
            },

            {
              path: 'selectOrder',
              name: 'selectOrder',

 north-glass-erp/northglass-erp/src/stores/userInfo.js

@@ -6,7 +6,8 @@
    state: () =>({
            user:ref({
                userName:null,
                userId:null
                userId:null,
                permissions:[]
            }),
            responseCode:null,
            msg:null

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue

@@ -281,7 +281,7 @@
      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>
        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">删除</el-button>
<!--        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">删除</el-button>-->
      </template>

      <template #num1_filter="{ column, $panel }">

 north-glass-erp/northglass-erp/src/views/sd/basicData/BasicData.vue

@@ -21,6 +21,7 @@
    <div id="div-title">
      <el-breadcrumb :separator-icon="ArrowRight">
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/orderBasicData/searchBasicData' }">基础数据</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/orderBasicData/searchGlassType' }">玻璃类别</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">报表</el-breadcrumb-item>
      </el-breadcrumb>
    </div>

 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue

@@ -18,7 +18,6 @@
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'OrderList',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
@@ -62,21 +61,6 @@
    zoom: true,
    custom: true
  },

  footerMethod ({ columns, data }) {//页脚函数
    return[
      columns.map((column, columnIndex) => {
        // if (columnIndex === 0) {
        //   return t('basicData.total')
        // }
        // if (props.tableProp.footList.includes(column.field)) {
        //   return sumNum(data, column.field)
        // }
        return ''
      })
    ]
  }

})
const gridEvents = {
  toolbarButtonClick ({ code }) {
@@ -88,15 +72,6 @@
          dialogTableVisible.value = true
          break
        }

      }
    }
  },
  menuClick ({ menu, row, column }) {
    const $grid = xGrid.value
    if ($grid) {
      switch (menu.code) {


      }
    }

 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue

New file
@@ -0,0 +1,204 @@
<script setup>
import {onMounted, reactive, ref} from "vue";
import {VXETable} from "vxe-table";
import {ElMessage} from "element-plus";
import request from "@/utils/request"
import CreateBasicData from "@/views/sd/basicData/CreateBasicData.vue"
import {useRouter,useRoute} from "vue-router"
import {useI18n} from "vue-i18n"
const { t } = useI18n()

let dialogTableVisible = ref(false)
const router = useRouter()
const xGrid = ref()
const gridOptions = reactive({
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'OrderList',
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true },//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },

  //表头参数
  columns:[
    {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
    {type: 'seq', title: '序号', width: 80 ,fixed:"left",},
    {field:'level',title: '类别等级'},
    {field:'typeName',title: '名称'},
    {field:'createTime',title: '创建日期'}
  ],

  //表头按钮
  toolbarConfig: {
    buttons: [
      {'code': 'add', 'name': '新增',status: 'primary'},
    ],

    // import: false,
    // export: true,
    // print: true,
    zoom: true,
    custom: true
  },
})
const rowIndex = ref(null)
const glassType = reactive([
  {
    value:1,
    label:'一级类别'
  },
  {
    value: 2,
    label: '二级类别',
    children: []
  }
])
const submit = ref({
  glassLevel:[null,null],
  value:null,
  type:null,
  id:null
})

onMounted(()=>{
  request.get(`/basicGlassType/findAll`).then(res => {
    xGrid.value.reloadData(res.data)
    console.log(res.data)
  })

  request.get(`/basicGlassType/getOneLevelListMap`).then(res => {
    glassType[1].children = res.data
  })
})

const gridEvents = {
  toolbarButtonClick ({ code }) {
    const $grid = xGrid.value
    if ($grid) {
      switch (code) {
        case 'add': {
          dialogTableVisible.value = true
          break
        }
      }
    }
  }
}

const getTableRow =  (row,type) => {
  switch (type) {
    case 'edit': {
      rowIndex.value = row
      submit.value.glassLevel = row.belong===''?[parseInt(row.level)]:[parseInt(row.level),row.belong]
      submit.value.value = row.typeName
      submit.value.id = row.id
      dialogTableVisible.value = true
      break
    }
    case 'delete': {
      request.get(`/basicGlassType/deleteById/${row.id}`).then((res) => {
        if(res.code==='200' && res.data===true){
          ElMessage.success(t('searchOrder.msgDeleteSuccess'))
          router.push({
            path:'/main/orderBasicData/searchGlassType',
            query:{random:Math.random()
            }
          })
        }else{
          ElMessage.warning(t('searchOrder.msgDeleteFail'))
        }
      })
      break
    }

  }
}


const saveBasicData =  (type) =>{
  submit.value.type = type
  request.post(`/basicGlassType/add`, submit.value).then(res => {
    if (res.code==='200') {
      ElMessage.success('保存成功')
      router.push({
        path:'/main/orderBasicData/searchGlassType',
        query:{random:Math.random()
        }
      })
    }
  })
}


</script>

<template>
  <div>
    <vxe-grid
        style="width: 40vw;"
        class="mytable-scrollbar"
        max-height="500px"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
        <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
          <template #reference>
            <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
          </template>
        </el-popconfirm>
      </template>
    </vxe-grid>
    <el-dialog
        v-model="dialogTableVisible"
        destroy-on-close
        style="width: 30%;height:30% ">
      <el-row>
        <el-cascader
            v-model="submit.glassLevel"
            :options="glassType"
            clearable
            placeholder=""
            :disabled="rowIndex"
        />
      </el-row>
      <el-row>
          <el-input v-model="submit.value"/>
      </el-row>
      <el-row>
        <el-button v-if="!rowIndex" @click="saveBasicData('add')"   type="primary">新增</el-button>
        <el-button v-else @click="saveBasicData('update')" type="primary">修改</el-button>
      </el-row>
    </el-dialog>

  </div>

</template>

<style scoped>
.el-row{
  margin-top: 10px;
}
</style>

 north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue

@@ -7,9 +7,10 @@
  import deepClone from "@/utils/deepClone"
  import {ElMessage} from "element-plus"
  import {VXETable} from "vxe-table"
  import  useUserInfoStore from '@/stores/userInfo'
  import {useI18n} from "vue-i18n"
  import {toolbarButtonClickEvent} from "@/hook/mouseMove";
  const { t } = useI18n()
  const userStore = useUserInfoStore()
  const router = useRouter()
  let rowClickIndex = ref(null)
  const dialogTableVisible = ref(false)
@@ -355,7 +356,13 @@

      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
        <el-button @click="getTableRow(row,'edit')"
                   v-if="userStore.user.permissions.indexOf('selectOrder.edit') > -1"
                   link
                   type="primary"
                   size="small">
          {{ $t('basicData.edit') }}
        </el-button>
        <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
          <template #reference>
            <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>

 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -95,6 +95,7 @@
        item.separation = JSON.parse(item.separation)
      })
      productTotal.value = res.data.title
      productGlassTypeStore.GlassType =[res.data.title.typeId.substring(0,2),res.data.title.typeId]
      //BasicData.value = res.data
    }else{
      ElMessage.warning(res.msg)

 north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue

@@ -154,12 +154,11 @@
    case 'delete': {
      request.post(`/product/deleteProductById/${row.id}`).then((res) => {
        if(res.code==200){
          //router.push("/main/product/selectProduct")
          router.go(0)
          router.push({path:"/main/product/selectProduct",query:{random:Math.random()}})
          ElMessage.success('删除成功')
        }else{
          ElMessage.warning(res.msg)
        }
      }).catch((err) => {
        if(err==="600")ElMessage.warning("产品已审核,无法删除")
      })
      break
    }
@@ -359,7 +358,6 @@
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
        @scroll ="scrollEvnt"

    >

 north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue

@@ -4,13 +4,17 @@
import request from "@/utils/request"
import {useRouter,useRoute} from "vue-router"
import {useI18n} from "vue-i18n"
import i18n from "@/lang/index"
const lang = i18n.global.locale.value
import {ElMessage, ElMessageBox} from "element-plus"
const { t } = useI18n()
const router = useRouter()
const route = useRoute()
const dialogVisible = ref(false)
let selectValue = ref(null)
let options = ref([])
let selectValue = ref([null,null])
let options = ref(null)
let checkId = ref(null)


const xGrid = ref()
const gridOptions = reactive({
@@ -51,6 +55,10 @@
    buttons: [

    ],
    slots:{
      buttons: "role_add"

    },
    zoom: true,
    custom: true
  },
@@ -79,6 +87,9 @@
  customConfig: {
    storage: true
  },
  checkboxConfig: {
    checkField:'checked',
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
@@ -92,12 +103,13 @@

  //表头按钮
  toolbarConfig: {
    buttons: [

    ],
    slots:{
      buttons: "toolbar_buttons"
      buttons: "toolbar_buttons",
      tools:'save_buttons'

    },
    buttons: [
    ],
    zoom: true,
    custom: true
  },
@@ -122,7 +134,11 @@

  let columnsP = [
      { type: 'seq', width: 60 },
      { type: 'checkbox', width: 50 }
      { type: 'checkbox',
        width: 50 ,
        field:"checked",

      }
  ]
  const columnNameP = {
    id: 'ID',
@@ -141,10 +157,10 @@
})

onMounted(()=>{
  request.get('/role/findAll').then(res=>{
  request.get(`/role/findAll`).then(res=>{
    gridOptions.data = res.data
  })
  request.post('/permission/getPermissionList').then(res=>{
  request.post(`/permission/getPermissionList/${lang}`).then(res=>{
    options.value = res.data
  })
})
@@ -153,19 +169,73 @@
  switch (type) {
    case 'edit': {
      dialogVisible.value = true
      checkId.value = row.id
      break
    }
  }
}

const getPermissionList = () => {
  request.post(`/permission/getPermission/${2}`).then(res=>{
    permissionOptions.data = res.data
  request.post(`/permission/getPermission/${checkId.value}/${lang}`,selectValue.value).then(res=>{
    pGrid.value.reloadData(res.data)
  })
}

const selectChange = ()=>{
  console.log(selectValue.value)
const selectChange = () => {
  getPermissionList()
}

const saveBatch = () => {
  const $grid = pGrid.value
  if($grid.getCheckboxRecords().length === 0){
    ElMessage.warning("请先选择权限")
    return
  }
  ElMessageBox.confirm(
      '确认修改角色权限?',
      'Warning',
      {
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning',
      }
  ).then(() => {
    const permission = {
      id: checkId.value,
      detail: $grid.getCheckboxRecords()
    }
    request.post(`/permissionRole/savePermissionRole`,permission).then(res=>{
      if(res.data=== true && res.code==='200'){
        ElMessage.success('保存成功')
        dialogVisible.value = false
        getPermissionList()
      }else{
        ElMessage.error('保存失败')
      }
    })
  })
}

const addRole = () =>{
  ElMessageBox.prompt('请输入新角色', '新增角色', {
    confirmButtonText: '确定',
    cancelButtonText: '取消',
    inputPattern:/^.{1,255}$/,
    inputErrorMessage: '不能为空且长度不能超过255',
  })
    .then(({ value }) => {
      const role= {
        role: value
      }
      request.post("/role/add",role).then(res=>{
        if(res.code==='200' && res.data===true){
          ElMessage.success('新增成功')
          router.push({path:'/main/role/roleList',query:{random:Math.random()}})
        }else{
          ElMessage.error('新增失败')
        }
      })
    })
}

</script>
@@ -178,6 +248,15 @@
        ref="xGrid"
        v-bind="gridOptions"
    >
      <template #role_add>
      <vxe-button
          @click="addRole"
          status='primary'
          style="margin-right: 1rem"
      >角色新增</vxe-button>
      </template>


      <template #filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
@@ -209,6 +288,13 @@
              @change="selectChange"
          />
        </template>
        <template #save_buttons>
          <vxe-button
              @click="saveBatch"
              status='primary'
              style="margin-right: 1rem"
          >新增</vxe-button>
        </template>

      </vxe-grid>


 north-glass-erp/northglass-erp/src/views/system/user/NotPermission.vue

 north-glass-erp/northglass-erp/src/views/system/user/UserList.vue

@@ -82,6 +82,7 @@
})
onMounted(()=>{
  request.get('/userInfo/findAll').then(res=>{
    console.log(res.data)
    let arr = res.data.users[0]
    arr.forEach(item=>{
      let bValues = item.userRoleList.map(item => item.role);

 north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java

@@ -1,6 +1,9 @@
package com.example.erp.controller.dto;

import lombok.Data;

import java.util.List;

@Data //用于接受前端登录额user信息
public class UserDTO {
    private Integer id;
@@ -8,4 +11,5 @@
    private String pass;
    private String token;
    private String userName;
    private List<String> permissions;
}

 north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java

@@ -1,45 +1,58 @@
package com.example.erp.controller.mm;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.BasicWarehouseType;
import com.example.erp.entity.sd.BasicData;
import com.example.erp.service.mm.BasicWarehouseTypeService;
import com.example.erp.service.sd.BasicDateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@RestController
@Api(value="仓库基础数据controller",tags={"仓库基础数据操作接口"})
@RequestMapping("/BasicWarehouse")
public class BasicWarehouseTypeController {
    @Autowired
    BasicWarehouseTypeService basicWarehouseTypeService;
    @ApiOperation("基础数据查询返回指定列")
    @GetMapping("/BasicWarehouseType/{type}")
    public Result getBasicWarehouseType(@PathVariable String type){
        return Result.seccess(basicWarehouseTypeService.getBasicWarehouseType(type));
    }

    @ApiOperation("基础数据查询返回json对象格式")
    @GetMapping("/BasicWarehouseTypes/{type}")
    public Result getBasicWarehouseTypes(@PathVariable String type){
        return Result.seccess(basicWarehouseTypeService.getBasicWarehouseTypes(type));
    }

    @ApiOperation("基础数据查询")
    @SaCheckPermission("warehouseSearchBasicData.search")
    @GetMapping("/getBasicWarehouse")
    public Result getBasicWarehouse(){
        return Result.seccess(basicWarehouseTypeService.getBasicWarehouse());
    }


    @ApiOperation("基础数据新增")
    @SaCheckPermission("warehouseSearchBasicData.add")
    @PostMapping("addBasicWarehouse")
    public Result addBasicWarehouse(@RequestBody Map<String,Object> map){
        return  Result.seccess(basicWarehouseTypeService.addBasicWarehouse(map));
    }
    @ApiOperation("基础数据修改")
    @SaCheckPermission("warehouseSearchBasicData.update")
    @PostMapping("updateBasicWarehouse")
    public Result updateBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
        return  Result.seccess(basicWarehouseTypeService.updateBasicWarehouse(basicWarehouseType));
    }

    @ApiOperation("基础数据删除")
    @SaCheckPermission("warehouseSearchBasicData.delete")
    @PostMapping("deleteBasicWarehouse")
    public Result deleteBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
        return  Result.seccess(basicWarehouseTypeService.deleteBasicWarehouse(basicWarehouseType));

 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java

@@ -2,6 +2,7 @@



import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.FinishedOperateLog;
@@ -28,6 +29,7 @@

    /*成品库存查询*/
    @ApiOperation("成品库存查询接口")
    @SaCheckPermission("ProductStockList.search")
    @PostMapping("/getSelect/{pageNum}/{pageSize}")
    public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
        return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
@@ -35,6 +37,7 @@

    /*查询可入库的成品数据*/
    @ApiOperation("可入库的成品查询接口")
    @SaCheckPermission("CreateProductStock.search")
    @PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
    public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
        return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
@@ -42,6 +45,7 @@

    /*成品入库*/
    @ApiOperation("成品入库接口")
    @SaCheckPermission("CreateProductStock.add")
    @PostMapping("/addSelectWarehousing")
    public Result addSelectWarehousing( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addSelectWarehousing(object)){
@@ -54,6 +58,7 @@

    /*查询可发货的成品数据*/
    @ApiOperation("可发货的成品查询接口")
    @SaCheckPermission("FinishedProductOut.search")
    @PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
    public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
@@ -61,6 +66,7 @@

    /*成品发货*/
    @ApiOperation("成品发货接口")
    @SaCheckPermission("FinishedProductOut.add")
    @PostMapping("/addDeliveryDetail")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addDeliveryDetail(object)){
@@ -73,6 +79,7 @@

    /* 调拨查询*/
    @ApiOperation("可调拨数据查询接口")
    @SaCheckPermission("OrderAllocation.search")
    @PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
    public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
@@ -80,6 +87,7 @@

    /*订单调拨*/
    @ApiOperation("订单调拨接口")
    @SaCheckPermission("OrderAllocation.add")
    @PostMapping("/updateFinishedGoodsInventoryAllocate")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object)){
@@ -94,6 +102,7 @@

    /*调拨记录查询*/
    @ApiOperation("调拨记录查询接口")
    @SaCheckPermission("TransferRecord.search")
    @PostMapping("/getSelectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
@@ -101,6 +110,7 @@

    /*订单领出*/
    @ApiOperation("订单领出接口")
    @SaCheckPermission("FinishedGoodsIssue.add")
    @PostMapping("/updateFinishedGoodsInventoryTakeOut")
    public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object>  object){

@@ -115,6 +125,7 @@

    /*领出记录查询*/
    @ApiOperation("领出记录查询接口")
    @SaCheckPermission("TakeOutRecord.search")
    @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
@@ -138,6 +149,7 @@

    /*订单审核*/
    @ApiOperation("订单审核接口")
    @SaCheckPermission("TakeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryToExamine")
    public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){

@@ -151,6 +163,7 @@
    }
    /*订单反审*/
    @ApiOperation("订单反审接口")
    @SaCheckPermission("TakeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
    public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object>  object){

@@ -165,6 +178,7 @@

    /*订单作废*/
    @ApiOperation("订单作废接口")
    @SaCheckPermission("TakeOutRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryToExamine")
    public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){

@@ -179,6 +193,7 @@

    /*出入库记录查询*/
    @ApiOperation("出入库记录查询接口")
    @SaCheckPermission("storageRecord.search")
    @PostMapping("/getSelectStorageRecord/{pageNum}/{pageSize}/{selectDate}/{type}")
    public Result getSelectStorageRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String type, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
@@ -186,6 +201,7 @@

    /*出入库返回*/
    @ApiOperation("出入库返回接口")
    @SaCheckPermission("storageRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryStorage")
    public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object>  object){

@@ -199,6 +215,7 @@
    }

    @ApiOperation("成品库存记录查询接口")
    @SaCheckPermission("WarehouseReport.search")
    @PostMapping("/getSelectFinishedOperateLogReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog));

 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java

@@ -1,6 +1,7 @@
package com.example.erp.controller.mm;


import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.*;
@@ -24,6 +25,7 @@
    MaterialInventoryService materialInventoryService;

    @ApiOperation("物料出库新增接口")
    @SaCheckPermission("CreateOutbound.add")
    @PostMapping("/saveMaterialOutbound")
    public Result saveMaterialOutbound( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveMaterialOutbound(object)){
@@ -35,6 +37,7 @@
    }

    @ApiOperation("物料新增接口")
    @SaCheckPermission("SelectIngredientsStock.add")
    @PostMapping("/saveMaterialInventory")
    public Result saveMaterialInventory( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveMaterialInventory(object)){
@@ -46,36 +49,42 @@
    }

    @ApiOperation("物料库存加时间查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialInventoryDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
    }

    @ApiOperation("物料库存工程加时间查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryEngineeringDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialInventoryEngineeringDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
    }

    @ApiOperation("物料库存查询接口")
    @SaCheckPermission("CreateOutbound.search")
    @PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}")
    public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
    }

    @ApiOperation("物料库存工程查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}")
    public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
    }

    @ApiOperation("材料出库查询接口")
    @ApiOperation("材料出库加时间查询接口")
    @SaCheckPermission("MaterialOutbound.search")
    @PostMapping("/getSelectMaterialOutboundDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialOutboundDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialOutbound materialOutbound){
        return Result.seccess(materialInventoryService.getSelectMaterialOutboundDate(pageNum,pageSize,selectDate, materialOutbound));
    }

    @ApiOperation("材料出库查询接口")
    @SaCheckPermission("CreateOutbound.search")
    @PostMapping("/getSelectMaterialOutbound/{pageNum}/{pageSize}")
    public Result getSelectMaterialOutbound(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialOutboundDetail materialOutboundDetail){
        return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
@@ -83,6 +92,7 @@


    @ApiOperation("材料出库审核接口")
    @SaCheckPermission("CreateOutbound.review")
    @PostMapping("/updateMaterialOutboundToExamine")
    public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateMaterialOutboundToExamine(object)){
@@ -94,7 +104,8 @@
        }
    }

    @ApiOperation("物料删除接口")
    @ApiOperation("材料出库删除接口")
    @SaCheckPermission("MaterialOutbound.delete")
    @PostMapping("/deleteMaterialOutbound")
    public Result deleteMaterialOutbound( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.deleteMaterialOutbound(object)){
@@ -108,6 +119,7 @@
    }

    @ApiOperation("物料返库新增接口")
    @SaCheckPermission("ReturnToStorageCreate.add")
    @PostMapping("/saveReturningWarehouse")
    public Result saveReturningWarehouse( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveReturningWarehouse(object)){
@@ -119,12 +131,14 @@
    }

    @ApiOperation("物料返库新增查询接口")
    @SaCheckPermission("ReturnToStorageCreate.search")
    @PostMapping("/getSelectReturningWarehouse/{pageNum}/{pageSize}")
    public Result getSelectReturningWarehouse(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReturningWarehouseDetail returningWarehouseDetail){
        return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
    }

    @ApiOperation("物料返库审核接口")
    @SaCheckPermission("ReturnToStorageCreate.review")
    @PostMapping("/updateReturningWarehouseToExamine")
    public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateReturningWarehouseToExamine(object)){
@@ -138,6 +152,7 @@


    @ApiOperation("物料返库查询接口")
    @SaCheckPermission("ReturnToStorage.search")
    @PostMapping("/getSelectReturningWarehouseDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectReturningWarehouseDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody ReturningWarehouse returningWarehouse){
        return Result.seccess(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));

 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java

@@ -1,6 +1,7 @@
package com.example.erp.controller.mm;


import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.MaterialStore;
@@ -21,6 +22,7 @@
    MaterialStoreService materialStoreService;

    @ApiOperation("物料新增接口")
    @SaCheckPermission("CreateIngredients.add")
    @PostMapping("/saveMaterialStore")
    public Result saveMaterialStore( @RequestBody Map<String,Object>  object){
        if(materialStoreService.saveMaterialStore(object)){
@@ -32,12 +34,14 @@
    }

    @ApiOperation("物料查询接口")
    @SaCheckPermission("SelectIngredients.search")
    @PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
    public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
        return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
    }

    @ApiOperation("物料删除接口")
    @SaCheckPermission("SelectIngredients.delete")
    @PostMapping("/deleteMaterialStore")
    public Result deleteMaterialStore( @RequestBody Map<String,Object>  object){
        if(materialStoreService.deleteMaterialStore(object)){

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java

@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.PatchLog;
@@ -7,6 +8,7 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReplenishService;
import com.example.erp.service.pp.ReworkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,6 +17,7 @@
import java.util.Map;

@RestController
@Api(value="补片controller",tags={"补片操作接口"})
@RequestMapping("/Replenish")
public class ReplenishController {

@@ -25,12 +28,14 @@

    /*发货订单查询*/
    @ApiOperation("补片新增查询接口")
    @SaCheckPermission("AddReplenish.search")
    @PostMapping("/getSelectReplenish/{pageNum}/{pageSize}")
    public Result getSelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(replenishService.getSelectReplenish(pageNum,pageSize));
    }

    @ApiOperation("补片查询接口")
    @SaCheckPermission("SelectReplenish.search")
    @PostMapping("/SelectReplenish/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody PatchLog patchLog){
        return Result.seccess(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLog));
@@ -38,6 +43,7 @@


    @ApiOperation("补片新增接口")
    @SaCheckPermission("AddReplenish.add")
    @PostMapping("/saveReplenish")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(replenishService.saveReplenish(object)){
@@ -51,6 +57,7 @@
    }

    @ApiOperation("补片审核接口")
    @SaCheckPermission("SelectReplenish.review")
    @PostMapping("/updateReplenish")
    public Result updateReplenish( @RequestBody Map<String,Object> object){
        if(replenishService.updateReplenish(object)){

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java

@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.Rework;
@@ -7,6 +8,7 @@
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReworkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,6 +17,7 @@
import java.util.Map;

@RestController
@Api(value="返工controller",tags={"返工操作接口"})
@RequestMapping("/rework")
public class ReworkController {

@@ -25,19 +28,22 @@

    /*发货订单查询*/
    @ApiOperation("可返工数据查询接口")
    @SaCheckPermission("AddRework.search")
    @PostMapping("/getSelectRework/{pageNum}/{pageSize}")
    public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
    }

    @ApiOperation("返工数据查询接口")
    @SaCheckPermission("SelectRework.search")
    @PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
        return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
    }


    @ApiOperation("返工接口")
    @ApiOperation("返工接口新增")
    @SaCheckPermission("AddRework.add")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(reworkService.saveRework(object)){
@@ -51,6 +57,7 @@
    }

    @ApiOperation("返工审核接口")
    @SaCheckPermission("SelectRework.review")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        if(reworkService.updateRework(object)){

 north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java

@@ -1,14 +1,18 @@
package com.example.erp.controller.sd;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.BasicData;
import com.example.erp.service.sd.BasicDateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@RestController
@RequestMapping("/basicData")
@Api(value="订单基础controller",tags={"订单基础数据操作接口"})
public class BasicDataController {
    final
    BasicDateService basicDateService;
@@ -29,24 +33,36 @@
    public Result getBasicDataByTypeAndChildType(@PathVariable String type,@PathVariable String childType){
        return Result.seccess(basicDateService.getBasicDataByTypeAndChildType(type,childType));
    }


    @ApiOperation("查询基础数据")
    @SaCheckPermission("searchOrderBasicData.search")
    @GetMapping("/getBasicData")
    public Result getBasicData(){
        return Result.seccess(basicDateService.getBasicData());
    }
    @ApiOperation("查询基础数据类型")
    @SaCheckPermission("searchOrderBasicData.search")
    @GetMapping("/getBasicDataType")
    public Result getBasicDataType(){
        return Result.seccess(basicDateService.getBasicDataType());
    }

    @ApiOperation("新增基础数据")
    @SaCheckPermission("searchOrderBasicData.add")
    @PostMapping("addBasicData")
    public Result addBasicData(@RequestBody Map<String,Object> map){
        return  Result.seccess(basicDateService.addBasicData(map));
    }

    @ApiOperation("更新基础数据")
    @SaCheckPermission("searchOrderBasicData.update")
    @PostMapping("updateBasicData")
    public Result updateBasicData(@RequestBody BasicData basicData){
        return  Result.seccess(basicDateService.updateBasicData(basicData));
    }

    @ApiOperation("删除基础数据")
    @SaCheckPermission("searchOrderBasicData.delete")
    @PostMapping("deleteBasicData")
    public Result deleteBasicData(@RequestBody BasicData basicData){
        return  Result.seccess(basicDateService.deleteBasicData(basicData));

 north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java

@@ -1,17 +1,17 @@
package com.example.erp.controller.sd;

import com.example.erp.common.Result;
import com.example.erp.service.sd.BasicGlassTypeServise;
import com.example.erp.service.sd.BasicGlassTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@RestController
@RequestMapping("/basicGlassType")
public class BasicGlassTypeController {
    @Autowired
    BasicGlassTypeServise basicGlassTypeServise;
    BasicGlassTypeService basicGlassTypeServise;

    @GetMapping("/getOneLevel")
    public Result getOneLevel(){
@@ -26,4 +26,25 @@
    public Result getAll(){
        return Result.seccess(basicGlassTypeServise.getAll());
    }

    @GetMapping("/findAll")
    public Result findAll(){
        return Result.seccess(basicGlassTypeServise.findAll());
    }

    @GetMapping("/deleteById/{id}")
    public Result deleteById(@PathVariable Integer id){
        return Result.seccess(basicGlassTypeServise.deleteById(id));
    }

    @GetMapping("/getOneLevelListMap")
    public Result getOneLevelListMap(){
        return Result.seccess(basicGlassTypeServise.getOneLevelListMap());
    }

    @PostMapping("/add")
    public Result add(@RequestBody Map<String,Object> map){
        return Result.seccess(basicGlassTypeServise.add(map));
    }

}

 north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java

@@ -1,6 +1,7 @@
package com.example.erp.controller.sd;


import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Customer;
@@ -28,12 +29,14 @@

    /*发货订单查询*/
    @ApiOperation("客户查询接口")
    @SaCheckPermission("selectCustomer.search")
    @PostMapping("/getSelectCustomer/{pageNum}/{pageSize}")
    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Customer customer){
        return Result.seccess(customerService.getSelectCustomer(pageNum,pageSize,customer));
    }

    @ApiOperation("客户新增修改接口")
    @SaCheckPermission("CreateCustomer.add")
    @PostMapping("/insertCustomer")
    public Result insertCustomer( @RequestBody Map<String,Object>  object){
        if(customerService.insertCustomer(object)){
@@ -47,6 +50,7 @@
    }

    @ApiOperation("客户删除接口")
    @SaCheckPermission("selectCustomer.delete")
    @PostMapping("/deleteCustomer")
    public Result deleteCustomer( @RequestBody Map<String,Object>  object){
        if(customerService.deleteCustomer(object)){
@@ -60,6 +64,7 @@
    }

    @ApiOperation("客户订单查询接口")
    @SaCheckPermission("selectCustomerOrder.search")
    @PostMapping("/getSelectCustomerOderDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectCustomerOderDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody OrderDetail orderDetail){
        return Result.seccess(customerService.getSelectCustomerOderDate(pageNum,pageSize,selectDate,orderDetail));

 north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java

@@ -1,6 +1,7 @@
package com.example.erp.controller.sd;


import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.FinishedGoodsInventory;
@@ -28,6 +29,7 @@

    /*发货订单查询*/
    @ApiOperation("发货订单查询接口")
    @SaCheckPermission("selectDelivery.search")
    @PostMapping("/getSelectShippingOrder/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery){
        return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
@@ -35,6 +37,7 @@

    /*发货报表查询*/
    @ApiOperation("发货报表查询接口")
    @SaCheckPermission("deliveryReport.search")
    @PostMapping("/getSelectDeliveryDetailReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectDeliveryDetailReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
        return Result.seccess(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
@@ -42,6 +45,7 @@

    /*发货订单明细查询*/
    @ApiOperation("发货编辑订单明细查询接口")
    @SaCheckPermission("createDelivery.search")
    @PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
    public Result getSelectShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
@@ -49,6 +53,7 @@

    /*库存可发货订单查询*/
    @ApiOperation("库存可发货订单查询接口接口")
    @SaCheckPermission("selectOrderList.search")
    @PostMapping("/getSelectOrderInventory/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectOrderInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Order order){
        return Result.seccess(deliveryService.getSelectOrderInventory(pageNum,pageSize,selectDate,order));
@@ -56,11 +61,13 @@

    /*发货订单明细查询*/
    @ApiOperation("发货新增订单明细查询接口")
    @SaCheckPermission("createDelivery.search")
    @PostMapping("/getSelectShippingOrderDetails/{pageNum}/{pageSize}")
    public Result getSelectShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
    }
    @ApiOperation("发货新增接口")
    @SaCheckPermission("createDelivery.add")
    @PostMapping("/insertDelivery")
    public Result insertDelivery( @RequestBody Map<String,Object> object){
        if(deliveryService.insertDelivery(object)){
@@ -72,6 +79,7 @@
        }
    }
    @ApiOperation("发货审核修改接口")
    @SaCheckPermission("createDelivery.review")
    @PostMapping("/updateDeliveryToExamine")
    public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
        if(deliveryService.updateDeliveryToExamine(object)){
@@ -84,6 +92,7 @@
    }

    @ApiOperation("发货删除接口")
    @SaCheckPermission("selectDelivery.delete")
    @PostMapping("/deleteDelivery")
    public Result deleteDelivery( @RequestBody Map<String,Object> object){
        if(deliveryService.deleteDelivery(object)){
@@ -96,6 +105,7 @@
    }

    @ApiOperation("发货订单查询接口")
    @SaCheckPermission("selectDelivery.search")
    @PostMapping("/getSelectDeliveryPrinting")
    public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
        return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -33,6 +33,7 @@

    @ApiOperation("订单保存")
    @PostMapping("/saveOrder")
    @SaCheckPermission("createOrder.add")
    public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
        if(orderService.saveOrder(orderMap))    {
            return Result.seccess(true);
@@ -54,39 +55,46 @@
    }

    @ApiOperation("订单作废")
    @SaCheckPermission("createOrder.cancel")
    @PostMapping("/cancelOrder/{id}")
    public Result cancelOrder(@PathVariable String id)  {
        return Result.seccess(orderService.cancelOrder(id));
    }

    @ApiOperation("根据id获取订单信息")
    @SaCheckPermission("selectOrder.edit")
    @PostMapping("/getOrderById/{id}")
    public Result getOrderById(@PathVariable String id)  {
        return  Result.seccess(orderService.getOrderById(id));
    }
    @ApiOperation("查询订单工艺")
    @SaCheckPermission("updateOrderCraft.search")
    @PostMapping("/getOrderCraftById/{id}")
    public Result getOrderCraftById(@PathVariable String id)  {
        return  Result.seccess(orderService.getOrderCraftById(id));
    }
    @ApiOperation("审核订单")
    @SaCheckPermission("createOrder.review")
    @PostMapping("/reviewOrderById/{id}/{status}")
    public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status)  {
        return  Result.seccess(orderService.reviewOrderById(id,status));
    }

    @ApiOperation("审核工艺")
    @SaCheckPermission("updateOrderCraft.review")
    @PostMapping("/reviewProcessById/{id}/{status}")
    public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails)  {
        return  Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails));
    }

    @ApiOperation("更新订单金额单价")
    @SaCheckPermission("createOrder.amountReset")
    @PostMapping("/updateOrderMoney")
    public Result updateOrderMoney(@RequestBody Map<String,Object> map)  {
        return  Result.seccess(orderService.updateOrderMoney(map));
    }

    @SaCheckPermission("orderReport.search")
    @ApiOperation("查询订单报表")
    @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getOrderReport(@PathVariable Integer pageNum,

 north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java

@@ -1,5 +1,6 @@
package com.example.erp.controller.sd;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Product;
import com.example.erp.service.sd.ProductService;
@@ -24,27 +25,32 @@
    }

    @ApiOperation("产品查询接口")
    @SaCheckPermission("selectProduct.search")
    @PostMapping  ("/{pageNum}/{pageSize}/{glassType}")
    public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> glassType, @RequestBody Product product){
        return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product));
    }
    @ApiOperation("产品保存接口")
    @SaCheckPermission("selectProduct.add")
    @PostMapping("/saveProduct")
    public Result saveProduct(@RequestBody Map<String,Object> product){
        return Result.seccess(productService.saveProduct(product));
    }
    @ApiOperation("产品删除接口")
    @SaCheckPermission("selectProduct.delete")
    @PostMapping("/deleteProductById/{id}")
    public Result deleteProductById(@PathVariable Integer id){
        return Result.seccess(productService.deleteProductById(id));
    }

    @ApiOperation("产品审核状态修改接口")
    @SaCheckPermission("selectProduct.review")
    @PostMapping("/updateProductStateById/{id}/{state}")
    public Result updateProductStateById(@PathVariable Integer id,@PathVariable Integer state){
        return Result.seccess(productService.updateProductStateById(id,state));
    }
    @ApiOperation("根据产品id查询产品接口")
    @SaCheckPermission("selectProduct.edit")
    @PostMapping("/selectProductById/{id}")
    public Result selectProductById(@PathVariable Integer id){
        return Result.seccess(productService.selectProductById(id));

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java

@@ -2,11 +2,9 @@

import com.example.erp.common.Result;
import com.example.erp.service.userInfo.PermissionBasicService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("/permission")
@@ -17,13 +15,13 @@
        this.permissionBasicService = permissionBasicService;
    }

    @PostMapping("getPermission/{userId}")
    public Result getPermission(@PathVariable Integer userId){
        return  Result.seccess(permissionBasicService.getPermission(userId));
    @PostMapping("getPermission/{roleId}/{lang}")
    public Result getPermission(@PathVariable Integer roleId,@PathVariable String lang, @RequestBody List<Integer> selectPageId){
       return  Result.seccess(permissionBasicService.getPermission(roleId,lang,selectPageId));
    }

    @PostMapping("getPermissionList")
    public Result getPermission(){
        return  Result.seccess(permissionBasicService.getPermissionList());
    @PostMapping("getPermissionList/{lang}")
    public Result getPermission(@PathVariable String lang){
        return  Result.seccess(permissionBasicService.getPermissionList(lang));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionRoleController.java

New file
@@ -0,0 +1,34 @@
package com.example.erp.controller.userInfo;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.service.userInfo.PermissionRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;

@RestController
@Api(value="角色权限controller",tags={"角色权限操作接口"})
@RequestMapping("/permissionRole")
public class PermissionRoleController {
    private final PermissionRoleService permissionRoleService;

    public PermissionRoleController(PermissionRoleService permissionRoleService) {
        this.permissionRoleService = permissionRoleService;
    }


    @ApiOperation("角色权限保存")
    @SaCheckPermission("roleList.update")
    @RequestMapping("/savePermissionRole")
    public Result savePermissionRole(@RequestBody Map<String, Object> permissionRole) {
        return Result.seccess(permissionRoleService.savePermissionRole(permissionRole));
    }


}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java

@@ -1,13 +1,16 @@
package com.example.erp.controller.userInfo;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.entity.userInfo.Role;
import com.example.erp.service.userInfo.RoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@RestController
@Api(value="角色controller",tags={"角色操作接口"})
@RequestMapping("/role")
public class RoleController {
    private final RoleService roleService;
@@ -16,8 +19,20 @@
        this.roleService = roleService;
    }


    @ApiOperation("查询所有角色")
    @SaCheckPermission("roleList.search")
    @GetMapping("/findAll")
    public Result findAll(){
        return Result.seccess(roleService.findAll());
    }


    @ApiOperation("新增角色")
    @SaCheckPermission("roleList.add")
    @PostMapping("/add")
    public Result add(@RequestBody Role role){
        return Result.seccess(roleService.add(role));

    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java

@@ -6,9 +6,12 @@
import com.example.erp.common.Result;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.service.userInfo.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

@RestController
@Api(value="用户controller",tags={"用户操作接口"})
@RequestMapping("/userInfo")
public class UserInfoController {
    private final UserService userService;
@@ -19,30 +22,41 @@
    }

    @PostMapping("/login")
    @ApiOperation("用户登录")
    public Result login(@RequestBody UserDTO userDTO) {
        return Result.seccess(userService.doLogin(userDTO));
    }


    @ApiOperation("用户退出")
    @PostMapping("/logout")
    public Result logout() {
        return Result.seccess(userService.logout());
    }

    @ApiOperation("判断用户是否登录")
    @PostMapping("/isLogin")
    public Result isLogin() {
    return Result.seccess(userService.isLogin()); }

    @SaCheckLogin
    @ApiOperation("获取用户token")
    @PostMapping("/getTokenInfo")
    public Result userAdd() {
        return Result.seccess(StpUtil.getTokenInfo());
    }


    @SaCheckPermission("userList.delete")
    @ApiOperation("删除用户")
    @PostMapping("/userDelete/{id}")
    public Result userDelete(@PathVariable Integer id) {
        return Result.seccess(userService.userDelete(id));
    }


    @ApiOperation("查询用户列表")
    @SaCheckPermission("userList.search")
    @GetMapping("findAll")
    public Result findAll(){
        return Result.seccess(userService.findAll());

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserRoleController.java

@@ -1,8 +1,11 @@
package com.example.erp.controller.userInfo;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.service.userInfo.UserRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -12,6 +15,7 @@
import java.util.Map;

@RestController
@Api(value="用户角色controller",tags={"用户角色操作接口"})
@RequestMapping("/userRole")
public class UserRoleController {
    private final UserRoleService userRoleService;
@@ -20,6 +24,9 @@
        this.userRoleService = userRoleService;
    }


    @ApiOperation("更新用户角色")
    @SaCheckPermission("userList.update")
    @PostMapping("/updateUserRole")
    public Result updateUserRole(@RequestBody Map<String,Object> params) {
        return Result.seccess(userRoleService.updateUserRole(params));

 north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicGlassType.java

@@ -10,7 +10,7 @@
    private Integer id;
    private Integer level;
    private String belong;
    private String typeID;
    private String typeId;
    private String typeName;
    private String createTime;


 north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionBasic.java

@@ -1,6 +1,7 @@
package com.example.erp.entity.userInfo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

@@ -12,4 +13,6 @@
    private String page;
    private String permission;
    private String state;
    @TableField(select = false,exist = false)
    private Boolean checked;
}

 north-glass-erp/src/main/java/com/example/erp/entity/userInfo/SysMenuItem.java

@@ -11,6 +11,7 @@
    private Integer menuID;
    private String itemName;
    private String url;
    private String menu;
    private String languageType;
    private Integer state;
    private Integer listSort;

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/BasicGlassTypeMapper.java

@@ -1,13 +1,22 @@
package com.example.erp.mapper.sd;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.sd.BasicGlassType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface BasicGlassTypeMapper {
public interface BasicGlassTypeMapper extends BaseMapper<BasicGlassType> {
    List<BasicGlassType> getOneLevel();

    List<BasicGlassType> getTwoLevel();

    BasicGlassType selectMaxType(Integer type);

    BasicGlassType selectMaxTowLevelType(String type);


    Boolean updateGlassTypeName(@Param("basicGlassType") BasicGlassType basicGlassType);
}

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionBasicMapper.java

@@ -9,9 +9,10 @@

@Mapper
public interface PermissionBasicMapper extends BaseMapper<PermissionBasic> {
     List<PermissionBasic> getPermission(Integer userId);
     List<PermissionBasic> getPermission(Integer roleId, String lang, Integer id);

     List<PermissionBasic> selectOneLevel();
     List<PermissionBasic> selectOneLevel(String lang);

     List<Map<String,Object>> selectTowLevel(String menu);
     List<Map<String,Object>> selectTowLevel(Integer id);

}

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java

@@ -9,4 +9,8 @@
@Mapper
public interface PermissionRoleMapper extends BaseMapper<PermissionRole> {
    List<String> getUserPermission(Integer loginId);

    Boolean saveBatch(List<PermissionRole> permissionRoles);

    List<String> getUserEditPermission(Integer loginId);
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java

New file
@@ -0,0 +1,108 @@
package com.example.erp.service.sd;

import com.alibaba.fastjson.JSON;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.sd.BasicGlassType;
import com.example.erp.mapper.sd.BasicGlassTypeMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.*;

@Service
@DS("sd")
public class BasicGlassTypeService {
    @Autowired
    BasicGlassTypeMapper basicGlassTypeMapper;
    public List<BasicGlassType> getOneLevel() {
        return basicGlassTypeMapper.getOneLevel();
    }

    public List<BasicGlassType>  getTwoLevel() {
        return basicGlassTypeMapper.getTwoLevel();
    }

    public List<Map<String,String>> getAll() {
        List<BasicGlassType> oneGlassType = basicGlassTypeMapper.getOneLevel();
        List<BasicGlassType> twoGlassType = basicGlassTypeMapper.getTwoLevel();
        List<Map<String,String>> list = new ArrayList<>();
        for (BasicGlassType glassType : oneGlassType) {
            Map<String, String> map = new HashMap<>();
            map.put("value", glassType.getTypeId());
            map.put("label", glassType.getTypeName());
            map.put("children", "");
            List<String> equalList = new ArrayList<>();
            for (BasicGlassType basicGlassType : twoGlassType) {
                if (Objects.equals(basicGlassType.getBelong(), glassType.getTypeId())) {
                    Map<String,String> getMap = JSON.parseObject(JSON.toJSONString(basicGlassType), Map.class);
                    getMap.put("value",getMap.get("typeId"));
                    getMap.put("label",getMap.get("typeName"));
                    equalList.add(JSON.toJSONString(getMap)   );
                }
            }
            map.replace("children",equalList.toString());
            list.add(map);
        }
        return list;
    }

    public List<BasicGlassType> findAll() {
        return basicGlassTypeMapper.selectList(null);
    }

    public Boolean deleteById(Integer id) {
        return basicGlassTypeMapper.deleteById(id) > 0;
    }

    public List<Map<String,Object>> getOneLevelListMap() {
        List<BasicGlassType> oneGlassType = basicGlassTypeMapper.getOneLevel();
        List<Map<String,Object>> list = new ArrayList<>();
        for (BasicGlassType glassType : oneGlassType) {
            Map<String,Object> map = new HashMap<>();
            map.put("value", glassType.getTypeId());
            map.put("label", glassType.getTypeName());
            list.add(map);
        }
        return list;
    }

    public Boolean add(Map<String, Object> map) {
        List<Object> list = (List<Object>) map.get("glassLevel");
        if(list.get(0)==null
                || map.get("value") == null
                || map.get("value").equals("")){
            return false;
        }
        BasicGlassType basicGlassTypeS = new BasicGlassType();
        if(map.get("type").equals("add")){
            if(list.size()==1){
                BasicGlassType basicGlassType =  basicGlassTypeMapper.selectMaxType((Integer) list.get(0));
                int maxId = Integer.parseInt(basicGlassType.getTypeId());
                String newTypeId = String.format("%02d", maxId+1);
                basicGlassTypeS.setLevel((Integer) list.get(0));
                basicGlassTypeS.setTypeId(newTypeId);
                basicGlassTypeS.setTypeName((String) map.get("value"));
            }else if(list.size()==2) {
                BasicGlassType basicGlassType =  basicGlassTypeMapper.selectMaxTowLevelType((String) list.get(1));
                Integer maxId = null;
                if(basicGlassType==null){
                    maxId = 0;
                }else {
                    maxId = Integer.parseInt(basicGlassType.getTypeId().substring(2));
                }

                String newTypeId =list.get(1) + String.format("%02d", maxId+1);
                basicGlassTypeS.setLevel((Integer) list.get(0));
                basicGlassTypeS.setTypeId(newTypeId);
                basicGlassTypeS.setTypeName((String) map.get("value"));
                basicGlassTypeS.setBelong((String) list.get(1));
            }
            return basicGlassTypeMapper.insert(basicGlassTypeS)>0;
        }else{
            basicGlassTypeS.setId((Integer) map.get("id"));
            basicGlassTypeS.setTypeName((String) map.get("value"));
           return basicGlassTypeMapper.updateGlassTypeName(basicGlassTypeS);
        }

    }
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeServise.java

File was deleted

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java

@@ -1,9 +1,7 @@
package com.example.erp.service.userInfo;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.mapper.userInfo.PermissionBasicMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
@@ -19,20 +17,20 @@
        this.permissionBasicMapper = permissionBasicMapper;
    }

    public List<PermissionBasic> getPermission(Integer userId) {
        return permissionBasicMapper.getPermission(userId);
    public List<PermissionBasic> getPermission(Integer roleId, String lang, List<Integer> selectPageId) {
        return permissionBasicMapper.getPermission(roleId,lang, selectPageId.get(1));
    }

    public Object getPermissionList() {
        List<PermissionBasic> getOne = permissionBasicMapper.selectOneLevel();
    public Object getPermissionList(String lang) {
        List<PermissionBasic> getOne = permissionBasicMapper.selectOneLevel(lang);
        List<Map<String,Object>> ListOne = new ArrayList<>();

        for(PermissionBasic permissionBasic : getOne){

            System.out.println(permissionBasic.getMenu());
            Map<String,Object> map = new HashMap<>();
            map.put("value",permissionBasic.getId());
            map.put("label",permissionBasic.getMenu());
            map.put("children",permissionBasicMapper.selectTowLevel(permissionBasic.getMenu()));
            map.put("children",permissionBasicMapper.selectTowLevel(permissionBasic.getId()));
            ListOne.add(map);
        }


 north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java

@@ -1,11 +1,18 @@
package com.example.erp.service.userInfo;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.entity.userInfo.PermissionRole;
import com.example.erp.mapper.userInfo.PermissionRoleMapper;
import com.example.erp.mapper.userInfo.UserMapper;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@DS("user_info")
@Service
@@ -26,4 +33,30 @@
    public List<String> getUserRole(Integer id) {
        return userMapper.getUserRole(id);
    }

    public Boolean savePermissionRole(Map<String, Object> permissionRoleMap) {
        JSONObject permissionRoleJson = new JSONObject(permissionRoleMap);
        List<PermissionBasic> permissionBasics =
                JSONArray.parseArray(
                        JSONObject.toJSONString(permissionRoleJson.get("detail")),
                        PermissionBasic.class);
        Integer roleId = (Integer) permissionRoleMap.get("id");
        if(permissionBasics.isEmpty() || roleId == null ){
            return false;
        }


        List<PermissionRole> permissionRoles = new ArrayList<>();
        for (PermissionBasic permissionBasic : permissionBasics) {
            PermissionRole permissionRole = new PermissionRole();
            permissionRole.setRoleId(roleId);
            permissionRole.setPermissionId(permissionBasic.getId());
            permissionRoles.add(permissionRole);
        }
        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));
        return permissionRoleMapper.saveBatch(permissionRoles);



    }
}

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/RoleService.java

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.userInfo.Role;
import com.example.erp.mapper.userInfo.RoleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -24,4 +23,9 @@
                        .ne("role","admin")
        );
    }

    public Boolean add(Role role) {

        return roleMapper.insert(role) > 0;
    }
}

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java

@@ -5,8 +5,11 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.entity.userInfo.Role;
import com.example.erp.entity.userInfo.User;
import com.example.erp.mapper.userInfo.PermissionBasicMapper;
import com.example.erp.mapper.userInfo.PermissionRoleMapper;
import com.example.erp.mapper.userInfo.RoleMapper;
import com.example.erp.mapper.userInfo.UserMapper;
import com.example.erp.tools.TokenTools;
@@ -28,9 +31,12 @@
    private final UserMapper userMapper;
    private final RoleMapper roleMapper;

    public UserService(UserMapper userMapper, RoleMapper roleMapper) {
   private final PermissionRoleMapper permissionRoleMapper;

    public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper) {
        this.userMapper = userMapper;
        this.roleMapper = roleMapper;
        this.permissionRoleMapper = permissionRoleMapper;
    }


@@ -88,6 +94,7 @@
            userDTO.setId(user.getId());
            userDTO.setUserName(user.getUserName());
            userDTO.setToken(StpUtil.getTokenValue());
            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId()));
            return userDTO;
        }else{
            return null;

 north-glass-erp/src/main/resources/mapper/sd/BasicGlassTypeMapper.xml

@@ -19,4 +19,33 @@
        ORDER BY  a.id ;
    </select>

    <select id="selectMaxType">
        select
            *
        from
            basic_glass_type  as a
        where a.level=1
        ORDER BY  a.id  desc limit 1;

    </select>

    <select id="selectMaxTowLevelType">
        select
            *
        from
            basic_glass_type  as a
        where
            a.level=2
            and a.belong = #{type}

        ORDER BY  a.id  desc limit 1;
    </select>
    
    <update id="updateGlassTypeName" parameterType="com.example.erp.entity.sd.BasicGlassType" >
        update
            basic_glass_type as a
        set a.type_name = #{basicGlassType.typeName}
        where a.id = #{basicGlassType.id}
    </update>

</mapper>

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -47,7 +47,7 @@
    <select id="getOrderList">
        select
            *,
        sum(fgi.quantity_available) as goodsQuantity
        ifnull(sum(fgi.quantity_available),0) as goodsQuantity
        from
            `order` as o
        left join mm.finished_goods_inventory as  fgi

 north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml

@@ -17,7 +17,7 @@
        <result column="update_time" property="updateTime"/>
        <!--接收其他外键实体类数据-->
        <association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
            <result column="type_id" property="typeID"/>
            <result column="type_id" property="typeId"/>
            <result column="type_name" property="typeName"/>
        </association>


 north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml

@@ -4,28 +4,46 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.userInfo.PermissionBasicMapper">
    <select id="getPermission">
        select a.*,
               CASE
                   WHEN b.id IS NULL THEN 0
                   ELSE 1
                END
        select a.id,
        <if test="lang=='en'">
               a.menu,
        </if>
        <if test="lang=='zh'">
               c.itemName as menu,
        </if>
               a.page,
               a.permission,
               a.state,
        IF(b.id IS NULL, 0, 1) as 'checked'
        from permission_basic as a
        left join permission_role as b
        on a.id = b.permission_id
        left join user_role as c
        on b.role_id = c.role_id
        left join user as d
        on c.user_id = d.id
        and d.id = #{userId}
        on b.permission_id = a.id
        and b.role_id = #{roleId}
        <if test="lang=='zh'">
            left join sys_menu_item as c
            on c.menu = a.menu
        </if>

        where a.id!=1 and a.state=1
        <if test="id != null and id != ''">
            and a.page = (select page from permission_basic where id = #{id})
        </if>
        group by a.id
    </select>
    
    <select id="selectOneLevel">
        select *
        from permission_basic
        where id!=1 and state=1
        group by  menu
        select a.id,
               <if test="lang=='zh'">
                   b.itemName as menu
               </if>
                <if test="lang=='en'">
                    a.menu
                </if>
        from permission_basic as a
        left join sys_menu_item as b
        on a.menu = b.menu
        where a.id!=1 and a.state=1
        group by  a.menu

    </select>

@@ -34,9 +52,13 @@
            id as value,
            page as label
        from permission_basic
        where id!=1 and state=1
        group by  menu
        where
          state=1
          and menu = (select menu from permission_basic where id = #{id})
        group by page

    </select>



</mapper>

 north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml

@@ -22,4 +22,48 @@
            and d.state = 1
    </select>

    <select id="getUserEditPermission">
        select
            concat(
                    if(d.page=null || d.page='','',concat(d.page, '.')),
                    d.permission
                ) as 'permission'
        <if test="loginId!=1">
        from user as a
                 left join user_role as e
                           on e.user_id = a.id
                 left join role as b
                           on e.role_id = b.id
                 left join permission_role as c
                           on b.id = c.role_id
                 left join permission_basic d
                           on  d.id = c.permission_id
                           and d.permission='edit'
        where a.id = #{loginId}

        </if>
        <if test="loginId==1">
            from permission_basic d
            where d.permission='edit'
        </if>
            and d.state = 1
        group by  d.id
    </select>
    
    <insert id="saveBatch">
        insert into
            permission_role(
                            role_id,
                            permission_id
                            )
        values
        <foreach collection ="permissionRoles" item="permissionRole" separator =",">
            (
                #{permissionRole.roleId},
                #{permissionRole.permissionId}
            )
        </foreach>

    </insert>

</mapper>

 north-glass-erp/target/classes/mapper/sd/BasicGlassTypeMapper.xml

@@ -19,4 +19,33 @@
        ORDER BY  a.id ;
    </select>

    <select id="selectMaxType">
        select
            *
        from
            basic_glass_type  as a
        where a.level=1
        ORDER BY  a.id  desc limit 1;

    </select>

    <select id="selectMaxTowLevelType">
        select
            *
        from
            basic_glass_type  as a
        where
            a.level=2
            and a.belong = #{type}

        ORDER BY  a.id  desc limit 1;
    </select>
    
    <update id="updateGlassTypeName" parameterType="com.example.erp.entity.sd.BasicGlassType" >
        update
            basic_glass_type as a
        set a.type_name = #{basicGlassType.typeName}
        where a.id = #{basicGlassType.id}
    </update>

</mapper>

 north-glass-erp/target/classes/mapper/sd/ProductMapper.xml

@@ -17,7 +17,7 @@
        <result column="update_time" property="updateTime"/>
        <!--接收其他外键实体类数据-->
        <association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
            <result column="type_id" property="typeID"/>
            <result column="type_id" property="typeId"/>
            <result column="type_name" property="typeName"/>
        </association>


 north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml

@@ -21,5 +21,21 @@
        where a.id = #{loginId}
            and d.state = 1
    </select>
    
    <insert id="saveBatch">
        insert into
            permission_role(
                            role_id,
                            permission_id
                            )
        values
        <foreach collection ="permissionRoles" item="permissionRole" separator =",">
            (
                #{permissionRole.roleId},
                #{permissionRole.permissionId}
            )
        </foreach>

    </insert>

</mapper>

 north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -5,6 +5,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\ProductDetailMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\GlassType.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\PermissionBasicController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\OptimizeUse.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\interceptor\JwtInterceptor.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\WorkOrderMapper.java
@@ -13,6 +14,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysMenu.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\OrderTestMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReworkController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\RoleController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Rework.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\CustomerService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\MaterialStoreMapper.java
@@ -25,10 +27,13 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\WebSocketServer.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\ProductController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\User.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\UserRoleController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\FinishedGoodsInventoryService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicDateService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\Role.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\BasicDataController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Delivery.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\PermissionRoleMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Customer.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysMenuMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\ReportingWork.java
@@ -57,6 +62,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialStore.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysMenuItem.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\DeliveryController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\RoleMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\WorkOrderController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderGlassDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReplenishService.java
@@ -74,16 +80,21 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\WorkOrderService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialStoreService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\PermissionRoleController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\dto\UserDTO.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportingWorkService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\ProductDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\PermissionRoleService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\ReturningWarehouseDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\BasicWarehouseTypeService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\OrderProcessDetailService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\DeliveryOtherMoneyMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\UserRoleService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\MaterialInventoryMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\RoleService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyWebSocketHandler.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\FlowCard.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\PermissionBasicMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkDetailMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\DeviceMaintenanceService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysError.java
@@ -93,8 +104,10 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\InterceptorConfig.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\BasicDataProduce.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicGlassTypeServise.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\UserInfoController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialOutbound.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialInventoryService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\UserRole.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\MyCorsConfig.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\SwaggerConfig.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Device.java
@@ -118,6 +131,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\Constants.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\PatchLogMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Report.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysErrorMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\DownExcel.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\DeliveryDetail.java
@@ -127,19 +141,24 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\FinishedGoodsInventoryMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\DamageDetails.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\ReturnsDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\UserRoleMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\ErpApplication.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderOtherMoneyMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\WebSocketConfig.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\BasicDataProduceController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\SaTokenConfigure.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\BasicDateProduceMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\ProductMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\StpInterfaceImpl.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReworkMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\SysMenuController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\CustomerMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\NettyServer.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\PermissionBasic.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialInventory.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\ReturningWarehouse.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderProcessDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\PermissionBasicService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\BasicWarehouseType.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReplenishController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicOtherMoneyService.java
@@ -149,6 +168,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\OrderService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\DeliveryService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\OrderTestController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\PermissionRole.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\BasicWarehouseTypeMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialOutboundDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Product.java