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

廖井涛

2024-02-20 149d60a12ef635c2b08e4ebedfc9afa7363a6562

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

# Conflicts:
#	north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml

 .idea/jarRepositories.xml

@@ -7,6 +7,11 @@
      <option name="url" value="https://repo.maven.apache.org/maven2" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Central Repository" />
      <option name="url" value="https://maven.aliyun.com/repository/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="nexus-aliyun" />
      <option name="name" value="nexus-aliyun" />
      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue

@@ -1,25 +1,46 @@
<script setup>

import {reactive} from "vue";
import {useRouter} from  'vue-router'
let router=useRouter()
const getTableRow = (row,type) =>{
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElDatePicker, ElMessage} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {Search} from "@element-plus/icons-vue"
import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
import Sortable from 'sortablejs'
import BasicTable from '@/components/basic/BasicTable.vue'
import {VXETable} from "vxe-table";

let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
const getTableRow = (row, type) => {
  switch (type) {
    case 'edit' :{
    case 'edit' : {
      //alert('我接收到子组件传送的编辑信息')
      router.push({path: '/main/processCard/PrintFlowCard', query: { id: row.id }})
      router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
      break
    }
    case 'delete':{
    case 'delete': {
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
      alert('我接收到子组件传送的排版状态')
      break
    }
  }
}



function padLeftZero(str) {
  return ('00' + str).substr(str.length)
}

//定义时间
const form = reactive({
  date1: '',
})




//表尾求和
const sumNum = (list, field) => {
@@ -30,8 +51,134 @@
  return count.toFixed(2)
}

//子组件接收参数
//定义滚动条高度
let scrollTop = ref(null)
let scrollHeight = ref(null)
let clientHeight = ref(null)
const scrollEvnt = (row) => {
  // 内容高度
  scrollTop.value = row.$event.target.scrollTop
  scrollHeight.value = row.$event.target.scrollHeight
  clientHeight.value = row.$event.target.clientHeight
}
//筛选条件，有外键需要先定义明细里面的数据
let filterData = ref({
  order: {
    project: ''
  },
  orderDetail: {
    productId: '',
    productName: '',
    computeGrossArea: '',
    processingNote: '',
  }

})
//定义页面总页数
let pageTotal = ref('')
//定义数据返回结果
let produceList = ref([])
//定义当前页数
let pageNum = $ref(1)
let pageState = null

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
      .toISOString()
      .replace('T', ' ')
      .slice(0,10) //默认开始时间7天前
  const end = new Date(new Date().getTime())
      .toISOString()
      .replace('T', ' ')
      .slice(0,10)//默认结束时间当前时间
  return [start, end]
}


//第一次加载获取近七天时间和默认状态
form.date1=getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]

//第一次加载数据

request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {

  if (res.code == 200) {
    console.log(res.data.data)
    pageTotal.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
    ElMessage.warning(res.msg)
  }
})

//点击查询
const getWorkOrder = () => {

  let startTime = form.date1[0]
  let endTime = form.date1[1]
  request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
    if (res.code == 200) {

      pageTotal.value = res.data.total
      xGrid.value.loadData(res.data.data)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
    }
  })
}

/*使用筛选，后端获取数据*/
const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}

function filterChanged(column) {
  gridOptions.loading = true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0] != undefined ? column.datas[0] : ''
  value = value.trim()
  //判断是否存在外键
  if (column.property.indexOf('.') > -1) {
    const columnArr = column.property.split('.')
    filterData.value[columnArr[0]] = {
      [columnArr[1]]: value
    }
  } else {
    filterData.value[column.property] = value
  }

//获取选中时间和是否转单状态
  let startTime = form.date1[0]
  let endTime = form.date1[1]

  request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
    if(res.code==200){
      pageTotal.value=res.data.total

      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
    }
  })
}

/*后端返回结果多层嵌套展示*/
const hasDecimal = (value) => {
  const regex = /\./; // 定义正则表达式，查找小数点
  return regex.test(value); // 返回true/false
}

//子组件接收参数
const xGrid = ref()
const gridOptions = reactive({
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
@@ -64,16 +211,15 @@
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {title: '操作', width: 140, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {field: '销售单号', title: '销售单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: '流程卡号', width: 120, title: '流程卡号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '产品编号', title: '产品编号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '产品名称', title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '项目名称', title: '项目名称', sortable: true,showOverflow:"ellipsis"},
    {field: '总数量', title: '总数量', sortable: true},
    {field: '总面积', title: '总面积', sortable: true},
    {field: '分箱数', title: '分箱数', sortable: true,showOverflow:"ellipsis"},
    {field: '分架员', title: '分架员', sortable: true},
    {field: '加工要求', title: '加工要求', sortable: true}
    {field: 'orderId', title: '销售单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: 'productionId', width: 120, title: '流程卡号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productId', title: '产品编号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productName', title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'order.project', title: '项目名称', sortable: true,showOverflow:"ellipsis"},
    {field: 'binningQuantity', title: '数量', sortable: true},
    {field: 'orderDetail.compute_gross_area', title: '面积', sortable: true},
    {field: 'founder', title: '分架员', sortable: true},
    {field: 'orderDetail.processingNote', title: '加工要求', sortable: true}
  ],//表头按钮

  toolbarConfig: {
@@ -87,90 +233,7 @@
    custom: true
  },
  data:  [
    {
      销售单号: 'NG231201',
      流程卡号: 'NG231201A01 ',
      产品编号: '9001010203000008',
      产品名称: '5mm白玻平钢(外)+0.76PVB透明+5mm白玻平钢(内)',
      项目名称: '信合春天里',
      总数量: '169',
      总面积: '175.31',
      分箱数: '3',
      分架员: 'xxx',
      加工要求: '1)按企标2)每片玻璃标签贴室外面。内片玻璃打“3C商标”，统一打在玻璃“宽度”方向右下角4)按批次单独落架。',
    },
    {
      销售单号: 'NG231201',
      流程卡号: 'NG231201A01 ',
      产品编号: '9001010203000008',
      产品名称: '5mm白玻平钢(外)+0.76PVB透明+5mm白玻平钢(内)',
      项目名称: '信合春天里',
      总数量: '169',
      总面积: '175.31',
      分箱数: '3',
      分架员: 'xxx',
      加工要求: '1)按企标2)每片玻璃标签贴室外面。内片玻璃打“3C商标”，统一打在玻璃“宽度”方向右下角4)按批次单独落架。',
    },
    {
      销售单号: 'NG231201',
      流程卡号: 'NG231201A01 ',
      产品编号: '9001010203000008',
      产品名称: '5mm白玻平钢(外)+0.76PVB透明+5mm白玻平钢(内)',
      项目名称: '信合春天里',
      总数量: '169',
      总面积: '175.31',
      分箱数: '3',
      分架员: 'xxx',
      加工要求: '1)按企标2)每片玻璃标签贴室外面。内片玻璃打“3C商标”，统一打在玻璃“宽度”方向右下角4)按批次单独落架。',
    },
    {
      销售单号: 'NG231201',
      流程卡号: 'NG231201A01 ',
      产品编号: '9001010203000008',
      产品名称: '5mm白玻平钢(外)+0.76PVB透明+5mm白玻平钢(内)',
      项目名称: '信合春天里',
      总数量: '169',
      总面积: '175.31',
      分箱数: '3',
      分架员: 'xxx',
      加工要求: '1)按企标2)每片玻璃标签贴室外面。内片玻璃打“3C商标”，统一打在玻璃“宽度”方向右下角4)按批次单独落架。',
    },
    {
      销售单号: 'NG231201',
      流程卡号: 'NG231201A01 ',
      产品编号: '9001010203000008',
      产品名称: '5mm白玻平钢(外)+0.76PVB透明+5mm白玻平钢(内)',
      项目名称: '信合春天里',
      总数量: '169',
      总面积: '175.31',
      分箱数: '3',
      分架员: 'xxx',
      加工要求: '1)按企标2)每片玻璃标签贴室外面。内片玻璃打“3C商标”，统一打在玻璃“宽度”方向右下角4)按批次单独落架。',
    },
    {
      销售单号: 'NG231201',
      流程卡号: 'NG231201A01 ',
      产品编号: '9001010203000008',
      产品名称: '5mm白玻平钢(外)+0.76PVB透明+5mm白玻平钢(内)',
      项目名称: '信合春天里',
      总数量: '169',
      总面积: '175.31',
      分箱数: '3',
      分架员: 'xxx',
      加工要求: '1)按企标2)每片玻璃标签贴室外面。内片玻璃打“3C商标”，统一打在玻璃“宽度”方向右下角4)按批次单独落架。',
    },
    {
      销售单号: 'NG231201',
      流程卡号: 'NG231201A01 ',
      产品编号: '9001010203000008',
      产品名称: '5mm白玻平钢(外)+0.76PVB透明+5mm白玻平钢(内)',
      项目名称: '信合春天里',
      总数量: '169',
      总面积: '175.31',
      分箱数: '3',
      分架员: 'xxx',
      加工要求: '1)按企标2)每片玻璃标签贴室外面。内片玻璃打“3C商标”，统一打在玻璃“宽度”方向右下角4)按批次单独落架。',
    },

  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
@@ -190,16 +253,7 @@

})

const form = reactive({
  name: '',
  region: '',
  date1: '',
  date2: '',
  delivery: false,
  type: [],
  resource: '',
  desc: '',
})


</script>

@@ -210,9 +264,12 @@
        <el-date-picker
            v-model="form.date1"
            type="daterange"
            format="YYYY/MM/DD"
            value-format="YYYY-MM-DD"
            start-placeholder="开始时间"
            end-placeholder="结束时间"
            :default-time="defaultTime"

        />
        &nbsp;&nbsp;
        <el-button type="primary">查询</el-button>
@@ -229,11 +286,13 @@
    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <!--      下拉显示所有信息插槽-->
      <template #content="{ row}">
      <template #content="{ row }">
        <ul class="expand-wrapper">
          <li  v-for="(item,key,index) in row">
            <span style="font-weight: bold">{{key+':  '}}</span>
            <span>{{ item }}</span>
          <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
            <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
            <span v-else>{{ row[item.field] }}</span>

          </li>
        </ul>
      </template>

 north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue

@@ -1,25 +1,55 @@
<script setup>

import {reactive} from "vue";
import {useRouter} from  'vue-router'
let router=useRouter()
const getTableRow = (row,type) =>{
import {reactive, ref} from "vue";
import {useRouter} from 'vue-router'
import request from "@/utils/request";
import {ElMessage} from "element-plus";
import deepClone from "@/utils/deepClone";

let router = useRouter()
const getTableRow = (row, type) => {
  switch (type) {
    case 'edit' :{
    case 'edit' : {
      alert('我接收到子组件传送的编辑信息')
      //router.push({path: '/main/processCard/AddProcessCard', query: { id: row.id }})
      break
    }
    case 'delete':{
    case 'delete': {
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
    case  'setType': {
      alert('我接收到子组件传送的排版状态')
      break
    }
  }
}

//定义页面总页数
let pageTotal=ref('')
//定义数据返回结果
let produceList = ref([])
//定义当前页数
let pageNum=$ref(1)

const getRewokAddData = () => {
  request.post(`/reportData/rework/add/query/${pageNum}/100`,filterData.value).then((res) => {

    MessageShow(filterData.value);
    return ;

    if (res.code === 200) {
      pageTotal.value = res.data.total
      xGrid.value.loadData(res.data.data)
      gridOptions.loading = false
    } else {


      MessageShow(res.msg,'warning');
    }
  })
}


//表尾求和
const sumNum = (list, field) => {
@@ -33,18 +63,18 @@
//子组件接收参数

const gridOptions = reactive({
  border:  "full",//表格加边框
  border: "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true },//开启虚拟滚动
  showOverflow:true,
  scrollY: {enabled: true},//开启虚拟滚动
  showOverflow: true,
  columnConfig: {
    resizable: true,
    useKey: true
@@ -60,93 +90,115 @@
    mode: 'row',
    showStatus: true
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {title: '操作', width: 70, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {title: '操作', width: 70, slots: {default: 'button_slot'}, fixed: "left"},
    {type: 'seq', fixed: "left", title: '自序', width: 50},

    {field: 'reworkTeams',width: 90, title: '返工班组', editRender: { name: 'input', attrs: { placeholder: '' } }},
    {field: 'salesOrderNo',width: 120, title: '销售单号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'processCardNo',width: 120, title: '流程卡号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'entryName', width: 120,title: '项目名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'batch',width: 80, title: '批次', sortable: true,showOverflow:"ellipsis"},
    {field: 'serialNumber',width: 80, title: '序号', sortable: true},
    {field: 'singlePieceName',width: 120, title: '单片名称', sortable: true},
    {field: 'marking',width: 80, title: '标记', sortable: true,showOverflow:"ellipsis"},
    {field: 'pieces',width: 90, title: '片标记', sortable: true},
    {field: 'number',width: 80, title: '数量', sortable: true},
    {field: 'width',width: 80, title: '宽', sortable: true},
    {field: 'height',width: 80, title: '高', sortable: true},
    {field: 'shape',width: 80, title: '形状', sortable: true},
    {field: 'type',width: 100, title: '返工工序', sortable: true},
    {field: 'type',width: 100, title: '返工类型', sortable: true},
    {field: 'damage',width: 120, title: '返工原因', sortable: true},
    {field: 'device',width: 120, title: '责任设备', sortable: true},
    {field: 'teams',width: 120, title: '责任班组', sortable: true},
    {field: 'area',width: 120, title: '返工面积', sortable: true},
    {field: 'qualityInspector',width: 100, title: '质检员', sortable: true}
    {field: 'reworkTeams', width: 120, title: '返工班组', editRender: {name: 'input', attrs: {placeholder: ''}}},
    {
      field: 'salesOrderNo',
      width: 120,
      title: '销售单号',
      sortable: true,
      showOverflow: "ellipsis",
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'}
    },
    {
      field: 'processCardNo',
      width: 120,
      title: '流程卡号',
      sortable: true,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'}
    },
    {
      field: 'entryName',
      width: 120,
      title: '项目名称',
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {field: 'batch', width: 80, title: '批次', sortable: true, showOverflow: "ellipsis"},
    {field: 'serialNumber', width: 80, title: '序号', sortable: true},
    {field: 'singlePieceName', width: 120, title: '单片名称', sortable: true},
    {field: 'marking', width: 80, title: '标记', sortable: true, showOverflow: "ellipsis"},
    {field: 'pieces', width: 90, title: '片标记', sortable: true},
    {field: 'number', width: 80, title: '数量', sortable: true},
    {field: 'width', width: 80, title: '宽', sortable: true},
    {field: 'height', width: 80, title: '高', sortable: true},
    {field: 'shape', width: 80, title: '形状', sortable: true},
    {field: 'type', width: 100, title: '返工工序', sortable: true},
    {field: 'type', width: 100, title: '返工类型', sortable: true},
    {field: 'damage', width: 120, title: '返工原因', sortable: true},
    {field: 'device', width: 120, title: '责任设备', sortable: true},
    {field: 'teams', width: 120, title: '责任班组', sortable: true},
    {field: 'area', width: 120, title: '返工面积', sortable: true},
    {field: 'qualityInspector', width: 100, title: '质检员', sortable: true}
  ],//表头按钮

  toolbarConfig: {
     // buttons: [{
     //   name:'保存'
     // }],
    // buttons: [{
    //   name:'保存'
    // }],
    import: false,
    export: true,
    print: true,
    zoom: true,
    custom: true
  },
  data:  [
  data: [
    {

      reworkNumber:'FG20202020',
      salesOrderNo:'NG23010101',
      processCardNo:'NG23010101A01',
      entryName:'xxxx',
      batch:'二批三',
      serialNumber:'1',
      area:'23.11',
      qualityInspector:"张三",
      number:'1',
      reworkNumber: 'FG20202020',
      salesOrderNo: 'NG23010101',
      processCardNo: 'NG23010101A01',
      entryName: 'xxxx',
      batch: '二批三',
      serialNumber: '1',
      area: '23.11',
      qualityInspector: "张三",
      number: '1',
      singlePieceName: '6mm白玻平钢(外)',
      marking: '1',
      pieces: '(外)',
      width: '575',
      height:"2241",
      height: "2241",
      shape: '普形',
      type: '机器',
      damage:'气泡超标',
      device:'XXX',
      reworkProcess:'切割',
      damage: '气泡超标',
      device: 'XXX',
      reworkProcess: '切割',
    },
    {

      reworkNumber:'FG20203333',
      salesOrderNo:'NG23010101',
      processCardNo:'NG23010101A01',
      entryName:'xxxx',
      batch:'二批三',
      serialNumber:'1',
      area:'23.11',
      qualityInspector:"张三",
      number:'1',
      reworkNumber: 'FG20203333',
      salesOrderNo: 'NG23010101',
      processCardNo: 'NG23010101A01',
      entryName: 'xxxx',
      batch: '二批三',
      serialNumber: '1',
      area: '23.11',
      qualityInspector: "张三",
      number: '1',
      singlePieceName: '6mm白玻平钢(外)',
      marking: '1',
      pieces: '(外)',
      width: '575',
      height:"2241",
      height: "2241",
      shape: '普形',
      type: '机器',
      damage:'气泡超标',
      reworkProcess:'磨边',
      device:'XXX'
      damage: '气泡超标',
      reworkProcess: '磨边',
      device: 'XXX'
    },
  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['total','TotalArea']
    return[
  footerMethod({columns, data}) {//页脚函数
    let footList = ['total', 'TotalArea']
    return [
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
@@ -161,6 +213,51 @@

})

//筛选条件，有外键需要先定义明细里面的数据
let filterData = ref({

})


/*使用筛选，后端获取数据*/
const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}

function filterChanged(column) {
  gridOptions.loading = true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0] !== undefined ? column.datas[0] : ''
  value = value.trim()
  //判断是否存在外键
  if (column.property.indexOf('.') > -1) {
    const columnArr = column.property.split('.')
    filterData.value[columnArr[0]] = {
      [columnArr[1]]: value
    }
  } else {
    filterData.value[column.property] = value
  }
  request.post(`/reportData/rework/add/query/1/100`,filterData.value).then((res) => {
    if (res.code === 200) {
      pageTotal.value = res.data.total
      pageNum = 1
      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading = false
    } else {
      MessageShow(res.msg,'warning');
    }
  })
}
const MessageShow = (content, type = 'success') => {
  ElMessage({
    message: content,
    type: type,
    showClose: true,
  })
}


</script>
@@ -179,8 +276,8 @@
      <!--      下拉显示所有信息插槽-->
      <template #content="{ row }">
        <ul class="expand-wrapper">
          <li  v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{item.title+':  '}}</span>
          <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
            <span>{{ row[item.field] }}</span>
          </li>
        </ul>
@@ -192,6 +289,7 @@

      </template>

      <!--   筛选插槽   -->
      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
@@ -206,7 +304,7 @@
</template>

<style scoped>
.main-div-customer{
.main-div-customer {
  width: 99%;
  height: 100%;
}

 north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue

@@ -10,7 +10,8 @@
const dialogFormVisible = ref(false)
const formLabelWidth = '140px'

const form = reactive({
/*编辑弹窗显示数据*/
const editData = reactive({
  name: 'FG20202020',
  region: '',
  date1: '',
@@ -20,6 +21,8 @@
  resource: '',
  desc: '',
})


const getTableRow = (row, type) => {
  switch (type) {
    case 'edit' : {
@@ -49,7 +52,7 @@
}

//子组件接收参数

const xGrid = ref()
const gridOptions = reactive({
  border: "full",//表格加边框
  keepSource: true,//保持源数据
@@ -82,39 +85,41 @@
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {title: '操作', width: 110, slots: {default: 'button_slot'}, fixed: "left"},
    {type: 'seq', fixed: "left", title: '自序', width: 50},
    {field: 'reworkTeam', width: 120, title: '返工班组'},
    {
      field: 'reworkNumber',
      width: 120,
      title: '返工编号',
      filters: [{data: ''}],/*slots: { filter: 'num1_filter' } ,*/
    },
    {
      field: 'salesOrderNo',
      field: 'order.orderId',
      width: 120,
      title: '销售单号',
      showOverflow: "ellipsis",
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'}
    },
    {field: 'processCardNo', width: 120, title: '流程卡号', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'entryName', width: 120, title: '项目名称', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'batch', width: 80, title: '批次', showOverflow: "ellipsis"},
    {field: 'serialNumber', width: 80, title: '序号'},
    {field: 'singlePieceName', width: 120, title: '单片名称'},
    {field: 'marking', width: 80, title: '标记', showOverflow: "ellipsis"},
    {field: 'pieces', width: 90, title: '片标记'},
    {field: 'number', width: 80, title: '数量'},
    {field: 'width', width: 80, title: '宽'},
    {field: 'height', width: 80, title: '高'},
    {field: 'shape', width: 80, title: '形状'},
    {field: 'type', width: 100, title: '返工类型'},
    {field: 'damage', width: 120, title: '返工原因'},
    {field: 'device', width: 120, title: '责任设备'},
    {field: 'teams', width: 120, title: '责任班组'},
    {field: 'area', width: 120, title: '返工面积'},
    {field: 'reworkProcess', width: 120, title: '返工工序'},
    {field: 'reworkTeams', width: 120, title: '返工班组'},
    {field: 'qualityInspector', width: 100, title: '质检员'}
    {
      field: 'reportingWork.processId',
      width: 120,
      title: '流程卡号',
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'}
    },
    {field: 'order.project', width: 120, title: '项目名称', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'order.batch', width: 80, title: '批次', showOverflow: "ellipsis"},
    {field: 'orderNumber', width: 80, title: '序号'},
    {field: 'orderGlassDetail.glassChild', width: 120, title: '单片名称'},
    {field: 'orderGlassDetail.technologyNumber', width: 80, title: '标记', showOverflow: "ellipsis"},
    {field: 'orderGlassDetail.glassAddress', width: 90, title: '片标记'},
    {field: 'breakageNumber', width: 80, title: '数量'},
    {field: 'orderGlassDetail.childWidth', width: 80, title: '宽'},
    {field: 'orderGlassDetail.childHeight', width: 80, title: '高'},
    {field: 'orderDetail.shape', width: 80, title: '形状'},
    {field: 'breakageType', width: 100, title: '返工类型'},
    {field: 'breakageReason', width: 120, title: '返工原因'},
    {field: 'responsibleEquipment', width: 120, title: '责任设备'},
    {field: 'responsibleTeam', width: 120, title: '责任班组'},
    {field: 'reworkArea', width: 120, title: '返工面积'},
    {field: 'returnProcess', width: 120, title: '返工工序'},
    {field: 'qualityInspector', width: 100, title: '质检员'},
    {field: 'reworkTime', width: 100, title: '返工时间'},
    {field: 'reworkUpdateTime', width: 120, title: '返工审核时间'}
  ],//表头按钮

  toolbarConfig: {
@@ -127,54 +132,7 @@
    zoom: true,
    custom: true
  },
  data: [
    {

      reworkNumber: 'FG20202020',
      salesOrderNo: 'NG23010101',
      processCardNo: 'NG23010101A01',
      entryName: 'xxxx',
      batch: '二批三',
      serialNumber: '1',
      area: '23.11',
      qualityInspector: "张三",
      number: '1',
      singlePieceName: '6mm白玻平钢(外)',
      marking: '1',
      pieces: '(外)',
      width: '575',
      height: "2241",
      shape: '普形',
      reworkTeams: 'XX二班',
      type: '机器',
      damage: '气泡超标',
      reworkProcess: 'XXXX',
      device: 'XXX'
    },
    {

      reworkNumber: 'FG20203333',
      salesOrderNo: 'NG23010101',
      processCardNo: 'NG23010101A01',
      entryName: 'xxxx',
      batch: '二批三',
      serialNumber: '1',
      area: '23.11',
      qualityInspector: "张三",
      number: '1',
      singlePieceName: '6mm白玻平钢(外)',
      marking: '1',
      pieces: '(外)',
      width: '575',
      height: "2241",
      shape: '普形',
      reworkTeams: 'XX二班',
      type: '机器',
      damage: '气泡超标',
      reworkProcess: 'XXXX',
      device: 'XXX'
    },
  ],//table body实际数据
  data: null,//table body实际数据
  //脚部求和
  footerMethod({columns, data}) {//页脚函数
    let footList = ['number', 'area']
@@ -197,37 +155,27 @@


/*查询*/
const queryData=()=>{
const queryData = () => {

/*  if(dateValue.value===""){
    MessageShow("未选择时间，请选择时间后再次进行查询","warning");
  if (dateValue.value === "") {
    MessageShow("未选择时间，请选择时间后再次进行查询", "warning");
    return;
  }*/


  /*else{

    MessageShow(dateValue);
  }


  console.log(filterData.value);*/
  //MessageShow(`/Rework/1/100/`+dateValue.value[0]+"/"+dateValue.value[1]+"\r\n"+filterData.value);
  /*console.log(`/Rework/1/100/`+dateValue.value);
  debugger*/
  request.post(`/rework/query/1/100/${dateValue.value[0]}/${dateValue.value[1]}`).then((res) => {
  request.post(`/reportData/rework/manage/query/1/100/${dateValue.value[0]}/${dateValue.value[1]}`).then((res) => {


    console.log(res);
    MessageShow(res);
    if(res.code===200){
      pageTotal.value=res.data.total
    //MessageShow(res);
    if (res.code === 200 || res.code === '200') {
      pageTotal.value = res.data.total

      MessageShow(res.data.data.total)
      xGrid.value.loadData(res.data.data)



      gridOptions.loading=false
    }else{
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
    }
  })
@@ -235,23 +183,21 @@
}

//筛选条件，有外键需要先定义明细里面的数据
let filterData = ref({

})
let filterData = ref({})

//定义页面总页数
let pageTotal=ref('')
let pageTotal = ref('')
//定义数据返回结果
let produceList = ref([])
//定义当前页数
let pageNum=$ref(1)
let pageNum = $ref(1)
let pageState = null

//定义滚动条高度
let scrollTop =ref(null)
let scrollHeight =ref(null)
let clientHeight =ref(null)
const  scrollEvnt = (row) => {
let scrollTop = ref(null)
let scrollHeight = ref(null)
let clientHeight = ref(null)
const scrollEvnt = (row) => {
  // 内容高度
  scrollTop.value = row.$event.target.scrollTop
  scrollHeight.value = row.$event.target.scrollHeight
@@ -303,7 +249,8 @@
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}
function filterChanged(column){

function filterChanged(column) {
  /*gridOptions.loading=true
 //筛选条件发生变化条件发生变化
 let value = column.datas[0]!=undefined?column.datas[0]:''
@@ -329,7 +276,6 @@
   }
 })*/
}



</script>
@@ -366,7 +312,7 @@
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        @scroll ="scrollEvnt"
        @scroll="scrollEvnt"

    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -398,8 +344,9 @@
    </vxe-grid>


<!--  返工管理-“编辑”弹窗  -->
    <el-dialog v-model="dialogFormVisible" title="返工编辑">
      <el-form :model="form">
      <el-form :model="editData">
        <el-form-item label="返工编号" :label-width="formLabelWidth">
          <el-input v-model="form.name" disabled autocomplete="off" style="width: 200px"/>
        </el-form-item>
@@ -410,6 +357,8 @@
          </el-select>
        </el-form-item>
      </el-form>


      <template #footer>
      <span class="dialog-footer">
        <el-button @click="dialogFormVisible = false">取消</el-button>

 north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue

@@ -29,7 +29,6 @@
}



function padLeftZero(str) {
  return ('00' + str).substr(str.length)
}
@@ -78,7 +77,7 @@
  order: {
    batch: ''
  },
    orderDetail: {
  orderDetail: {
    productName: '',
    computeArea: '',
    quantity: '',
@@ -99,20 +98,20 @@

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
      .toISOString()
      .replace('T', ' ')
      .slice(0,10) //默认开始时间7天前
      .slice(0, 10) //默认开始时间7天前
  const end = new Date(new Date().getTime())
      .toISOString()
      .replace('T', ' ')
      .slice(0,10)//默认结束时间当前时间
      .slice(0, 10)//默认结束时间当前时间
  return [start, end]
}


//第一次加载获取近七天时间和默认状态
form.date1=getNowTime()
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
let state = optionVal.value
@@ -137,7 +136,7 @@

  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let selectState=optionVal.value
  let selectState = optionVal.value
  request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
    if (res.code == 200) {

@@ -174,16 +173,16 @@
//获取选中时间和是否转单状态
  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let selectState=optionVal.value
  let selectState = optionVal.value

  request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
    if(res.code==200){
      pageTotal.value=res.data.total
    if (res.code == 200) {
      pageTotal.value = res.data.total

      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false
    }else{
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
    }
  })
@@ -296,7 +295,8 @@

        />
        &nbsp;&nbsp;
        <el-select :default-first-option="true" ref="getSelect" style="width: 120px" v-model="optionVal" class="m-2" placeholder="是否转工单">
        <el-select :default-first-option="true" ref="getSelect" style="width: 120px" v-model="optionVal" class="m-2"
                   placeholder="是否转工单">
          <el-option
              v-for="item in options"
              :key="item.value"
@@ -325,8 +325,8 @@
      <!--      下拉显示所有信息插槽-->
      <template #content="{ row }">
        <ul class="expand-wrapper">
          <li  v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{item.title+':  '}}</span>
          <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
            <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
            <span v-else>{{ row[item.field] }}</span>


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

@@ -1,6 +1,6 @@
<script lang="ts"  setup>
import {reactive, ref} from "vue"
import {useRouter} from "vue-router"
import {onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import * as XLXS from "xlsx"
import {ElMessage} from "element-plus"
import request from "@/utils/request"
@@ -9,7 +9,55 @@
let dialogTableVisible = ref(false)
const userStore = useUserInfoStore()
const router = useRouter()
const route = useRoute()
const xGrid = ref()
// 定义表头上传数据
const titleUploadData = ref({
  project:'',
  orderType:'',
  customerId:'',
  customerName:'',
  icon:'',
  orderClassify:'',
  packType:'',
  orderId:'',
  deliveryDate:'',
  batch:'',
  calculateType:'',
  salesmanId:'',
  salesman:'',
  alType:'',
  money:'',
  contractId:'',
  customerBatch:'',
  contacts:'',
  contactNumber:'',
  deliveryAddress:'',
  otherMoney:'',
  otherMoneyRemarks:'',
  processingNote:'',
  createOrder:0,
  creatorId:userStore.user.userName,
  creator:userStore.user.userId,
})
//定义接收加载表头下拉数据
const titleSelectJson = ref({
  orderType:[],
  alType:[],
  icon:[],
  orderClassify:[],
  packType:[],
  customer:[],
  saleMan:[]
})
let filterData = ref({})
const filterChanged = ({ option, row, column }) => {
  if (option.data) {
    return row[column.field].toString().toLowerCase().indexOf(option.data) > -1
  }
  return true
  //@filter-change="filterChanged"
}
const gridOptions = reactive({
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
@@ -37,7 +85,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
    //remote: true  //远端筛选
  },
  customConfig: {
    storage: true
@@ -48,25 +96,24 @@
    showStatus: true
  },//表头参数
  columns:[
    // {title: '操作', width: 110,fixed:"left",slots: { default: 'openProductList' }},
    {type: 'seq',fixed:"left", title: '自序', width: 80 },
    {field: 'buildingNumber',width:120,  title: '楼号',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'productId',width:140,  title: '产品ID',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'productName',width:120,  title: '产品',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'price',width:140,  title: '单价',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'quantity',width:120,  title: '数量',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'grossAmount',width:120,  title: '总金额',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'width',width:120,  title: '宽',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'height',width:120,  title: '高',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'area',width:150,  title: '实际单片面积',filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true},
    {field: 'grossArea',width:140,  title: '实际总面积',filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true},
    {field: 'computeArea',width:180,  title: '结算单片面积',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'computeGrossArea',width:140,  title: '结算总面积',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'shape',width:120,  title: '形状',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'bendRadius',width:140,  title: '弯钢弧度',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'edgingType',width:140,  title: '磨边类型',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'processingNote',width:140,  title: '加工要求',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'remarks',width:120,  title: '备注',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
    // {field: 'buildingNumber',width:120,  title: '楼号',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'productId',width:100,  title: '产品ID',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:120,  title: '产品',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:140,  title: '单价',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'quantity',width:120,  title: '数量',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'grossAmount',width:120,  title: '总金额',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'width',width:120,  title: '宽',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'height',width:120,  title: '高',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'area',width:150,  title: '实际单片面积',filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'grossArea',width:140,  title: '实际总面积',filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'computeArea',width:180,  title: '结算单片面积',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'computeGrossArea',width:140,  title: '结算总面积',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'shape',width:120,  title: '形状',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'bendRadius',width:140,  title: '弯钢弧度',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'edgingType',width:140,  title: '磨边类型',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'processingNote',width:140,  title: '加工要求',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'remarks',width:120,  title: '备注',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}


  ],
@@ -83,7 +130,7 @@
      {
        validator ({ cellValue }) {
          const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
          if (cellValue && !regex.test(cellValue)) {
          if ( !regex.test(cellValue) ) {
            return new Error('输入0.00~99999.99的数字')
          }
        }
@@ -93,7 +140,7 @@
      {
        validator ({ cellValue }) {
          const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
          if (cellValue && !regex.test(cellValue)) {
          if (!regex.test(cellValue)) {
            return new Error('输入0.00~99999.99的数字')
          }
        }
@@ -106,7 +153,7 @@
      {
        validator ({ cellValue }) {
          const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
          if (cellValue && !regex.test(cellValue)) {
          if (!regex.test(cellValue)) {
            return new Error('输入0.00~99999.99的数字')
          }
        }
@@ -116,7 +163,7 @@
      {
        validator ({ cellValue }) {
          const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
          if (cellValue && !regex.test(cellValue)) {
          if ( !regex.test(cellValue)) {
            return new Error('输入0.00~99999.99的数字')
          }
        }
@@ -126,9 +173,9 @@
  toolbarConfig: {
    buttons: [
      {'code': 'remarks', 'name': '加工要求'},
      {'code': 'Craft', 'name': '工艺',status: 'primary'},
      {'code': 'add', 'name': '审核',status: 'primary',disabled: true},
      {'code': 'saveOrder', 'name': '保存',status: 'primary',icon: 'vxe-icon-save'}
      {'code': 'Craft', 'name': '工艺',status: 'primary',disabled: true},
      {'code': 'review', 'name': '审核',status: 'primary',disabled: true},
      {'code': 'saveOrder', 'name': '保存',status: 'primary',icon: 'vxe-icon-save',disabled: false}
    ],
    slots: {
      tools: 'toolbar_buttons'
@@ -166,7 +213,15 @@
          break
        }
        case 'Craft': {
          await router.push({path: '/main/order/updateOrderCraft', query: {orderID: 12123}})
          await router.push({path: '/main/order/updateOrderCraft', query: {orderId: titleUploadData.value.orderId }})
          break
        }
        case 'review': {
          reviewOrder(2)
          break
        }
        case 'reviews': {//反审
          reviewOrder(0)
          break
        }
        case 'saveOrder': {
@@ -238,45 +293,44 @@
  }
}

// 定义表头上传数据
const titleUploadData = ref({
  project:'',
  orderType:'',
  customerId:'',
  customerName:'',
  icon:'',
  orderClassify:'',
  packType:'',
  orderId:'',
  deliveryDate:'',
  batch:'',
  calculateType:'',
  salesmanId:'',
  salesman:'',
  alType:'',
  money:'',
  contractId:'',
  customerBatch:'',
  contacts:'',
  contactNumber:'',
  deliveryAddress:'',
  otherMoney:'',
  otherMoneyRemarks:'',
  processingNote:'',
  creatorId:userStore.user.userName,
  creator:userStore.user.userId,
//初始化判断是否有id传入
onMounted(()=>{
  const str = route.query.orderId
  if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
    return
  }
  request.post(`/order/getOrderById/${str}`).then((res) => {
    if(res.code==200){
      titleUploadData.value = res.data.order
      //取消工艺按钮禁用
      gridOptions.toolbarConfig.buttons[1].disabled = false
      //工艺审核后保存按钮禁用
      if(res.data.order.processReview === 2){
        gridOptions.toolbarConfig.buttons[3].disabled = true
      }
      //取消审核按钮禁用
      if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
        gridOptions.toolbarConfig.buttons[2].disabled = false
      }

      //按钮审核过后变为反审
      if(res.data.order.orderReview === 2){
        gridOptions.toolbarConfig.buttons[2].disabled = false
        gridOptions.toolbarConfig.buttons[2].code='reviews'
        gridOptions.toolbarConfig.buttons[2].name='反审'
      }
      if(res.data.order.productionOrder !==0 ){
        gridOptions.toolbarConfig.buttons[2].disabled = true
      }


      xGrid.value.reloadData(res.data.orderDetails)
    }else{
      ElMessage.error(res.msg)
    }
  })
})

//定义接收加载表头下拉数据
const titleSelectJson = ref({
  orderType:[],
  alType:[],
  icon:[],
  orderClassify:[],
  packType:[],
  customer:[],
  saleMan:[]
})
//页面第一次加载执行
request.get(`/basicData/orderBasicData`).then((res) => {

@@ -297,17 +351,36 @@
  }
})

//保存订单方法
const saveOrder = (order) => {
  request.post(`/order/saveOrder`,order).then((res) => {
    if(res.code==200){
      location.reload()
      ElMessage.success('保存成功')
      router.push({path:'/main/order/selectOrder'})
    }else {
      ElMessage.error(res.msg)
    }
  })
}
// 审核订单
const reviewOrder = (state) => {
  request.post(`/order/reviewOrderById/${titleUploadData.value.orderId}/${state}`).then(res =>{
    if(res.code==200){
      gridOptions.toolbarConfig.buttons[2].disabled = true
      if(state==2){
        ElMessage.success('审核成功！')
      }else if (state==0){
        ElMessage.success('反审成功！')
      }
      setTimeout(() =>{
        location.reload()
      },1500)

    }else{
      ElMessage.error(res.msg)
    }
  })
}

const changeCustomer =  () => {
  const changedCustomerId = titleUploadData.value.customerId
@@ -384,6 +457,15 @@

    titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
}

// 手动触发筛选
const changeFilterEvent = (event, option, $panel) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}



</script>

<template>
@@ -515,7 +597,7 @@
    </div>
    <div class="order-detail">
      <vxe-grid
          max-height="97%"
          max-height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
@@ -525,7 +607,9 @@
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
              <input type="text"
                     v-model="option.data"
                     @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>
@@ -566,7 +650,7 @@
  }
  .order-detail{
    width: 100%;
    height: 80%;
    height: 85%;
  }

</style>

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

@@ -1,12 +1,19 @@
<script setup>
import {ArrowLeftBold, ArrowRight, Search} from "@element-plus/icons-vue"
import {useRouter} from "vue-router";
import {useRouter,useRoute,onBeforeRouteUpdate} from "vue-router";
import {watch} from "vue";

const router = useRouter()
const route = useRoute()
let indexFlag=$ref(1)
function changeRouter(index){
  indexFlag=index

}




</script>

<template>
@@ -21,7 +28,7 @@
    </div>

    <div id="main-body">
      <router-view  />
      <router-view :key="route.fullPath" />
    </div>
  </div>
</template>

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

@@ -7,6 +7,7 @@
  import request from "@/utils/request";
  import deepClone from "@/utils/deepClone";
  import {ElMessage} from "element-plus";
  import {VXETable} from "vxe-table";


  const xGrid = ref()
@@ -47,7 +48,7 @@
      {field:'processReview',title: '工艺', width: 40, slots: { default: 'state' }},
      {field:'orderReview',title: '审核', width: 40, slots: { default: 'state' }},
      {field:'productionOrder',title: '工单', width: 40, slots: { default: 'state' }},
      {field:'processingCard',title: '流程卡', width: 40, slots: { default: 'state' }},
      {field:'processingCard',title: '流程', width: 40, slots: { default: 'state' }},
      {field:'warehousing',title: '入库', width: 40, slots: { default: 'state' }},
      {field:'delivery',title: '发货', width: 40, slots: { default: 'state' }},

@@ -101,14 +102,40 @@
    }

  })
  const gridEvents = {
    toolbarButtonClick ({ code }) {
      const $grid = xGrid.value
      if ($grid) {
        switch (code) {
          case 'checkList': {
            if($grid.getCheckboxRecords().length==0){
              VXETable.modal.message( '请选择一条数据！')
              return
            }
            break
          }

        }
      }
    },
  }
  const dialogTableVisible = ref(false)
  let orderType = ref("2")
  let selectDate = ref(["",""])
  let filterData = ref({})
  let orderList = ref([])
  request.post(`/order/getOrderList/1/100/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
  let pageNum=ref(1)
  let total = reactive({
    pageTotal : 0,
    dataTotal : 0,
    pageSize : 100
  })
  //加载请求
  request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
    if(res.code==200){
      console.log(res.data)
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal
      selectDate.value = res.data.selectDate
      orderList.value = deepClone(res.data.data)
      xGrid.value.loadData(orderList.value)
    }else{
@@ -116,12 +143,94 @@
    }
  })

  const changeFilterEvent = (event, option, $panel) => {
    // 手动触发筛选
    $panel.changeOption(event, !!option.data, option)
  }

  function filterChanged(column){
    gridOptions.loading=true
    //筛选条件发生变化条件发生变化
    let value = column.datas[0]!=undefined?column.datas[0]:''
    value = value.trim()
    //判断是否存在外键
    if (column.property.indexOf('.')>-1){
      const  columnArr = column.property.split('.')
      filterData.value[columnArr[0]] = {
        [columnArr[1]]:value
      }
    }else{
      filterData.value[column.property] = value
    }
    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData.value).then((res) => {
      if(res.code==200){
        total.pageTotal=parseInt(res.data.total)
        pageNum.value=1
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
        gridOptions.loading=false
      }else{
        ElMessage.warning(res.msg)
      }
    })
  }

  //双击表格行
  // const cellClickEvent =()=>{
  //     dialogTableVisible.value = true
  // }
  const cellClickEvent =()=>{
    return
      dialogTableVisible.value = true
  }
  const selectOrderList = ()=>{
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
        ,filterData).then((res) => {
      if(res.code==200){
        //total.pageTotal = res.data.total.pageTotal
        selectDate.value=res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
      }else{
        ElMessage.warning(res.msg)
      }
    })
  }

  const changeOrderType = ()=>{
    pageNum.value=1
    selectOrderList()
  }
 const changeDate =  ()=>{
   pageNum.value=1
   selectOrderList()
 }

 //页脚跳转
  const handlePageChange = ({ currentPage, pageSize }) => {
    pageNum.value=currentPage
    total.pageTotal    = pageSize
    selectOrderList()
  }

  //页面跳转更新或者删除订单
  const getTableRow =  (row,type) => {
    switch (type) {
      case 'edit': {
        router.push({path:'/main/order/createOrder',query:{orderId:row.orderId}})
        break
      }
      case 'delete': {
        request.post(`/order/deleteOrder/${row.orderId}`).then((res) => {
          if(res.code==200){
            ElMessage.success('删除成功')
            location.reload()
          }else{
            ElMessage.warning('删除失败')
          }
        })
        break
      }

    }
  }


</script>
@@ -129,13 +238,17 @@
<template>
  <div  style="width: 100%;height: 100%">
    <el-date-picker
        v-model="value1"
        v-model="selectDate"
        type="daterange"
        start-placeholder="开始时间"
        end-placeholder="结束时间"
        format="YYYY-MM-DD"
        value-format="YYYY-MM-DD"

    />
    <el-button style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>
    <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>
    <vxe-grid
        @filter-change="filterChanged"
        @cell-dblclick="cellClickEvent"
        max-height="97%"
        class="mytable-scrollbar"
@@ -155,13 +268,17 @@

      <template #state="{ row,column}">
<!--        <p>{{row[column.field]}}</p>-->
        <el-checkbox @click.native.prevent :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
        <el-checkbox @click.native.prevent  :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
      </template>

      <!--左边固定显示的插槽-->
      <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-popconfirm @confirm="getTableRow(row,'delete')" title="确认删除订单?">
          <template #reference>
            <el-button  link type="primary" size="small">删除</el-button>
          </template>
        </el-popconfirm>
      </template>

      <template #num1_filter="{ column, $panel }">
@@ -172,14 +289,26 @@
        </div>
      </template>


      <template #toolbar_buttons>
        <vxe-select v-model="orderType" placeholder="订单类型">
        <vxe-select @change="changeOrderType" v-model="orderType" placeholder="订单类型">
          <vxe-option value="2" label="正常订单"></vxe-option>
          <vxe-option value="-2" label="作废订单"></vxe-option>
          <vxe-option value="" label="全部订单"></vxe-option>
          <vxe-option value="0" label="全部订单"></vxe-option>
        </vxe-select>
      </template>

      <template #pager>
        <!--使用 pager 插槽-->
        <vxe-pager
            @page-change="handlePageChange"
            :layouts="[ 'PrevJump', 'PrevPage', 'Jump','PageCount', 'NextPage', 'NextJump',  'Total']"
            v-model:current-page="pageNum"
            v-model:page-size="total.pageSize"
            v-model:pager-count="total.pageTotal"
            :total="total.dataTotal"
        >
        </vxe-pager>
      </template>
    </vxe-grid>

    <el-dialog v-model="dialogTableVisible" title="流程卡进度" style="width: 80%;height:75% ">

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

@@ -1,16 +1,18 @@
<script setup>
import {reactive, ref} from "vue"
import {useRouter} from "vue-router"
import {onMounted, reactive, ref} from "vue"
import {useRouter,useRoute} from "vue-router"
import request from "@/utils/request"
import {ElMessage} from "element-plus";
const router = useRouter()


const route = useRoute()
let dialogTableVisible = ref(false)
const xGrid = ref()
const gridOptions = reactive({
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹楼号
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'OrderList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -35,85 +37,45 @@
  },//表头参数
  columns:[
    {title: '操作', width: 110, slots: { default: 'button_slot' },fixed:"left",},
    {field: '0',width:120,  title: '序号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '1',width:120,  title: '楼号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '2',width:120,  title: '成品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '3',width:120,  title: '标记',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '4',width:120,  title: '子产品',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '5',width:120,  title: '成品宽',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '6',width:120,  title: '成品高',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '7',width:120,  title: '形状',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '8',width:120,  title: '成品尺寸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '9',width:120,  title: '磨边类型',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '10',width:120,  title: '单片宽',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '11',width:120,  title: '单片高',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '12',width:120,  title: '单片尺寸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '13',width:120,  title: '数量',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '14',width:120,  title: '工艺流程',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '15',width:120,  title: '加工要求',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '16',width:120,  title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
    {field: 'orderDetail.orderNumber',width:120,  title: '序号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    //{field: 'orderDetail.buildingNumber',width:120,  title: '楼号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.productName',width:120,  title: '成品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'glassAddress',width:120,  title: '标记',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'glassChild',width:120,  title: '子产品',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.width',width:120,  title: '成品宽',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.height',width:120,  title: '成品高',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.shape',width:120,  title: '形状',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.grossArea',width:120,  title: '总尺寸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'childWidth',width:120,  title: '单片宽',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'childHeight',width:120,  title: '单片高',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.area',width:120,  title: '单片尺寸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.quantity',width:120,  title: '数量',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'process',width:120,  title: '工艺流程',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.processingNote',width:120,  title: '加工要求',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.remarks',width:120,  title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.edgingType',width:120,  title: '磨边类型',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
  ],//表头按钮
  mergeCells: [
    { row: 0, col: 1, rowspan: 2, colspan: 1 },
    { row: 0, col: 2, rowspan: 2, colspan: 1 },
    { row: 0, col: 3, rowspan: 2, colspan: 1 },
    { row: 0, col: 6, rowspan: 2, colspan: 1 },
    { row: 0, col: 7, rowspan: 2, colspan: 1 },
    { row: 0, col: 1, rowspan: 4, colspan: 1 },
    { row: 0, col: 2, rowspan: 4, colspan: 1 },
    { row: 0, col: 4, rowspan: 4, colspan: 1 },
    { row: 0, col: 5, rowspan: 4, colspan: 1 },
    { row: 0, col: 6, rowspan: 4, colspan: 1 },
    { row: 0, col: 7, rowspan: 4, colspan: 1 },
    { row: 0, col: 8, rowspan: 4, colspan: 1 },
  ],
  toolbarConfig: {
    buttons: [
      {'code': 'remarks', 'name': '加工要求'},
      {'code': 'Craft', 'name': '订单详情',status: 'primary'},
      {'code': 'Craft', 'name': '审核',status: 'primary'},
      {'code': 'review', 'name': '审核',status: 'primary'},
    ],
    import: false,
    export: true,
    print: true,
    // import: false,
    // export: true,
    // print: true,
    zoom: true,
    custom: true
  },
  data:  [
    {
      '0' : '1',
      '1' : 'JHH-T33-G-07A-01',
      '2' : '10mm超白UD60平钢(外)+12A暖(结)+10mm超白平钢(内)',
      '3' : '(外)',
      '4' : '10mm超白UD60平钢(外)',
      '5' : '1427',
      '6' : '2696',
      '7' : '普形',
      '8' : '42.32',
      '9' : '精磨',
      '10' : '1427',
      '11' : '1427',
      '12' : '42.32',
      '13' : '11',
      '14' : '切割->磨边->钢化->均质->中空->包装',
      '15' : '',
      '16' : '',
      '17':2
    },
    {
      '0' : '1',
      '1' : 'JHH-T33-G-07A-01',
      '2' : '10mm超白UD60平钢(外)+12A暖(结)+10mm超白平钢(内)',
      '3' : '(内)',
      '4' : '10mm超白平钢(内)',
      '5' : '1427',
      '6' : '2696',
      '7' : '普形',
      '8' : '42.32',
      '9' : '精磨',
      '10' : '1427',
      '11' : '1427',
      '12' : '42.32',
      '13' : '11',
      '14' : '切割->磨边->钢化->均质->中空->包装',
      '15' : '',
      '16' : '',
      '17' : 0,
    }
  ],//table body实际数据
  footerMethod ({ columns, data }) {//页脚函数
    return[
      columns.map((column, columnIndex) => {
@@ -136,16 +98,103 @@
    if ($grid) {
      switch (code) {
        case 'Craft': {
          router.push({path: '/main/order/createOrder', query: { orderID: 12123 }})
          router.push({path: '/main/order/createOrder', query: { orderId: titleUploadData.value.orderId }})
          break
        }
        case 'review': {
          reviewOrderCraft(2)
          break
        }
        case 'reviews': {//反审
          reviewOrderCraft(0)
          break
        }
        case 'remarks':  {
          dialogTableVisible.value=true
          break
        }
      }
    }
  }
}
// 定义表头上传数据
const titleUploadData = ref({
  project:'',
  orderType:'',
  customerId:'',
  customerName:'',
  icon:'',
  orderClassify:'',
  packType:'',
  orderId:'',
  deliveryDate:'',
  batch:'',
  calculateType:'',
  salesmanId:'',
  salesman:'',
  alType:'',
  money:'',
  contractId:'',
  customerBatch:'',
  contacts:'',
  contactNumber:'',
  deliveryAddress:'',
  otherMoney:'',
  otherMoneyRemarks:'',
  processingNote:''
})

//初始化判断是否有id传入
onMounted(()=>{
  const str = route.query.orderId
  if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
    return
  }
  request.post(`/order/getOrderCraftById/${str}`).then((res) => {
    if(res.code==200){
      console.log(res.data)
      titleUploadData.value = res.data.order

      //取消审核按钮禁用
      if(res.data.order.processReview === 2 ){
        //gridOptions.toolbarConfig.buttons[2].disabled = false
        gridOptions.toolbarConfig.buttons[2].code='reviews'
        gridOptions.toolbarConfig.buttons[2].name='反审'

      }

      //按钮审核过后变为反审
      if(res.data.order.orderReview === 2){
        gridOptions.toolbarConfig.buttons[2].disabled = true

      }

      xGrid.value.reloadData(res.data.orderGlassDetails)

      //xGrid.value.reloadData(res.data.orderDetails)
    }else{
      ElMessage.error(res.msg)
    }
  })
})
const reviewOrderCraft = (state) => {
  request.post(`/order/reviewProcessById/${titleUploadData.value.orderId}/${state}`).then(res =>{
    if(res.code==200){
      gridOptions.toolbarConfig.buttons[2].disabled = true
      if(state==2){
        ElMessage.success('审核成功！')
      }else if (state==0){
        ElMessage.success('反审成功！')
      }
      setTimeout(() =>{
        location.reload()
      },1500)

    }else{
      ElMessage.error(res.msg)
    }
  })
}
</script>

<template>
@@ -154,25 +203,25 @@
    <div class="order-primary" style="background-color: white">
      <el-row>
        <el-col  :span="4"><el-text>销售单号：</el-text></el-col>
        <el-col  :span="4"><el-text>NG23120704</el-text></el-col>
        <el-col  :span="4"><el-text>{{titleUploadData.orderId}}</el-text></el-col>
        <el-col  :span="4"><el-text>客户名称：</el-text></el-col>
        <el-col  :span="4"><el-text>太仓高玻璃制品有限公司</el-text></el-col>
        <el-col  :span="4"><el-text>{{titleUploadData.customerName}}</el-text></el-col>
        <el-col  :span="4"><el-text>项目名称：</el-text></el-col>
        <el-col  :span="4"><el-text>太仓卓高</el-text></el-col>
        <el-col  :span="4"><el-text>{{titleUploadData.project}}</el-text></el-col>
      </el-row>
      <el-row>
        <el-col  :span="4"><el-text>订单批次：</el-text></el-col>
        <el-col  :span="4"><el-text>1批1</el-text></el-col>
        <el-col  :span="4"><el-text>{{titleUploadData.batch}}</el-text></el-col>
        <el-col  :span="4"><el-text>订单类型：</el-text></el-col>
        <el-col  :span="4"><el-text>普通订单</el-text></el-col>
        <el-col  :span="4"><el-text>{{ titleUploadData.orderType }}</el-text></el-col>
        <el-col  :span="4"><el-text>业务员</el-text></el-col>
        <el-col  :span="4"><el-text>张三</el-text></el-col>
        <el-col  :span="4"><el-text>{{titleUploadData.salesman}}</el-text></el-col>
      </el-row>
      <el-row>
        <el-col  :span="4"><el-text>包装方式：</el-text></el-col>
        <el-col  :span="4"><el-text>木箱</el-text></el-col>
        <el-col  :span="4"><el-text>{{titleUploadData.packType}}</el-text></el-col>
        <el-col  :span="4"><el-text>交货日期：</el-text></el-col>
        <el-col  :span="4"><el-text>2023-11-11</el-text></el-col>
        <el-col  :span="4"><el-text>{{titleUploadData.deliveryDate}}</el-text></el-col>
      </el-row>
    </div>
    <div class="order-detail">
@@ -210,6 +259,13 @@
      </vxe-grid>

    </div>
    <el-dialog v-model="dialogTableVisible" title="加工要求" style="width: 60%;height:75% ">
      <el-input
          v-model="titleUploadData.processingNote"
          type="textarea"
          :autosize="{ minRows: 2, maxRows: 20 }"
      />
    </el-dialog>
  </div>
</template>

@@ -227,7 +283,7 @@
}
.order-detail{
  width: 100%;
  height: 80%;
  height: 90%;
}

</style>

 north-glass-erp/pom.xml

@@ -125,6 +125,12 @@
            <artifactId>spring-data-commons</artifactId>
            <version>2.5.8</version>
        </dependency>
        <dependency>
            <groupId>org.hibernate</groupId>
            <artifactId>hibernate-core</artifactId>
            <version>4.3.5.Final</version>
        </dependency>


    </dependencies>


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

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

import com.example.erp.entity.pp.FlowCard;
import com.example.erp.common.Result;
import com.example.erp.service.pp.FlowCardService;
@@ -13,11 +14,13 @@
    @Autowired
    FlowCardService flowCardService;

    @PostMapping  ("/flowCard/{selectTime1}/{selectTime2}}")
    @PostMapping  ("/flowCard/{selectTime1}/{selectTime2}")
    public Result DateProcess(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @RequestBody FlowCard  flowCard){
        return Result.seccess(flowCardService.selectProcessCard(selectTime1,selectTime2,flowCard));
        
    }

}

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

@@ -1,4 +1,30 @@
package com.example.erp.controller.pp;

import com.example.erp.common.Result;
import com.example.erp.entity.pp.ReportingWorkDetail;
import com.example.erp.service.pp.ReportWorkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


@RestController
@RequestMapping("/reportData")
public class ReportWorkController {

    @Autowired
    ReportWorkService reportWorkService;

    /*返工管理数据*/
    @PostMapping("/rework/manage/query/{pageNum}/{pageSize}/{startTime}/{endTime}")
    public Result queryReworkData(@PathVariable Integer pageNum, @PathVariable Integer pageSize
                                  ,@PathVariable String startTime,@PathVariable String endTime
    ) {
        return Result.seccess(reportWorkService.reworkMangageData(pageNum, pageSize,startTime,endTime));
    }

    /*返工新增数据查询*/
    @PostMapping("/rework/add/query/{pageNum}/{pageSize}")
    public Result queryReworkAdd(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReportingWorkDetail reportingWorkDetail) {
        return Result.seccess(reportWorkService.queryRework(pageNum, pageSize,reportingWorkDetail));
    }
}

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

@@ -32,7 +32,32 @@
    }

    @PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
    public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<LocalDate> selectDate, @RequestBody Order order)  {
    public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Order order)  {
        return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
    }

    @PostMapping("/deleteOrder/{id}")
    public Result deleteOrder(@PathVariable String id)  {
        return Result.seccess(orderService.deleteOrder(id));
    }

    @PostMapping("/getOrderById/{id}")
    public Result getOrderById(@PathVariable String id)  {
        return  Result.seccess(orderService.getOrderById(id));
    }
    @PostMapping("/getOrderCraftById/{id}")
    public Result getOrderCraftById(@PathVariable String id)  {
        return  Result.seccess(orderService.getOrderCraftById(id));
    }

    @PostMapping("/reviewOrderById/{id}/{status}")
    public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status)  {
        return  Result.seccess(orderService.reviewOrderById(id,status));
    }


    @PostMapping("/reviewProcessById/{id}/{status}")
    public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status)  {
        return  Result.seccess(orderService.reviewProcessById(id,status));
    }
}

 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java

@@ -1,6 +1,11 @@
package com.example.erp.entity.pp;

import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import lombok.Data;

import java.time.LocalDate;

@Data
public class ReportingWorkDetail {
@@ -18,6 +23,8 @@
    private Integer breakageNumber;
    //次破原因
    private String breakageReason;
    //类型
    private String breakageType;
    //可利用
    private Integer available;
    //退回工序
@@ -41,7 +48,25 @@
    //报工类型
    private Integer type;

    /*返工部分*/
    //返工班组
    private String reworkTeam;
    //返工审核状态
    private Integer reviewerState;
    //返工审核人
    private String reviewer;
    //返工时间
    private LocalDate reworkTime;
    //返工更新时间
    private LocalDate reworkUpdateTime;
    //返工面积
    private double reworkArea;


    //外键报工主表
    private  ReportingWork reportingWork;
    private ReportingWork reportingWork;
    private Order order;
    private OrderDetail orderDetail;
    private OrderGlassDetail orderGlassDetail;

}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.example.erp.entity.mm.FinishedGoodsInventory;
@@ -16,7 +17,7 @@
    private Long id;
    private String orderId;
    private String project;
    private String customerId;
    private Integer customerId;
    private String customerName;
    private String orderType;
    private String orderClassify;
@@ -25,7 +26,7 @@
    private String deliveryDate;
    private String batch;
    private Integer calculateType;
    private String salesmanId;
    private Integer salesmanId;
    private String salesman;
    private String alType;
    private Double money;
@@ -55,6 +56,7 @@
    private LocalDate createTime;
    private LocalDate updateTime;

    @TableField(value = "customer_id")
    private Customer  customer;
    private FinishedGoodsInventory finishedGoodsInventory;


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

@@ -1,9 +1,12 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.time.LocalDate;

@@ -38,9 +41,13 @@
    private Integer state;
    private LocalDate createTime;
    private LocalDate updateTime;
    @TableField(select = false)
    private Order order;
    @TableField(select = false)
    private Delivery delivery;
    @TableField(select = false)
    private DeliveryDetail deliveryDetail;
    @TableField(select = false)
    private FinishedGoodsInventory finishedGoodsInventory;
    //private Product product;


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

@@ -1,9 +1,14 @@
package com.example.erp.entity.sd;

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

import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import java.time.LocalDate;

@Data
@@ -22,11 +27,14 @@
    private String productionId;
    private Integer splittingStatus;
    private String founder;
    @TableField(value = "`group`")
    private Integer group;
    private LocalDate produtionTime;
    private LocalDate productionTime;
    private LocalDate createTime;

    private  Order order;
//    @TableField(select = false)
//    private  Order order;
    //@TableField(select = false)
//   @ManyToOne(fetch = FetchType.LAZY)
    private  OrderDetail orderDetail;



 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java

@@ -2,10 +2,26 @@


import com.example.erp.entity.pp.ReportingWorkDetail;
import com.example.erp.entity.pp.Rework;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface ReportingWorkDetailMapper {
    /*List<ReportingWorkDetail> getDetail();*/

    /*查询返工新增数据*/
    List<ReportingWorkDetail> queryReworkAdd(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize,
                                             ReportingWorkDetail reportingWorkDetail);


    /*查询返工数据*/
    List<ReportingWorkDetail> reworkDataManage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize,
                                               @Param("sDate") String startTime,@Param("eDate") String endTime);

    List<ReportingWorkDetail> reworkDataManage2(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize,
                                               @Param("sDate") String startTime,@Param("eDate") String endTime,ReportingWorkDetail reportingWorkDetail);

}

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

@@ -13,4 +13,6 @@
    boolean insertOrderGlassDetail(@Param("orderId") String orderId);

    List<OrderGlassDetail> selectOrderGlassDetail(@Param("orderId") String orderId);

    List<OrderGlassDetail> selectOrderGlassDetailByOrderId(@Param("orderId") String orderId);
}

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

@@ -16,6 +16,10 @@

    boolean updateOrderParameter(@Param("orderId") String orderId);

    List<Order> getOrderList(Integer offset, Integer pageSize, LocalDate startDate, LocalDate endDate, Order order, Integer orderType);
    Integer getPageTotal(Integer offset, Integer pageSize, LocalDate startDate, LocalDate endDate, Order order , Integer orderType);
    List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType);
    Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);

    boolean reviewOrderById(String id,Integer status);

    boolean reviewProcessById(String id, Integer status);
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -19,7 +19,7 @@

    public Map<String, Object>  selectProcessCard(Date selectTime1, Date selectTime2, FlowCard flowCard) {
        Map<String, Object> map = new HashMap<>();
       // System.out.println(flowCardMapper.selectFlowCard( selectTime1,selectTime2, flowCard));
        System.out.println(flowCardMapper.selectFlowCard( selectTime1,selectTime2, flowCard));
        map.put("data", flowCardMapper.selectFlowCard( selectTime1,selectTime2, flowCard));
        //   map.put("total", productMapper.getPageTotal(offset, pageSize, glassTypeId, product));
        return map;

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java

@@ -1,4 +1,47 @@
package com.example.erp.service.pp;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.ReportingWorkDetail;
import com.example.erp.mapper.pp.ReportingWorkDetailMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.Map;

@Service
@DS("pp")
public class ReportWorkService {

    @Autowired
    ReportingWorkDetailMapper reportingWorkDetailMapper;

    /*获取返工新增功能数据*/
    public Map<String,Object> queryRework (Integer pageNum, Integer pageSize,ReportingWorkDetail reportingWorkDetail ) {
        Integer offset = (pageNum-1)*pageSize;

        Map<String,Object> map = new HashMap<>();
        map.put("data",reportingWorkDetailMapper.queryReworkAdd(offset,pageSize, reportingWorkDetail));
        return map;
    };



    /*获取返工管理数据*/
    public Map<String,Object> reworkMangageData (Integer pageNum, Integer pageSize,String startTime,String endTime) {
        Integer offset = (pageNum-1)*pageSize;

        Map<String,Object> map = new HashMap<>();
        map.put("data",reportingWorkDetailMapper.reworkDataManage(offset,pageSize,startTime,endTime));
        return map;
    };

    /*获取返工管理数据*/
    public Map<String,Object> reworkMangageData2 (Integer pageNum, Integer pageSize,String startTime,String endTime,ReportingWorkDetail reportingWorkDetail ) {
        Integer offset = (pageNum-1)*pageSize;

        Map<String,Object> map = new HashMap<>();
        map.put("data",reportingWorkDetailMapper.reworkDataManage2(offset,pageSize,startTime,endTime, reportingWorkDetail));
        return map;
    };
}

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

@@ -4,12 +4,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.example.erp.common.Constants;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
@@ -80,6 +83,7 @@
        String orderId =  "NG"+formattedDate+formattedNumber;
        //往主表插数据
        order.setOrderId(orderId);
        order.setCreateOrder(2);
        orderMapper.insert(order);
        insertOtherDetail(orderId,OrderDetails);

@@ -138,21 +142,64 @@
    }

    //查询获取列表
    public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<LocalDate> selectDate, Order order,Integer orderType) {
    public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Order order,Integer orderType) {
        Integer offset = (pageNum-1)*pageSize;
        LocalDate endDate = LocalDate.now();
        LocalDate startDate = endDate.minusDays(15);

        if(selectDate == null && selectDate.size()==2){
            startDate = selectDate.get(0);
            endDate = selectDate.get(1);
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){
                startDate = selectDate.get(0);
            }
            if(!selectDate.get(1).isEmpty()){
                endDate = selectDate.get(1);
            }
        }

        Map<String,Object> map = new HashMap<>();
        map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType));
        map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, order,orderType));
        map.put("startDate",startDate);
        map.put("endDate",endDate);
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate",list);
        return map;
    }

    public Integer deleteOrder(String id) {
        return  orderMapper.delete(
                new QueryWrapper<Order>().eq("order_id",id)
        );
    }


    //查询订单主表与副表信息
    public Map<String,Object> getOrderById(String id) {
        Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
        List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
        Map<String,Object> map = new HashMap<>();
        map.put("order",order);
        map.put("orderDetails",orderDetails);
        return map;
    }

    public boolean reviewOrderById(String id,Integer status) {
        Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
        if(order.getProcessReview()!=2){
            throw  new ServiceException(Constants.Code_600,"该订单还未审核");
        }
        return orderMapper.reviewOrderById(id,status);
    }

    public boolean reviewProcessById(String id, Integer status) {
        return orderMapper.reviewProcessById(id,status);
    }

    public Map<String,Object> getOrderCraftById(String id) {
        Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
        List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectOrderGlassDetailByOrderId(id);
        Map<String,Object> map = new HashMap<>();
        map.put("order",order);
        map.put("orderGlassDetails",orderGlassDetails);
        return map;
    }
}

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -6,20 +6,17 @@
    <resultMap id="flowCardMap" type="com.example.erp.entity.pp.FlowCard">

        <result column="order_id" property="orderId"/>
        <result column="production_id" property="productionId"/>
        <result column="splitting_status" property="splittingStatus"/>
        <result column="create_time" property="createTime"/>
        <result column="process_Id" property="processId"/>
        <result column="binning_quantity" property="binningQuantity"/>
        <result column="founder" property="founder"/>
        <!--接收其他外键实体类数据-->
        <association property="order" javaType="com.example.erp.entity.sd.Order">
            <result column="batch" property="batch"/>
            <result column="project" property="project"/>
        </association>
        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="product_id" property="productId"/>
            <result column="product_name" property="productName"/>
            <result column="compute_area" property="computeArea"/>
            <result column="quantity" property="quantity"/>
            <result column="compute_gross_area" property="computeGrossArea"/>
            <result column="perimeter" property="perimeter"/>
            <result column="bend_radius" property="bendRadius"/>
            <result column="processing_note" property="processingNote"/>
        </association>

@@ -29,44 +26,41 @@
    </resultMap>
    <select id="selectFlowCard" resultMap="flowCardMap">
        select
        a.order_id,
        a.production_id,
        c.batch,
        b.product_name,
        b.compute_area,
        b.quantity,
        b.compute_gross_area,
        b.perimeter,
        b.bend_radius,
        b.processing_note
        from order_glass_detail as a
        LEFT JOIN order_detail as b on a.order_id=b.order_id and a.order_number=b.order_number LEFT JOIN
        `order` as c on a.order_id=c.order_id
        a.order_Id,
        a.process_Id,
        c.product_id,
        c.product_name,
        b.project,
        a.binning_quantity,
        c.compute_gross_area,
        a.founder,
        c.processing_note
        from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
        left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
        <where>
            <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
                and a.order_id regexp #{orderGlassDetail.orderId}
            <if test="flowCard.orderId != null and flowCard.orderId != ''">
                and a.order_id regexp #{flowCard.orderId}
            </if>
            <if test="orderGlassDetail.productionId != null and orderGlassDetail.productionId != ''">
                and a.production_id regexp #{orderGlassDetail.productionId}
            <if test="flowCard.productionId != null and flowCard.productionId != ''">
                and a.process_Id regexp #{flowCard.productionId}
            </if>
            <if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
                and c.batch regexp #{orderGlassDetail.order.batch}
            <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
                and c.product_id regexp #{flowCard.orderDetail.productId}
            </if>
            <if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
                and b.product_name regexp #{orderGlassDetail.orderDetail.productName}
            <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">
                and c.product_name regexp #{flowCard.orderDetail.productName}
            </if>
            <if test="orderGlassDetail.splittingStatus=0 " >
                and a.splitting_status regexp #{state}

            <if test="flowCard.order.project != null and flowCard.order.project!= ''">
                and b.project regexp #{flowCard.order.project}
            </if>
            <if test="orderGlassDetail.splittingStatus=1">
                and a.splitting_status regexp #{state}
            </if>
            <if test="orderGlassDetail.createTime != ''">
                and DATE_FORMAT((a.create_time),'%Y-%m-%d')  BETWEEN #{ selectTime1 } AND #{ selectTime2 }

            <if test="flowCard.createTime != ''">
                and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
            </if>
        </where>
        group by a.production_id,a.order_number
        order by a.id desc
        group by a.process_Id



        ;

 north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml

@@ -3,19 +3,245 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.pp.ReportingWorkDetailMapper">
    <!--返工新增-->
    <resultMap id="reworkAdd" type="com.example.erp.entity.pp.ReportingWorkDetail">
        <id column="id" property="id"/>
        <result column="rework_team" property="reworkTeam"/>
        <result column="breakage_number" property="breakageNumber"/>
        <result column="return_process" property="returnProcess"/>
        <result column="breakage_reason" property="breakageReason"/>
        <result column="responsible_equipment" property="responsibleEquipment"/>
        <result column="responsible_team" property="responsibleTeam"/>
        <!--接收其他外键实体类数据-->
        <association property="reportingWork" javaType="com.example.erp.entity.pp.ReportingWork">
            <result column="process_id" property="processId"/>
        </association>

        <association property="order" javaType="com.example.erp.entity.sd.Order">
            <result column="order_id" property="orderId"/>
            <result column="project" property="project"/>
            <result column="batch" property="batch"/>
        </association>

        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="shape" property="shape"/>

        </association>

        <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
            <result column="glass_child" property="glassChild"/>
            <result column="order_number" property="orderNumber"/>
            <result column="technology_number" property="technologyNumber"/>
            <result column="glass_address" property="glassAddress"/>
            <result column="child_height" property="childHeight"/>

        </association>

        <!-- <result column="order_id" property="orderId"/>-->

    </resultMap>

    <!--返工管理页面-->
    <resultMap id="reworkManage" type="com.example.erp.entity.pp.ReportingWorkDetail">

        <id column="id" property="id"/>
        <result column="rework_team" property="reworkTeam"/>
        <result column="breakage_number" property="breakageNumber"/>
        <result column="return_process" property="returnProcess"/>
        <result column="breakage_reason" property="breakageReason"/>
        <result column="breakage_type" property="breakageType"/>
        <result column="responsible_equipment" property="responsibleEquipment"/>
        <result column="responsible_team" property="responsibleTeam"/>
        <result column="rework_area" property="reworkArea"/>
        <result column="order_number" property="orderNumber"/>
        <result column="quality_inspector" property="qualityInspector"/>

        <!--接收其他外键实体类数据-->
        <association property="reportingWork" javaType="com.example.erp.entity.pp.ReportingWork">
            <result column="process_id" property="processId"/>
        </association>

        <association property="order" javaType="com.example.erp.entity.sd.Order">
            <result column="order_id" property="orderId"/>
            <result column="project" property="project"/>
            <result column="batch" property="batch"/>
        </association>

        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="shape" property="shape"/>
        </association>

        <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
            <result column="glass_child" property="glassChild"/>
            <!--<result column="order_number" property="orderNumber"/>-->
            <result column="technology_number" property="technologyNumber"/>
            <result column="glass_address" property="glassAddress"/>
            <result column="child_height" property="childHeight"/>
            <result column="child_width" property="childWidth"/>

        </association>


    </resultMap>
    
    
    <!--获取补片数据-->
    <select id="getDetail">
        select
            *
        from
            reporting_work_detail

    <!--获取返工新增数据-->
    <select id="queryReworkAdd" resultMap="reworkAdd">
        select * from v_rework
        <where>
            rework_team is null

            <if test="order_id != null and order_id != ''">
                and order_id = #{order_id}
            </if>

            <if test="process_id != null and process_id != ''">
                and process_id = #{process_id}
            </if>

            <if test="project != null and project != ''">
                and project = #{project}
            </if>
        </where>

        order by id desc
        limit #{pageNum},#{pageSize}
        ;
    </select>


    <!--返工管理-->
    <select id="reworkDataManage" resultMap="reworkManage">
        select * from v_rework



        order by id desc
        limit #{pageNum},#{pageSize}
        ;
    </select>


    <!--返工管理-->
    <select id="reworkDataManage2" resultMap="reworkManage">
        select * from v_rework

        <where>

            /*create_time <![CDATA[>=]]> #{sDate} and create_time <![CDATA[<=]]> #{eDate}}*/
            /*大于等于，小于等于*/
            create_time &gt;= #{sDate} and create_time &lt;= #{eDate}}

            and rework_team is not null

            <if test="order_id != null and order_id != ''">
                and order_id = #{order_id}
            </if>

            <if test="process_id != null and process_id != ''">
                and process_id = #{process_id}
            </if>

            <if test="project != null and project != ''">
                and project = #{project}
            </if>


        </where>

        order by id desc
        limit #{pageNum},#{pageSize}
        ;
    </select>


    <!--<where>

            create_time <![CDATA[>=]]> #{startTime} and create_time <![CDATA[<=]]> #{endTime}}
            &lt;!&ndash;返工编号&ndash;&gt;
            <if test="rework_id!=null and rework != ''">
                and rework_id = #{reworkId}
            </if>
            &lt;!&ndash;流程卡号&ndash;&gt;
            <if test="process_id != null and process_id != ''">
                and process_id=#{processId}
            </if>
            &lt;!&ndash;返工类型&ndash;&gt;
            <if test="rework_Type != null and rework_Type!=''">
                and rework_Type=#{rework_Type}
            </if>
            &lt;!&ndash;返工原因&ndash;&gt;
            <if test="rework_Reason != null and rework_Reason!=''">
                and rework_Reason=#{rework_Reason}
            </if>
            &lt;!&ndash;返工工序&ndash;&gt;
            <if test="rework_Processes != null and rework_Processes!=''">
                and rework_Processes=#{rework_Processes}
            </if>
            &lt;!&ndash;返工数量&ndash;&gt;
            <if test="rework_Num != null and rework_Num!=''">
                and rework_Num=#{rework_Num}
            </if>
            &lt;!&ndash;返工班组&ndash;&gt;
            <if test="rework_Team != null and rework_Team!=''">
                and rework_Team=#{rework_Team}
            </if>
            &lt;!&ndash;审核人&ndash;&gt;
            <if test="reviewer != null and reviewer!=''">
                and reviewer=#{reviewer}
            </if>
            &lt;!&ndash;审核状态&ndash;&gt;
            <if test="review_Status != null and review_Status!=''">
                and review_Status=#{review_Status}
            </if>
            &lt;!&ndash;返工面积&ndash;&gt;
            <if test="rework_Area != null and rework_Area!=''">
                and rework_Area=#{rework_Area}
            </if>

        </where>-->

    <!--获取返工新增数据-->
    <!--<select id="getReworkAdd">
        SELECT `b`.`id`                                                                                 AS `id`,
               `b`.`rework_team`                                                                        AS `rework_team`,
               `c`.`order_id`                                                                           AS `order_id`,
               `a`.`process_id`                                                                         AS `process_id`,
               `c`.`project`                                                                            AS `project`,
               `c`.`batch`                                                                              AS `batch`,
               `d`.`glass_child`                                                                        AS `glass_child`,
               `d`.`order_number`                                                                       AS `order_Number`,
               `d`.`technology_number`                                                                  AS `technology_number`,
               `d`.`glass_address`                                                                      AS `glass_address`,
               `b`.`breakage_number`                                                                    AS `breakage_number`,
               `d`.`child_width`                                                                        AS `child_width`,
               `d`.`child_height`                                                                       AS `child_height`,
               `e`.`shape`                                                                              AS `shape`,
               `b`.`return_process`                                                                     AS `return_process`,
               `b`.`breakage_reason`                                                                    AS `breakage_reason`,
               `b`.`responsible_equipment`                                                              AS `responsible_equipment`,
               `b`.`responsible_team`                                                                   AS `responsible_team`,
               round((((`d`.`child_width` * `d`.`child_height`) * `b`.`breakage_number`) / 1000000),
                     2)                                                                                 AS `rework_area`,
               `b`.`qualityIns_pector`                                                                  AS `qualityIns_pector`
        FROM ((((
            `reporting_work_detail` `b`
                LEFT JOIN `reporting_work` `a` ON ((
                `a`.`reporting_work_id` = `b`.`reporting_work_id`
                )))
            LEFT JOIN `sd`.`order` `c` ON ((
            `a`.`order_id` = `c`.`order_id`
            )))
            LEFT JOIN `sd`.`order_detail` `e` ON (((
                                                       `c`.`order_id` = `e`.`order_id`
                                                       )
            AND (`e`.`order_number` = `b`.`order_number`))))
            LEFT JOIN `sd`.`order_glass_detail` `d` ON (((
                                                             `d`.`order_id` = `c`.`order_id`
                                                             )
            AND (`b`.`order_number` = `d`.`order_number`)
            AND (`b`.`technology_number` = `d`.`technology_number`))))
        WHERE (
                  `b`.`available` = 1)
    </select>-->

</mapper>

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

@@ -38,4 +38,61 @@
    <select id="selectOrderGlassDetail">
        select * from order_glass_detail where order_id = #{orderId}
    </select>

    <resultMap id="orderGlassDetailMap" type="com.example.erp.entity.sd.OrderGlassDetail" >
        <id column="id" property="id"/>
        <result column="order_id" property="orderId"/>
        <result column="glass_address" property="glassAddress"/>
        <result column="technology_number" property="technologyNumber"/>
        <result column="glass_child" property="glassChild"/>
        <result column="child_width" property="childWidth"/>
        <result column="child_height" property="childHeight"/>
        <result column="process" property="process"/>
        <!--接收其他外键实体类数据-->
        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="order_number" property="orderNumber"/>
            <result column="building_number" property="buildingNumber"/>

            <result column="product_name" property="productName"/>
            <result column="width" property="width"/>
            <result column="height" property="height"/>
            <result column="shape" property="shape"/>
            <result column="gross_area" property="grossArea"/>
            <result column="edging_type" property="edgingType"/>
            <result column="area" property="area"/>
            <result column="quantity" property="quantity"/>
            <result column="processing_note"  property="processingNote"/>
            <result column="beizhu"  property="remarks"/>

        </association>

    </resultMap>

    <select id="selectOrderGlassDetailByOrderId"  resultMap="orderGlassDetailMap">
        select
            a.order_id,
            b.order_number,
            b.building_number,
            b.product_name,
            a.glass_address,
           a.technology_number,
           a.glass_child,
           b.width,
           b.height,
           b.shape,
           b.gross_area,
           b.edging_type,
           a.child_width,
           a.child_height,
           b.area,
           b.quantity,
           a.process,
           b.remarks as 'beizhu',
           b.processing_note
        from order_glass_detail as a
        left join order_detail as b
        on a.order_id = b.order_id and a.order_number = b.order_number
        where a.order_id = #{orderId}
        order by a.order_number,a.technology_number
    </select>
</mapper>

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

@@ -33,7 +33,7 @@
            *
        from
            `order` as o
        where  o.create_time>=#{startDate} and o.create_time &lt;= #{endDate}
        where  date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}

          <if test="orderType!= null and orderType != ''">
               and o.create_order = #{orderType}
@@ -97,10 +97,11 @@

    <select id="getPageTotal">
        select
            CEILING(count(o.id)/#{pageSize})
            CEILING(count(o.id)/#{pageSize}) as 'pageTotal',
            count(o.id) as 'total'
        from
        `order` as o
        where o.create_time>=#{startDate} and o.create_time &lt;= #{endDate}
        where date (o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
            <if test="orderType!= null and orderType != ''">
                and o.create_order = #{orderType}
            </if>
@@ -156,9 +157,16 @@
            <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
                and o.delivery_address REGEXP #{order.deliveryAddress}
            </if>

        order by o.id desc
        limit #{offset},#{pageSize}
    </select>
    
    <update id="reviewOrderById">
        update `order` set order_review = #{status} where order_id = #{id}
    </update>

    <update id="reviewProcessById">
        update `order` set process_review = #{status} where order_id = #{id}
    </update>

</mapper>

 north-glass-erp/src/test/java/com/example/erp/service/pp/ReworkServiceTest.java

New file
@@ -0,0 +1,24 @@
package com.example.erp.service.pp;

import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

import static org.junit.jupiter.api.Assertions.*;
@SpringBootTest
class ReworkServiceTest {
    @Autowired
    private ReworkService reworkService;


    @Test
    void queryReworkTest(){
        reworkService.queryRework(1,2,"2024-01-01","2024-01-25",null);
    }


    @Test
    void queryReworkAddTest(){
        reworkService.queryRework(1,2,"2024-01-01","2024-01-25",null);
    }
}

 north-glass-erp/target/classes/mapper/pp/FolwCard.xml

@@ -6,20 +6,17 @@
    <resultMap id="flowCardMap" type="com.example.erp.entity.pp.FlowCard">

        <result column="order_id" property="orderId"/>
        <result column="production_id" property="productionId"/>
        <result column="splitting_status" property="splittingStatus"/>
        <result column="create_time" property="createTime"/>
        <result column="process_Id" property="processId"/>
        <result column="binning_quantity" property="binningQuantity"/>
        <result column="founder" property="founder"/>
        <!--接收其他外键实体类数据-->
        <association property="order" javaType="com.example.erp.entity.sd.Order">
            <result column="batch" property="batch"/>
            <result column="project" property="project"/>
        </association>
        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="product_id" property="productId"/>
            <result column="product_name" property="productName"/>
            <result column="compute_area" property="computeArea"/>
            <result column="quantity" property="quantity"/>
            <result column="compute_gross_area" property="computeGrossArea"/>
            <result column="perimeter" property="perimeter"/>
            <result column="bend_radius" property="bendRadius"/>
            <result column="processing_note" property="processingNote"/>
        </association>

@@ -29,44 +26,41 @@
    </resultMap>
    <select id="selectFlowCard" resultMap="flowCardMap">
        select
        a.order_id,
        a.production_id,
        c.batch,
        b.product_name,
        b.compute_area,
        b.quantity,
        b.compute_gross_area,
        b.perimeter,
        b.bend_radius,
        b.processing_note
        from order_glass_detail as a
        LEFT JOIN order_detail as b on a.order_id=b.order_id and a.order_number=b.order_number LEFT JOIN
        `order` as c on a.order_id=c.order_id
        a.order_Id,
        a.process_Id,
        c.product_id,
        c.product_name,
        b.project,
        a.binning_quantity,
        c.compute_gross_area,
        a.founder,
        c.processing_note
        from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
        left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
        <where>
            <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
                and a.order_id regexp #{orderGlassDetail.orderId}
            <if test="flowCard.orderId != null and flowCard.orderId != ''">
                and a.order_id regexp #{flowCard.orderId}
            </if>
            <if test="orderGlassDetail.productionId != null and orderGlassDetail.productionId != ''">
                and a.production_id regexp #{orderGlassDetail.productionId}
            <if test="flowCard.productionId != null and flowCard.productionId != ''">
                and a.process_Id regexp #{flowCard.productionId}
            </if>
            <if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
                and c.batch regexp #{orderGlassDetail.order.batch}
            <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
                and c.product_id regexp #{flowCard.orderDetail.productId}
            </if>
            <if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
                and b.product_name regexp #{orderGlassDetail.orderDetail.productName}
            <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">
                and c.product_name regexp #{flowCard.orderDetail.productName}
            </if>
            <if test="orderGlassDetail.splittingStatus=0 " >
                and a.splitting_status regexp #{state}

            <if test="flowCard.order.project != null and flowCard.order.project!= ''">
                and b.project regexp #{flowCard.order.project}
            </if>
            <if test="orderGlassDetail.splittingStatus=1">
                and a.splitting_status regexp #{state}
            </if>
            <if test="orderGlassDetail.createTime != ''">
                and DATE_FORMAT((a.create_time),'%Y-%m-%d')  BETWEEN #{ selectTime1 } AND #{ selectTime2 }

            <if test="flowCard.createTime != ''">
                and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
            </if>
        </where>
        group by a.production_id,a.order_number
        order by a.id desc
        group by a.process_Id



        ;

 north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml

@@ -3,19 +3,245 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.pp.ReportingWorkDetailMapper">
    <!--返工新增-->
    <resultMap id="reworkAdd" type="com.example.erp.entity.pp.ReportingWorkDetail">
        <id column="id" property="id"/>
        <result column="rework_team" property="reworkTeam"/>
        <result column="breakage_number" property="breakageNumber"/>
        <result column="return_process" property="returnProcess"/>
        <result column="breakage_reason" property="breakageReason"/>
        <result column="responsible_equipment" property="responsibleEquipment"/>
        <result column="responsible_team" property="responsibleTeam"/>
        <!--接收其他外键实体类数据-->
        <association property="reportingWork" javaType="com.example.erp.entity.pp.ReportingWork">
            <result column="process_id" property="processId"/>
        </association>

        <association property="order" javaType="com.example.erp.entity.sd.Order">
            <result column="order_id" property="orderId"/>
            <result column="project" property="project"/>
            <result column="batch" property="batch"/>
        </association>

        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="shape" property="shape"/>

        </association>

        <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
            <result column="glass_child" property="glassChild"/>
            <result column="order_number" property="orderNumber"/>
            <result column="technology_number" property="technologyNumber"/>
            <result column="glass_address" property="glassAddress"/>
            <result column="child_height" property="childHeight"/>

        </association>

        <!-- <result column="order_id" property="orderId"/>-->

    </resultMap>

    <!--返工管理页面-->
    <resultMap id="reworkManage" type="com.example.erp.entity.pp.ReportingWorkDetail">

        <id column="id" property="id"/>
        <result column="rework_team" property="reworkTeam"/>
        <result column="breakage_number" property="breakageNumber"/>
        <result column="return_process" property="returnProcess"/>
        <result column="breakage_reason" property="breakageReason"/>
        <result column="breakage_type" property="breakageType"/>
        <result column="responsible_equipment" property="responsibleEquipment"/>
        <result column="responsible_team" property="responsibleTeam"/>
        <result column="rework_area" property="reworkArea"/>
        <result column="order_number" property="orderNumber"/>
        <result column="quality_inspector" property="qualityInspector"/>

        <!--接收其他外键实体类数据-->
        <association property="reportingWork" javaType="com.example.erp.entity.pp.ReportingWork">
            <result column="process_id" property="processId"/>
        </association>

        <association property="order" javaType="com.example.erp.entity.sd.Order">
            <result column="order_id" property="orderId"/>
            <result column="project" property="project"/>
            <result column="batch" property="batch"/>
        </association>

        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="shape" property="shape"/>
        </association>

        <association property="orderGlassDetail" javaType="com.example.erp.entity.sd.OrderGlassDetail">
            <result column="glass_child" property="glassChild"/>
            <!--<result column="order_number" property="orderNumber"/>-->
            <result column="technology_number" property="technologyNumber"/>
            <result column="glass_address" property="glassAddress"/>
            <result column="child_height" property="childHeight"/>
            <result column="child_width" property="childWidth"/>

        </association>


    </resultMap>
    
    
    <!--获取补片数据-->
    <select id="getDetail">
        select
            *
        from
            reporting_work_detail

    <!--获取返工新增数据-->
    <select id="queryReworkAdd" resultMap="reworkAdd">
        select * from v_rework
        <where>
            rework_team is null

            <if test="order_id != null and order_id != ''">
                and order_id = #{order_id}
            </if>

            <if test="process_id != null and process_id != ''">
                and process_id = #{process_id}
            </if>

            <if test="project != null and project != ''">
                and project = #{project}
            </if>
        </where>

        order by id desc
        limit #{pageNum},#{pageSize}
        ;
    </select>


    <!--返工管理-->
    <select id="reworkDataManage" resultMap="reworkManage">
        select * from v_rework



        order by id desc
        limit #{pageNum},#{pageSize}
        ;
    </select>


    <!--返工管理-->
    <select id="reworkDataManage2" resultMap="reworkManage">
        select * from v_rework

        <where>

            /*create_time <![CDATA[>=]]> #{sDate} and create_time <![CDATA[<=]]> #{eDate}}*/
            /*大于等于，小于等于*/
            create_time &gt;= #{sDate} and create_time &lt;= #{eDate}}

            and rework_team is not null

            <if test="order_id != null and order_id != ''">
                and order_id = #{order_id}
            </if>

            <if test="process_id != null and process_id != ''">
                and process_id = #{process_id}
            </if>

            <if test="project != null and project != ''">
                and project = #{project}
            </if>


        </where>

        order by id desc
        limit #{pageNum},#{pageSize}
        ;
    </select>


    <!--<where>

            create_time <![CDATA[>=]]> #{startTime} and create_time <![CDATA[<=]]> #{endTime}}
            &lt;!&ndash;返工编号&ndash;&gt;
            <if test="rework_id!=null and rework != ''">
                and rework_id = #{reworkId}
            </if>
            &lt;!&ndash;流程卡号&ndash;&gt;
            <if test="process_id != null and process_id != ''">
                and process_id=#{processId}
            </if>
            &lt;!&ndash;返工类型&ndash;&gt;
            <if test="rework_Type != null and rework_Type!=''">
                and rework_Type=#{rework_Type}
            </if>
            &lt;!&ndash;返工原因&ndash;&gt;
            <if test="rework_Reason != null and rework_Reason!=''">
                and rework_Reason=#{rework_Reason}
            </if>
            &lt;!&ndash;返工工序&ndash;&gt;
            <if test="rework_Processes != null and rework_Processes!=''">
                and rework_Processes=#{rework_Processes}
            </if>
            &lt;!&ndash;返工数量&ndash;&gt;
            <if test="rework_Num != null and rework_Num!=''">
                and rework_Num=#{rework_Num}
            </if>
            &lt;!&ndash;返工班组&ndash;&gt;
            <if test="rework_Team != null and rework_Team!=''">
                and rework_Team=#{rework_Team}
            </if>
            &lt;!&ndash;审核人&ndash;&gt;
            <if test="reviewer != null and reviewer!=''">
                and reviewer=#{reviewer}
            </if>
            &lt;!&ndash;审核状态&ndash;&gt;
            <if test="review_Status != null and review_Status!=''">
                and review_Status=#{review_Status}
            </if>
            &lt;!&ndash;返工面积&ndash;&gt;
            <if test="rework_Area != null and rework_Area!=''">
                and rework_Area=#{rework_Area}
            </if>

        </where>-->

    <!--获取返工新增数据-->
    <!--<select id="getReworkAdd">
        SELECT `b`.`id`                                                                                 AS `id`,
               `b`.`rework_team`                                                                        AS `rework_team`,
               `c`.`order_id`                                                                           AS `order_id`,
               `a`.`process_id`                                                                         AS `process_id`,
               `c`.`project`                                                                            AS `project`,
               `c`.`batch`                                                                              AS `batch`,
               `d`.`glass_child`                                                                        AS `glass_child`,
               `d`.`order_number`                                                                       AS `order_Number`,
               `d`.`technology_number`                                                                  AS `technology_number`,
               `d`.`glass_address`                                                                      AS `glass_address`,
               `b`.`breakage_number`                                                                    AS `breakage_number`,
               `d`.`child_width`                                                                        AS `child_width`,
               `d`.`child_height`                                                                       AS `child_height`,
               `e`.`shape`                                                                              AS `shape`,
               `b`.`return_process`                                                                     AS `return_process`,
               `b`.`breakage_reason`                                                                    AS `breakage_reason`,
               `b`.`responsible_equipment`                                                              AS `responsible_equipment`,
               `b`.`responsible_team`                                                                   AS `responsible_team`,
               round((((`d`.`child_width` * `d`.`child_height`) * `b`.`breakage_number`) / 1000000),
                     2)                                                                                 AS `rework_area`,
               `b`.`qualityIns_pector`                                                                  AS `qualityIns_pector`
        FROM ((((
            `reporting_work_detail` `b`
                LEFT JOIN `reporting_work` `a` ON ((
                `a`.`reporting_work_id` = `b`.`reporting_work_id`
                )))
            LEFT JOIN `sd`.`order` `c` ON ((
            `a`.`order_id` = `c`.`order_id`
            )))
            LEFT JOIN `sd`.`order_detail` `e` ON (((
                                                       `c`.`order_id` = `e`.`order_id`
                                                       )
            AND (`e`.`order_number` = `b`.`order_number`))))
            LEFT JOIN `sd`.`order_glass_detail` `d` ON (((
                                                             `d`.`order_id` = `c`.`order_id`
                                                             )
            AND (`b`.`order_number` = `d`.`order_number`)
            AND (`b`.`technology_number` = `d`.`technology_number`))))
        WHERE (
                  `b`.`available` = 1)
    </select>-->

</mapper>

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

@@ -38,4 +38,61 @@
    <select id="selectOrderGlassDetail">
        select * from order_glass_detail where order_id = #{orderId}
    </select>

    <resultMap id="orderGlassDetailMap" type="com.example.erp.entity.sd.OrderGlassDetail" >
        <id column="id" property="id"/>
        <result column="order_id" property="orderId"/>
        <result column="glass_address" property="glassAddress"/>
        <result column="technology_number" property="technologyNumber"/>
        <result column="glass_child" property="glassChild"/>
        <result column="child_width" property="childWidth"/>
        <result column="child_height" property="childHeight"/>
        <result column="process" property="process"/>
        <!--接收其他外键实体类数据-->
        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="order_number" property="orderNumber"/>
            <result column="building_number" property="buildingNumber"/>

            <result column="product_name" property="productName"/>
            <result column="width" property="width"/>
            <result column="height" property="height"/>
            <result column="shape" property="shape"/>
            <result column="gross_area" property="grossArea"/>
            <result column="edging_type" property="edgingType"/>
            <result column="area" property="area"/>
            <result column="quantity" property="quantity"/>
            <result column="processing_note"  property="processingNote"/>
            <result column="beizhu"  property="remarks"/>

        </association>

    </resultMap>

    <select id="selectOrderGlassDetailByOrderId"  resultMap="orderGlassDetailMap">
        select
            a.order_id,
            b.order_number,
            b.building_number,
            b.product_name,
            a.glass_address,
           a.technology_number,
           a.glass_child,
           b.width,
           b.height,
           b.shape,
           b.gross_area,
           b.edging_type,
           a.child_width,
           a.child_height,
           b.area,
           b.quantity,
           a.process,
           b.remarks as 'beizhu',
           b.processing_note
        from order_glass_detail as a
        left join order_detail as b
        on a.order_id = b.order_id and a.order_number = b.order_number
        where a.order_id = #{orderId}
        order by a.order_number,a.technology_number
    </select>
</mapper>

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

@@ -33,7 +33,7 @@
            *
        from
            `order` as o
        where  o.create_time>=#{startDate} and o.create_time &lt;= #{endDate}
        where  date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}

          <if test="orderType!= null and orderType != ''">
               and o.create_order = #{orderType}
@@ -97,10 +97,11 @@

    <select id="getPageTotal">
        select
            CEILING(count(o.id)/#{pageSize})
            CEILING(count(o.id)/#{pageSize}) as 'pageTotal',
            count(o.id) as 'total'
        from
        `order` as o
        where o.create_time>=#{startDate} and o.create_time &lt;= #{endDate}
        where date (o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
            <if test="orderType!= null and orderType != ''">
                and o.create_order = #{orderType}
            </if>
@@ -156,9 +157,16 @@
            <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
                and o.delivery_address REGEXP #{order.deliveryAddress}
            </if>

        order by o.id desc
        limit #{offset},#{pageSize}
    </select>
    
    <update id="reviewOrderById">
        update `order` set order_review = #{status} where order_id = #{id}
    </update>

    <update id="reviewProcessById">
        update `order` set process_review = #{status} where order_id = #{id}
    </update>

</mapper>