提交返工界面

廖井涛

2024-03-06 ed436058f1ae782a0c18e28e134c6099f4e5e951

提交返工界面

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue

@@ -81,7 +81,7 @@


//第一次调用
request.post(`/FinishedGoodsInventory/getseletwarehousing/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/FinishedGoodsInventory/getSelectWarehousing/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -119,7 +119,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getseletwarehousing/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelectWarehousing/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -136,7 +136,7 @@
}
const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getseletwarehousing/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelectWarehousing/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      produceList = deepClone(res.data.data)
@@ -263,7 +263,7 @@
              flowcard:selectRecords
            })

              request.post("/FinishedGoodsInventory/addseletwarehousing",flowData.value).then((res) => {
              request.post("/FinishedGoodsInventory/addSelectWarehousing",flowData.value).then((res) => {
                if(res.code==200){
                  ElMessage.success("入库成功")
                  location.reload();

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue

@@ -86,7 +86,7 @@


//第一次调用
request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -122,7 +122,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -141,7 +141,7 @@

const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      produceList = deepClone(res.data.data)
@@ -265,7 +265,7 @@
              orderDetail:selectRecords
            })

            request.post("/FinishedGoodsInventory/adddeliveryDetail",orderDetailData.value).then((res) => {
            request.post("/FinishedGoodsInventory/addDeliveryDetail",orderDetailData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("出库成功")
                location.reload();

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue

@@ -71,7 +71,7 @@


//第一次调用
request.post(`/FinishedGoodsInventory/getselet/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/FinishedGoodsInventory/getSelect/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -109,7 +109,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getselet/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelect/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -126,7 +126,7 @@

const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getselet/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelect/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      produceList = deepClone(res.data.data)

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue

@@ -65,7 +65,7 @@
})

//第一次调用
request.post(`/FinishedGoodsInventory/getselectAllocateFinishedOperateLog/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/FinishedGoodsInventory/getSelectAllocateFinishedOperateLog/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -104,7 +104,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getselectAllocateFinishedOperateLog/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelectAllocateFinishedOperateLog/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -125,7 +125,7 @@


const selectOrderList = ()=>{
  request.post(`/FinishedGoodsInventory/getselectAllocateFinishedOperateLog/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelectAllocateFinishedOperateLog/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -244,7 +244,7 @@
              orderDetail:selectRecords

            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterexamination",flowData.value).then((res) => {
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("反审成功")
                location.reload();

 north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue

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

import {reactive} from "vue";
import {useRouter} from  'vue-router'
let router=useRouter()
const getTableRow = (row,type) =>{
  switch (type) {
    case 'edit' :{
      //alert('我接收到子组件传送的编辑信息')
      router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
      alert('我接收到子组件传送的反审状态')
      break
    }
import {onMounted, reactive, ref} from "vue";
import {useRouter} from 'vue-router'
import request from "@/utils/request";
import {ElMessage} from "element-plus";
import deepClone from "@/utils/deepClone";
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";

let router = useRouter()

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


let filterData = ref({

})


//第一次调用
request.post(`/Replenish/getSelectReplenish/${pageNum}/100`,filterData.value).then((res) => {

  if(res.code==200){

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


//表尾求和
const sumNum = (list, field) => {
@@ -50,7 +69,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
    //remote: true
  },
  customConfig: {
    storage: true
@@ -61,39 +80,34 @@
    showStatus: true
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    { type: 'checkbox',fixed:"left", title: '选择', width: 80 },
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {field: '报工时间', width: 120,title: '报工时间', sortable: true},
    {field: '销售单号', width: 120, title: '销售单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: '流程卡号',width: 120, title: '流程卡号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '项目名称', width: 130,title: '项目名称', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '产品名称',width: 120, title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '报工编号', width: 100,title: '报工编号', sortable: true,showOverflow:"ellipsis"},
    {field: '序号', width: 70,title: '序号', sortable: true},
    {field: '单片名称',width: 100, title: '单片名称', sortable: true},
    {field: '楼层编号',width: 120, title: '楼层编号', sortable: true,showOverflow:"ellipsis"},
    {field: '标记', width: 80,title: '标记', sortable: true},
    {field: '片标记',width: 90, title: '片标记', sortable: true},
    {field: '流程卡数量',width: 120, title: '流程卡数量', sortable: true},
    {field: '宽',width: 80, title: '宽', sortable: true},
    {field: '高',width: 80, title: '高', sortable: true},
    {field: '面积',width: 80, title: '面积', sortable: true},
    {field: '形状',width: 80, title: '形状', sortable: true},
    {field: '次破数量',width: 120, title: '次破数量', sortable: true},
    {field: '次破类型',width: 120, title: '次破类型', sortable: true},
    {field: '次破原因',width: 120, title: '次破原因', sortable: true},
    {field: '责任设备',width: 120, title: '责任设备', sortable: true},
    {field: '报工工序',width: 120, title: '报工工序', sortable: true},
    {field: '责任工序',width: 120, title: '责任工序', sortable: true},
    {field: '责任班组',width: 120, title: '责任班组', sortable: true},
    {field: '责任人员',width: 120, title: '责任人员', sortable: true},
    {field: '质检员',width: 100, title: '质检员', sortable: true}
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {field: 'select',type:'checkbox',title: '选择', width: 80,fixed:"left"},
    {type: 'seq', fixed: "left", title: '自序', width: 50},
    {field: 'reportingWorkTime', width: 120, title: '报工时间', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'orderId', width: 120, title: '销售单号', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'processId', width: 120, title: '流程卡号', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'project', width: 120, title: '项目名称', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'batch', width: 80, title: '批次',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
    {field: 'orderSort', width: 80, title: '序号',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'productName', width: 120, title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'reportingWorkId', width: 120, title: '报工编号', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'technologyNumber', width: 80, title: '标记',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
    {field: 'glassAddress', width: 90, title: '片标记', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'patchNum', width: 120, title: '次破数量', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'width', width: 80, title: '宽', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'height', width: 80, title: '高', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'shape', width: 80, title: '形状', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'patchProcesses', width: 100, title: '报工工序', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'patchType', width: 100, title: '次破类型', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'patchReason', width: 120, title: '次破原因', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'responsibleEquipment', width: 120, title: '责任设备', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'responsibleTeam', width: 120, title: '责任班组', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'qualityInsPector', width: 100, title: '质检员', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
  ],//表头按钮

  toolbarConfig: {
    buttons: [
      {code: 'print_lck', name: '保存',status:'primary' ,icon:'vxe-icon-save'},
      {'code': 'add', 'name': '保存',status: 'primary',icon: 'vxe-icon-save'}
    ],
    import: false,
    export: true,
@@ -101,143 +115,6 @@
    zoom: true,
    custom: true
  },
  data:  [
    {
      报工时间:'2021-01-01',
      销售单号:'NG23010101',
      流程卡号:'NG23010101A01',
      项目名称:'xxxx',
      产品名称:"xxxxxxxxx",
      报工编号:"BG2301010001",
      楼层编号:"D4-010-01",
      面积:'23.11',
      报工工序:'钢化',
      质检员:"张三",
      序号:'1',
      单片名称: '6mm白玻平钢(外)',
      标记: '1',
      片标记: '(外)',
      流程卡数量: '11',
      宽: '575',
      高:"2241",
      形状: '普形',
      次破数量: '12',
      次破类型: '机器',
      次破原因:'气泡超标',
      责任工序:'中空',
      责任班组:'中空一班',
      责任人员:'',
      责任设备:'中空3#线',
    },
    {
      报工时间:'2021-01-01',
      销售单号:'NG23010101',
      流程卡号:'NG23010101A01',
      项目名称:'xxxx',
      产品名称:"xxxxxxxxx",
      报工编号:"BG2301010001",
      楼层编号:"D4-010-01",
      面积:'23.11',
      报工工序:'钢化',
      质检员:"张三",
      序号:'1',
      单片名称: '6mm白玻平钢(外)',
      标记: '1',
      片标记: '(外)',
      流程卡数量: '11',
      宽: '575',
      高:"2241",
      形状: '普形',
      次破数量: '12',
      次破类型: '机器',
      次破原因:'气泡超标',
      责任工序:'中空',
      责任班组:'中空一班',
      责任人员:'',
      责任设备:'中空3#线',
    },
    {
      报工时间:'2021-01-01',
      销售单号:'NG23010101',
      流程卡号:'NG23010101A01',
      项目名称:'xxxx',
      产品名称:"xxxxxxxxx",
      报工编号:"BG2301010001",
      楼层编号:"D4-010-01",
      面积:'23.11',
      报工工序:'钢化',
      质检员:"张三",
      序号:'1',
      单片名称: '6mm白玻平钢(外)',
      标记: '1',
      片标记: '(外)',
      流程卡数量: '11',
      宽: '575',
      高:"2241",
      形状: '普形',
      次破数量: '12',
      次破类型: '机器',
      次破原因:'气泡超标',
      责任工序:'中空',
      责任班组:'中空一班',
      责任人员:'',
      责任设备:'中空3#线',
    },
    {
      报工时间:'2021-01-01',
      销售单号:'NG23010101',
      流程卡号:'NG23010101A01',
      项目名称:'xxxx',
      产品名称:"xxxxxxxxx",
      报工编号:"BG2301010001",
      楼层编号:"D4-010-01",
      面积:'23.11',
      报工工序:'钢化',
      质检员:"张三",
      序号:'1',
      单片名称: '6mm白玻平钢(外)',
      标记: '1',
      片标记: '(外)',
      流程卡数量: '11',
      宽: '575',
      高:"2241",
      形状: '普形',
      次破数量: '12',
      次破类型: '机器',
      次破原因:'气泡超标',
      责任工序:'中空',
      责任班组:'中空一班',
      责任人员:'',
      责任设备:'中空3#线',
    },
    {
      报工时间:'2021-01-01',
      销售单号:'NG23010101',
      流程卡号:'NG23010101A01',
      项目名称:'xxxx',
      产品名称:"xxxxxxxxx",
      报工编号:"BG2301010001",
      楼层编号:"D4-010-01",
      面积:'23.11',
      报工工序:'钢化',
      质检员:"张三",
      序号:'1',
      单片名称: '6mm白玻平钢(外)',
      标记: '1',
      片标记: '(外)',
      流程卡数量: '11',
      宽: '575',
      高:"2241",
      形状: '普形',
      次破数量: '12',
      次破类型: '机器',
      次破原因:'气泡超标',
      责任工序:'中空',
      责任班组:'中空一班',
      责任人员:'',
      责任设备:'中空3#线',
    },
  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['流程卡数量','面积','次破数量']
@@ -256,6 +133,105 @@

})

const gridEvents = {
  async toolbarButtonClick({code}) {
    const $grid = xGrid.value
    if ($grid) {
      switch (code) {
        case 'add': {
          const selectRecords = $grid.getCheckboxRecords()

          if (selectRecords.length > 0) {
            const errMap = await $grid.validate(selectRecords)
            if (errMap) {
              return
            }
          } else {
            ElMessage.warning("未选中数据")
            return
          }


          let flowData = ref({
            patchLog: selectRecords

          })
          request.post("/Replenish/saveReplenish", flowData.value).then((res) => {
            if(res.code==200){
              ElMessage.success("补片单提交成功")
              location.reload();
            }else{
              ElMessage.warning(res.msg)
              router.push("/login")
            }
          })
          break
        }



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

        case 'copyChecked' :{
          let result = toolbarButtonClickEvent()
          if(result){
            const dataList = xGrid.value.getTableData().visibleData
            let firstVal=null;
            if(result.cell.indexOf('.')>-1){
              firstVal = eval("dataList["+result.start +"]."+result.cell)
            }else {
              firstVal=dataList[result.start][result.cell];
            }
            dataList.forEach((item,index) =>{
              if(index>=result.start && index<=result.end){
                if(result.cell.indexOf('.')>-1){
                  const  columnArr = result.cell.split('.')
                  item[columnArr[0]][columnArr[1]]  = firstVal
                }else{
                  item[result.cell]  = firstVal
                }

              }
            })
          }
          break
        }

      }
    }
  }
}

const selectOrderList = ()=>{
  request.post(`/rework/SelectRework/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
    if(res.code==200){
      selectDate.value = res.data.selectDate

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


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

  selectOrderList()
}



</script>
@@ -265,10 +241,10 @@

    <vxe-grid
        max-height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"

    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->

 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue

@@ -1,8 +1,21 @@
<script setup>

import {reactive} from "vue";
import {useRouter} from  'vue-router'
let router=useRouter()
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";
import {Search} from "@element-plus/icons-vue";
import useUserInfoStore from "@/stores/userInfo";
import {changeFilterEvent,filterChanged} from "@/hook"


const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
let router = useRouter()
let produceList = ref([])
const dialogFormVisible = ref(false)
const getTableRow = (row,type) =>{
  switch (type) {
    case 'edit' :{
@@ -21,6 +34,41 @@
  }
}

let pageNum=ref(1)
let total = reactive({
  pageTotal : 0,
  dataTotal : 0,
  pageSize : 10
})

let selectDate = ref(["",""])

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


})

//第一次调用
request.post(`/Replenish/SelectReplenish/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    console.log(res.data.data)
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal

    selectDate.value = res.data.selectDate
    pageNum.value=1

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

//表尾求和
const sumNum = (list, field) => {
  let count = 0
@@ -31,7 +79,7 @@
}

//子组件接收参数

const xGrid = ref()
const gridOptions = reactive({
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
@@ -50,7 +98,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
    //remote: true
  },
  customConfig: {
    storage: true
@@ -61,199 +109,56 @@
    showStatus: true
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {title: '操作', width: 80, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },

    {field: 'salesOrderNo', width: 120, title: '销售单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: 'processCardNo',width: 120, title: '流程卡号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'entryName', width: 130,title: '项目名称', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'productName',width: 120, title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'reportingWorkNo', width: 100,title: '报工编号', sortable: true,showOverflow:"ellipsis"},
    {field: 'serialNumber', width: 70,title: '序号', sortable: true},
    {field: 'singlePieceName',width: 100, title: '单片名称', sortable: true},
    {field: 'floorNumber',width: 120, title: '楼层编号', sortable: true,showOverflow:"ellipsis"},
    {field: 'marking', width: 80,title: '标记', sortable: true},
    {field: 'pieces',width: 90, title: '片标记', sortable: true},
    {field: 'processCardNumber',width: 120, title: '流程卡数量', sortable: true},
    {field: 'width',width: 80, title: '宽', sortable: true},
    {field: 'height',width: 80, title: '高', sortable: true},
    {field: 'area',width: 80, title: '面积', sortable: true},
    {field: 'shape',width: 80, title: '形状', sortable: true},
    {field: 'numberBroken',width: 120, title: '次破数量', sortable: true},
    {field: 'reasonType',width: 120, title: '次破类型', sortable: true},
    {field: 'reasonDamage',width: 120, title: '次破原因', sortable: true},
    {field: 'responsibilityDevice',width: 120, title: '责任设备', sortable: true},
    {field: 'reportingProcess',width: 120, title: '报工工序', sortable: true},
    {field: 'responsibilityProcess',width: 120, title: '责任工序', sortable: true},
    {field: 'responsibilityTeams',width: 120, title: '责任班组', sortable: true},
    {field: 'responsibilityPersonnel',width: 120, title: '责任人员', sortable: true},
    {field: 'qualityInspector',width: 100, title: '质检员', sortable: true}
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {type:'checkbox',title: '选择', width: 80,fixed:"left"},
    {type: 'seq', fixed: "left", title: '自序', width: 50},
    {field: 'review_status',title: '审核', width: 40, slots: { default: 'state' }},
    {field: 'patch_id', width: 120, title: '补片单号', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'order_id', width: 120, title: '销售单号', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'process_id', width: 120, title: '流程卡号', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'project', width: 120, title: '项目名称', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'reporting_work_id', width: 100,title: '报工编号',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'batch', width: 80, title: '批次', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'order_sort', width: 80, title: '序号', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'product_name', width: 120, title: '单片名称', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'building_number',width: 120, title: '楼层编号', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'technology_number', width: 80, title: '标记', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'glass_address', width: 90, title: '片标记', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_num', width: 80, title: '数量', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'width', width: 80, title: '宽', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'height', width: 80, title: '高', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'shape', width: 80, title: '形状', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_type', width: 100, title: '返工类型', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_reason', width: 120, title: '返工原因', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'responsible_equipment', width: 120, title: '责任设备', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'responsible_team', width: 120, title: '责任班组', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_area', width: 120, title: '面积', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_processes', width: 120, title: '报工工序', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'quality_inspector', width: 100, title: '质检员', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'reviewer', width: 100, title: '审核员', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'create_time', width: 100, title: '补片时间'},
    {field: 'update_time', width: 120, title: '补片审核时间'}
  ],//表头按钮

  toolbarConfig: {
    // buttons: [{
    //
    // }],
    import: false,
    buttons: [{
      'name': '审核',status: 'primary',
      'code':'add'
    }],
    /*import: false,
    export: true,
    print: true,
    print: true,*/
    zoom: true,
    custom: true
  },
  data:  [
    {
      reportingWorkTime:'2021-01-01',
      salesOrderNo:'NG23010101',
      processCardNo:'NG23010101A01',
      entryName:'xxxx',
      productName:"xxxxxxxxx",
      reportingWorkNo:"BG2301010001",
      floorNumber:"D4-010-01",
      area:'23.11',
      reportingProcess:'钢化',
      qualityInspector:"张三",
      serialNumber:'1',
      singlePieceName: '6mm白玻平钢(外)',
      marking: '1',
      pieces: '(外)',
      processCardNumber: '11',
      width: '575',
      height:"2241",
      shape: '普形',
      upCompletedQuantity: '12',
      completedQuantity: '1',
      numberBroken:'2',
      availableUse:'',
      returnProcess:'',

      reasonType: '机器',
      reasonDamage:'气泡超标',
      available:'',
      reworkProcess:'',
      responsibilityProcess:'中空',
      responsibilityTeams:'中空一班',
      responsibilityPersonnel:'',
      responsibilityDevice:'中空3#线',
      completed:'',
      onceBroken:'',
    },
    {
      reportingWorkTime:'2021-01-01',
      salesOrderNo:'NG23010101',
      processCardNo:'NG23010101A01',
      entryName:'xxxx',
      productName:"xxxxxxxxx",
      reportingWorkNo:"BG2301010001",
      floorNumber:"D4-010-01",
      area:'23.11',
      reportingProcess:'钢化',
      qualityInspector:"张三",
      serialNumber:'1',
      singlePieceName: '6mm白玻平钢(外)',
      marking: '1',
      pieces: '(外)',
      processCardNumber: '11',
      width: '575',
      height:"2241",
      shape: '普形',
      upCompletedQuantity: '12',
      completedQuantity: '1',
      numberBroken:'2',
      availableUse:'',
      returnProcess:'',

      reasonType: '机器',
      reasonDamage:'气泡超标',
      available:'',
      reworkProcess:'',
      responsibilityProcess:'中空',
      responsibilityTeams:'中空一班',
      responsibilityPersonnel:'',
      responsibilityDevice:'中空3#线',
      completed:'',
      onceBroken:'',
    },
    {
      reportingWorkTime:'2021-01-01',
      salesOrderNo:'NG23010101',
      processCardNo:'NG23010101A01',
      entryName:'xxxx',
      productName:"xxxxxxxxx",
      reportingWorkNo:"BG2301010001",
      floorNumber:"D4-010-01",
      area:'23.11',
      reportingProcess:'钢化',
      qualityInspector:"张三",
      serialNumber:'1',
      singlePieceName: '6mm白玻平钢(外)',
      marking: '1',
      pieces: '(外)',
      processCardNumber: '11',
      width: '575',
      height:"2241",
      shape: '普形',
      upCompletedQuantity: '12',
      completedQuantity: '1',
      numberBroken:'2',
      availableUse:'',
      returnProcess:'',

      reasonType: '机器',
      reasonDamage:'气泡超标',
      available:'',
      reworkProcess:'',
      responsibilityProcess:'中空',
      responsibilityTeams:'中空一班',
      responsibilityPersonnel:'',
      responsibilityDevice:'中空3#线',
      completed:'',
      onceBroken:'',
    },
    {
      reportingWorkTime:'2021-01-01',
      salesOrderNo:'NG23010101',
      processCardNo:'NG23010101A01',
      entryName:'xxxx',
      productName:"xxxxxxxxx",
      reportingWorkNo:"BG2301010001",
      floorNumber:"D4-010-01",
      area:'23.11',
      reportingProcess:'钢化',
      qualityInspector:"张三",
      serialNumber:'1',
      singlePieceName: '6mm白玻平钢(外)',
      marking: '1',
      pieces: '(外)',
      processCardNumber: '11',
      width: '575',
      height:"2241",
      shape: '普形',
      upCompletedQuantity: '12',
      completedQuantity: '1',
      numberBroken:'2',
      availableUse:'',
      returnProcess:'',

      reasonType: '机器',
      reasonDamage:'气泡超标',
      available:'',
      reworkProcess:'',
      responsibilityProcess:'中空',
      responsibilityTeams:'中空一班',
      responsibilityPersonnel:'',
      responsibilityDevice:'中空3#线',
      completed:'',
      onceBroken:'',
    },
  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['processCardNumber','numberBroken']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
          return '合计'
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
@@ -265,31 +170,111 @@

})

const gridEvents = {
  toolbarButtonClick ({ code }) {
    const $grid = xGrid.value
    if ($grid) {
      switch (code) {
        case 'add': {
          const $table = xGrid.value
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()

            let flowData = ref({

              userId:userid,
              userName:username,
              patchLog:selectRecords

            })
            request.post("/Replenish/updateReplenish",flowData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("审核成功")
                location.reload();

              }else{
                ElMessage.warning(res.msg)
                router.push("/login")
              }
            })
          }
          return;

        }


      }
    }
  },

}


const selectOrderList = ()=>{
  request.post(`/Replenish/SelectReplenish/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
    if(res.code==200){
      selectDate.value = res.data.selectDate

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

const changeDate =  ()=>{
  selectOrderList()
}

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

  selectOrderList()
}

const checkBoxConfig = {
  checkMethod: ({ row }) => {
    if (row['review_status']===1){
      return row.disable
    }else{
      return !row.disable
    }

  },
  reserve:true
}



</script>

<template>
  <div class="main-div-customer">
    <div id="head" >
      <el-row :gutter="0">
    <el-header height="auto" style="padding: 0;margin:0">
      <el-date-picker
          v-model="value"
          v-model="selectDate"
          type="daterange"
          start-placeholder="报工开始时间"
          start-placeholder="开始时间"
          end-placeholder="结束时间"
          format="YYYY-MM-DD"
          value-format="YYYY-MM-DD"

      />
      &nbsp;
      <el-button type="primary">查询</el-button>
      </el-row>
    </div>
      <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>
    </el-header>

    <vxe-grid
        max-height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
        :checkbox-config="checkBoxConfig"

    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -316,6 +301,23 @@
        </div>
      </template>

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

      <template #pager>
        <!--使用 pager 插槽-->
        <vxe-pager
            @page-change="handlePageChange"
            :layouts="[  'PrevPage', 'Jump','PageCount', 'NextPage',  '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>
  </div>

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

@@ -101,13 +101,12 @@
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {field: 'select',type:'checkbox',title: '选择', width: 80,fixed:"left"},
    {type: 'seq', fixed: "left", title: '自序', width: 50},

    {field: 'reworkTeam', width: 120, title: '返工班组', slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}, editRender: {}},
    {field: 'orderId', width: 120, title: '销售单号', sortable: true, showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'processId', width: 120, title: '流程卡号', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'project', width: 120, title: '项目名称', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'batch', width: 80, title: '批次', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
    {field: 'orderNumber', width: 80, title: '序号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'orderSort', width: 80, title: '序号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'productName', width: 120, title: '单片名称', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'technologyNumber', width: 80, title: '标记', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
    {field: 'glassAddress', width: 90, title: '片标记', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},

 north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue

@@ -31,7 +31,7 @@
  if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
    ruleForm.value.id = Number(str)

    request.post(`/customer/getseletCustomer/1/100`,ruleForm.value).then((res) => {
    request.post(`/customer/getSelectCustomer/1/100`,ruleForm.value).then((res) => {
      if(res.code==200){
        ruleForm.value=deepClone(res.data.data[0])


 north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue

@@ -76,7 +76,7 @@
})

//第一次调用
request.post(`/customer/getseletCustomer/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/customer/getSelectCustomer/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -112,7 +112,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/customer/getseletCustomer/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/customer/getSelectCustomer/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -130,7 +130,7 @@
//分页查询
const selectOrderList = ()=>{

  request.post(`/customer/getseletCustomer/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/customer/getSelectCustomer/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      produceList = deepClone(res.data.data)

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -126,7 +126,7 @@
    filterData.value.orderId=orderId
    number.value=orderId
    //第一次调用
    request.post("/Delivery/getseletShippingOrderDetails/1/100",filterData.value).then((res) => {
    request.post("/Delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {

      if(res.code==200){
        pageTotal.value=res.data.total
@@ -172,7 +172,7 @@
  if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
    filterData.value.deliveryDetail.deliveryId=str
    //第一次调用
    request.post("/Delivery/getseletShippingOrderDetail/1/100",filterData.value).then((res) => {
    request.post("/Delivery/getSelectShippingOrderDetail/1/100",filterData.value).then((res) => {

      if(res.code==200){
        pageTotal.value=res.data.total

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -57,7 +57,7 @@
})

//第一次调用
request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    console.log(res.data.data)
@@ -98,7 +98,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -116,7 +116,7 @@


const selectOrderList = ()=>{
  request.post(`/Delivery/getseletShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      produceList = deepClone(res.data.data)

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

@@ -28,23 +28,23 @@

    /*成品库存查询*/
    @ApiOperation("成品库存查询接口")
    @PostMapping("/getselet/{pageNum}/{pageSize}")
    @PostMapping("/getSelect/{pageNum}/{pageSize}")
    public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
        return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
    }

    /*查询可入库的成品数据*/
    @ApiOperation("可入库的成品查询接口")
    @PostMapping("/getseletwarehousing/{pageNum}/{pageSize}")
    public Result getseletwarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
        return Result.seccess(finishedGoodsInventoryService.getseletwarehousing(pageNum,pageSize,flowCard));
    @PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
    public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
        return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
    }

    /*成品入库*/
    @ApiOperation("成品入库接口")
    @PostMapping("/addseletwarehousing")
    public Result addseletwarehousing( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addseletwarehousing(object)){
    @PostMapping("/addSelectWarehousing")
    public Result addSelectWarehousing( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addSelectWarehousing(object)){
            return Result.seccess();
        }else {
           throw new ServiceException(Constants.Code_500,"入库失败");
@@ -54,16 +54,16 @@

    /*查询可发货的成品数据*/
    @ApiOperation("可发货的成品查询接口")
    @PostMapping("/getseletdeliveryDetail/{pageNum}/{pageSize}")
    public Result getseletdeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getseletdeliveryDetail(pageNum,pageSize,orderDetail));
    @PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
    public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
    }

    /*成品发货*/
    @ApiOperation("成品发货接口")
    @PostMapping("/adddeliveryDetail")
    public Result adddeliveryDetail( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.adddeliveryDetail(object)){
    @PostMapping("/addDeliveryDetail")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addDeliveryDetail(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"出库失败");
@@ -94,9 +94,9 @@

    /*调拨记录查询*/
    @ApiOperation("调拨记录查询接口")
    @PostMapping("/getselectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
    public Result getselectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getselectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
    @PostMapping("/getSelectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
    }

    /*订单领出*/
@@ -151,8 +151,8 @@
    }
    /*订单反审*/
    @ApiOperation("订单反审接口")
    @PostMapping("/updateFinishedGoodsInventoryCounterexamination")
    public Result updateFinishedGoodsInventoryCounterexamination( @RequestBody Map<String,Object>  object){
    @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
    public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object>  object){

        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"反审")){
            return Result.seccess();

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

New file
@@ -0,0 +1,65 @@
package com.example.erp.controller.pp;

import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.Rework;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReplenishService;
import com.example.erp.service.pp.ReworkService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

@RestController
@RequestMapping("/Replenish")
public class ReplenishController {

    @Autowired
    ReplenishService replenishService;



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

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


    @ApiOperation("补片新增接口")
    @PostMapping("/saveReplenish")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(replenishService.saveReplenish(object)){

            return Result.seccess();

        }else {
            throw new ServiceException(Constants.Code_500,"返工失败");

        }
    }

    @ApiOperation("订单调拨接口")
    @PostMapping("/updateReplenish")
    public Result updateReplenish( @RequestBody Map<String,Object> object){
        if(replenishService.updateReplenish(object)){

            return Result.seccess();

        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");

        }
    }
}

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

@@ -24,20 +24,20 @@


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

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


    @ApiOperation("订单调拨接口")
    @ApiOperation("返工接口")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(reworkService.saveRework(object)){
@@ -50,7 +50,7 @@
        }
    }

    @ApiOperation("订单调拨接口")
    @ApiOperation("审核接口")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        if(reworkService.updateRework(object)){

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

@@ -28,9 +28,9 @@

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

    @ApiOperation("客户新增修改接口")

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

@@ -28,16 +28,16 @@

    /*发货订单查询*/
    @ApiOperation("发货订单查询接口")
    @PostMapping("/getseletShippingOrder/{pageNum}/{pageSize}/{selectDate}")
    public Result getseletShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery){
        return Result.seccess(deliveryService.getseletShippingOrder(pageNum,pageSize,selectDate,delivery));
    @PostMapping("/getSelectShippingOrder/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery){
        return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
    }

    /*发货订单明细查询*/
    @ApiOperation("发货编辑订单明细查询接口")
    @PostMapping("/getseletShippingOrderDetail/{pageNum}/{pageSize}")
    public Result getseletShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getseletShippingOrderDetail(pageNum,pageSize,orderDetail));
    @PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
    public Result getSelectShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
    }

    /*库存可发货订单查询*/
@@ -49,9 +49,9 @@

    /*发货订单明细查询*/
    @ApiOperation("发货新增订单明细查询接口")
    @PostMapping("/getseletShippingOrderDetails/{pageNum}/{pageSize}")
    public Result getseletShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getseletShippingOrderDetails(pageNum,pageSize,orderDetail));
    @PostMapping("/getSelectShippingOrderDetails/{pageNum}/{pageSize}")
    public Result getSelectShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
    }
    @ApiOperation("发货新增接口")
    @PostMapping("/insertDelivery")

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

@@ -43,4 +43,6 @@
    private Integer patchStatus;
    //质检状态
    private Integer qualityInsStatus;
    //数量
    private Integer quantity;
}

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

New file
@@ -0,0 +1,47 @@
package com.example.erp.entity.pp;

import lombok.Data;

import java.time.LocalDate;

@Data
public class PatchLog {
    //自增id
    private Long id;
    //补片编号
    private String patchId;
    //流程卡号
    private String processId;
    //补片类型
    private String patchType;
    //补片原因
    private String patchReason;
    //补片工序
    private String patchProcesses;
    //补片数量
    private Integer patchNum;
    //补片面积
    private Double patchArea;
    //补片班组
    private String patchTeam;
    //审核人
    private String reviewer;
    //审核状态
    private Integer reviewStatus;
    //创建时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

    private String orderId;
    private String responsiblePersonnel;
    private String orderSort;
    private Integer technologyNumber;
    private String responsibleTeam;
    private String qualityInspector;
    private String responsibleEquipment;
    private String reportingWorkId;

    //外键流程卡表
    private FlowCard flowCard;
}

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

@@ -6,7 +6,7 @@
@Data
public class Rework {
    //自增id
    private Integer id;
    private Long id;
    //返工编号
    private String reworkId;
    //流程卡号

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -24,11 +24,11 @@

    Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);

    List<FlowCard> getseletwarehousing(@Param("offset") Integer offset,
    List<FlowCard> getSelectWarehousing(@Param("offset") Integer offset,
                                       @Param("pageSize") Integer pageSize,
                                       @Param("flowCard") FlowCard flowCard);

    Map<String,Integer> getseletwarehousingPageTotal(Integer offset, Integer pageSize,FlowCard flowCard);
    Map<String,Integer> getSelectWarehousingPageTotal(Integer offset, Integer pageSize,FlowCard flowCard);

    Integer findOrderNumberdcount(@Param("orderId") String orderId,
                                  @Param("orderNumber") Integer orderNumber);
@@ -73,11 +73,11 @@
                                         @Param("remark") String remark);


    List<OrderDetail> getseletdeliveryDetail(@Param("offset") Integer offset,
    List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,
                                                      @Param("pageSize") Integer pageSize,
                                                      @Param("orderDetail") OrderDetail orderDetail);

    Map<String,Integer> getseletdeliveryDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
    Map<String,Integer> getSelectDeliveryDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);

    List<OrderDetail> getSelectAllocate(@Param("offset") Integer offset,
                                        @Param("pageSize") Integer pageSize,

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

New file
@@ -0,0 +1,33 @@
package com.example.erp.mapper.pp;

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

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

@Mapper
public interface PatchLogMapper {

    List<Map<String,Object>> SelectReplenish(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);

    Map<String,Integer> SelectReplenishPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);




    Integer getMaximum();

    Boolean insertReplenish(@Param("patchLog") PatchLog patchLog , @Param("oddNumber") String oddNumber);

    Boolean updateDamageDetails(@Param("patchLog") PatchLog patchLog);

    Boolean updateReplenish(@Param("patchLog") PatchLog patchLog ,  @Param("userName") String userName);

    List<Map<String,Object>> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);


}


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

@@ -24,8 +24,12 @@

    Boolean insertRework(@Param("rework") Rework rework ,  @Param("oddNumber") String oddNumber);

    Boolean updateReportingWorkDetail(@Param("rework") Rework rework);
    Boolean updateDamageDetails(@Param("rework") Rework rework);

    Boolean updateRework(@Param("rework") Rework rework ,  @Param("userName") String userName);

    List<Map<String,Object>> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);

    Integer getMaxFlowCard(@Param("processId") String processId);
}


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

@@ -13,12 +13,12 @@
public interface CustomerMapper extends CrudRepository<Customer,Long> {

    List<Customer> getCustomerList();
    List<Customer> getseletCustomer(@Param("offset") Integer offset,
    List<Customer> getSelectCustomer(@Param("offset") Integer offset,
                                         @Param("pageSize") Integer pageSize,
                                         @Param("customer") Customer customer);


    Map<String,Integer> getseletCustomerPageTotal(Integer offset, Integer pageSize, Customer customer);
    Map<String,Integer> getSelectCustomerPageTotal(Integer offset, Integer pageSize, Customer customer);

    Boolean insertCustomer(@Param("customer") Customer customer);


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

@@ -13,15 +13,15 @@
@Mapper
public interface DeliveryDetailMapper extends CrudRepository<DeliveryDetail,Long> {

    List<DeliveryDetail> getseletShippingOrderDetail(@Param("offset") Integer offset,
    List<DeliveryDetail> getSelectShippingOrderDetail(@Param("offset") Integer offset,
                                                      @Param("pageSize") Integer pageSize,
                                                      @Param("orderDetail") OrderDetail orderDetail);



    Integer getseletShippingOrderDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
    Integer getSelectShippingOrderDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);

    List<DeliveryDetail> getseletShippingOrderDetails(@Param("offset") Integer offset,
    List<DeliveryDetail> getSelectShippingOrderDetails(@Param("offset") Integer offset,
                                                     @Param("pageSize") Integer pageSize,
                                                     @Param("orderDetail") OrderDetail orderDetail);

@@ -29,7 +29,7 @@



    Integer getseletShippingOrderDetailsPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
    Integer getSelectShippingOrderDetailsPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);

    Boolean insertDeliveryDetail(@Param("orderDetail") OrderDetail orderDetail, @Param("number") String number,@Param("deliveryNumber") Integer deliveryNumber);


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

@@ -15,18 +15,18 @@
@Mapper
public interface DeliveryMapper extends CrudRepository<Delivery,Long> {

    List<Delivery> getseletShippingOrder(@Param("offset") Integer offset,
    List<Delivery> getSelectShippingOrder(@Param("offset") Integer offset,
                                                      @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                      @Param("delivery") Delivery delivery);

   Delivery getseletShippingOrderDetaildelivery(@Param("offset") Integer offset,
   Delivery getSelectShippingOrderDetailDelivery(@Param("offset") Integer offset,
                                                             @Param("pageSize") Integer pageSize,
                                                             @Param("orderDetail") OrderDetail orderDetail);

    Order getseletShippingOrderDetaildeliverys(@Param("offset") Integer offset,
    Order getSelectShippingOrderDetailDeliverys(@Param("offset") Integer offset,
                                                 @Param("pageSize") Integer pageSize,
                                                 @Param("orderDetail") OrderDetail orderDetail);
    Map<String,Integer> getseletShippingOrderPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Delivery delivery);
    Map<String,Integer> getSelectShippingOrderPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Delivery delivery);

    List<Order> getSelectOrderInventory(@Param("offset") Integer offset,
                                        @Param("pageSize") Integer pageSize,String startDate, String endDate,

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -44,36 +44,37 @@
        return map;
    }

    public Map<String, Object> getseletwarehousing(Integer pageNum, Integer pageSize, FlowCard flowCard) {
    public Map<String, Object> getSelectWarehousing(Integer pageNum, Integer pageSize, FlowCard flowCard) {
        Integer offset = (pageNum - 1) * pageSize;
        Map<String, Object> map = new HashMap<>();
        map.put("data", finishedGoodsInventoryMapper.getseletwarehousing(offset, pageSize, flowCard));
        map.put("total", finishedGoodsInventoryMapper.getseletwarehousingPageTotal(offset, pageSize, flowCard));
        map.put("data", finishedGoodsInventoryMapper.getSelectWarehousing(offset, pageSize, flowCard));
        map.put("total", finishedGoodsInventoryMapper.getSelectWarehousingPageTotal(offset, pageSize, flowCard));

        return map;
    }

    public Boolean addseletwarehousing(Map<String,Object> object) {
        Boolean isinsert=false;
    public Boolean addSelectWarehousing(Map<String,Object> object) {
        boolean saveState = true;
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            //定义前端传输的数据
            String storageRegion = "";
            String remark = "";
            if (object.get("remark") != null) {
                remark = object.get("remark").toString();
            }
            if (object.get("storageRegion") != null) {
                storageRegion = object.get("storageRegion").toString();
            }

        //定义前端传输的数据
        String storageRegion = "";
        String remark = "";
        if (object.get("remark") != null) {
            remark = object.get("remark").toString();
        }
        if (object.get("storageRegion") != null) {
            storageRegion = object.get("storageRegion").toString();
        }

        String userName = "";
        String userId = "";
        if (object.get("userName") != null) {
            userName = object.get("userName").toString();
        }
        if (object.get("userId") != null) {
            userId = object.get("userId").toString();
        }
            String userName = "";
            String userId = "";
            if (object.get("userName") != null) {
                userName = object.get("userName").toString();
            }
            if (object.get("userId") != null) {
                userId = object.get("userId").toString();
            }

            //获取对象集合循环进行新增修改
            List<FlowCard> flowCardlist = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowcard")), FlowCard.class);
@@ -100,7 +101,6 @@
                            //修改订单表入库状态
                            finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),2);
                        }
                        isinsert=true;
                    } else {
                        if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark)) {
                            //修改流程卡表入库数量
@@ -109,32 +109,40 @@
                            finishedGoodsInventoryMapper.updateIntOrderNumberConut(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),flowCard.getInventoryQuantity());
                            //修改订单表入库状态
                            finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),1);
                            isinsert=true;
                        } else {
                            isinsert= false;

                        }
                    }
                }
                return isinsert;
            }else{
                return false;
            }

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }

        return saveState;

    }


    public Map<String, Object> getseletdeliveryDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
    public Map<String, Object> getSelectDeliveryDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
        Integer offset = (pageNum - 1) * pageSize;
        Map<String, Object> map = new HashMap<>();
        map.put("data", finishedGoodsInventoryMapper.getseletdeliveryDetail(offset, pageSize, orderDetail));
        map.put("total", finishedGoodsInventoryMapper.getseletdeliveryDetailPageTotal(offset, pageSize, orderDetail));
        map.put("data", finishedGoodsInventoryMapper.getSelectDeliveryDetail(offset, pageSize, orderDetail));
        map.put("total", finishedGoodsInventoryMapper.getSelectDeliveryDetailPageTotal(offset, pageSize, orderDetail));
        return map;
    }


    public Boolean adddeliveryDetail(Map<String,Object> object) {
    public Boolean addDeliveryDetail(Map<String,Object> object) {
        boolean saveState = true;
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -282,7 +290,7 @@

    }

    public Map<String, Object> getselectAllocateFinishedOperateLog(Integer pageNum, Integer pageSize,List<String> selectDate, FinishedOperateLog finishedOperateLog) {
    public Map<String, Object> getSelectAllocateFinishedOperateLog(Integer pageNum, Integer pageSize,List<String> selectDate, FinishedOperateLog finishedOperateLog) {
        Integer offset = (pageNum - 1) * pageSize;

        String endDate = LocalDate.now().toString();

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

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

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.PatchLogMapper;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;


@Service
@DS("pp")
public class ReplenishService {
    @Autowired
    PatchLogMapper patchMapper;

    @Autowired
    SysErrorService sysErrorService;


    public List<Map<String, Object>> getSelectReplenish(Integer pageNum, Integer pageSize) {
        Integer offset = (pageNum - 1) * pageSize;
        return patchMapper.getSelectReplenish(offset,pageSize);

    }

    public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize,List<String> selectDate,PatchLog patchLog) {
        Integer offset = (pageNum-1)*pageSize;
        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",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLog));
        map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLog));

        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate",list);
        return map;
    }

    public Boolean saveReplenish(Map<String,Object> object) {
        boolean saveState = true;
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            String userName = "";
            String userId = "";
            if (object.get("userName") != null) {
                userName = object.get("userName").toString();
            }
            if (object.get("userId") != null) {
                userId = object.get("userId").toString();
            }
            String oddNumber=orderNumberSetting("补片");
            //获取对象集合循环进行新增修改
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    //添加返工记录，修改次破明细数量
                    patchMapper.insertReplenish(patchLog,oddNumber);
                    patchMapper.updateDamageDetails(patchLog);
                }
            }

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }

        return saveState;

    }

    public Boolean updateReplenish(Map<String,Object> object) {
        boolean saveState = true;

        String userName = "";
        String userId = "";
        if (object.get("userName") != null) {
            userName = object.get("userName").toString();
        }
        if (object.get("userId") != null) {
            userId = object.get("userId").toString();
        }
        //获取对象集合循环进行新增修改
        List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
        if (!patchLoglist.isEmpty()){
            for (PatchLog patchLog : patchLoglist) {
                //审核
                patchMapper.updateReplenish(patchLog,userName);
            }
        }


        return saveState;

    }

    public String orderNumberSetting(String type) {
        //根据类型自动生成不同的操作单号
        String alias="";
        if(Objects.equals(type, "补片")){
            alias="BP";
        }
        //查询当天的最大数量
        Integer maximum=patchMapper.getMaximum();
        //设置两位不够补0
        String formattedNumber = String.format("%02d", maximum+1);
        //格式化当前日期
        Date currentDate = new Date();
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
        String formattedDate = dateFormat.format(currentDate);
        String oddNumbers =  alias+formattedDate+formattedNumber;
        return oddNumbers;
    }




}


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

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.OrderDetail;
@@ -79,8 +80,8 @@

    public Boolean saveRework(Map<String,Object> object) {
        boolean saveState = true;


        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            String userName = "";
            String userId = "";
            if (object.get("userName") != null) {
@@ -89,18 +90,28 @@
            if (object.get("userId") != null) {
                userId = object.get("userId").toString();
            }
            //获取单号
            String oddNumber= orderNumberSetting("返工");
            //获取对象集合循环进行新增修改
            List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
            if (!reworklist.isEmpty()){
                for (Rework rework : reworklist) {
                    //获取单号
                    String oddNumber= orderNumberSetting("返工");
                    //添加出入库记录
                    //添加返工记录，修改次破明细数量
                    reworkMapper.insertRework(rework,oddNumber);
                    reworkMapper.updateReportingWorkDetail(rework);
                    reworkMapper.updateDamageDetails(rework);
                }
            }

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

        }

        return saveState;


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

@@ -27,12 +27,12 @@
    SysErrorService sysErrorService;


    public Map<String, Object> getseletCustomer(Integer pageNum, Integer pageSize, Customer customer) {
    public Map<String, Object> getSelectCustomer(Integer pageNum, Integer pageSize, Customer customer) {
        Integer offset = (pageNum - 1) * pageSize;

        Map<String, Object> map = new HashMap<>();
        map.put("data", customerMapper.getseletCustomer(offset, pageSize, customer));
        map.put("total", customerMapper.getseletCustomerPageTotal(offset, pageSize, customer));
        map.put("data", customerMapper.getSelectCustomer(offset, pageSize, customer));
        map.put("total", customerMapper.getSelectCustomerPageTotal(offset, pageSize, customer));
        return map;
    }


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

@@ -41,7 +41,7 @@
    SysErrorService sysErrorService;


    public Map<String, Object> getseletShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) {
    public Map<String, Object> getSelectShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) {
        Integer offset = (pageNum - 1) * pageSize;
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
@@ -54,8 +54,8 @@
            }
        }
        Map<String, Object> map = new HashMap<>();
        map.put("data", deliveryMapper.getseletShippingOrder(offset, pageSize,startDate,endDate, delivery));
        map.put("total", deliveryMapper.getseletShippingOrderPageTotal(offset, pageSize,startDate,endDate, delivery));
        map.put("data", deliveryMapper.getSelectShippingOrder(offset, pageSize,startDate,endDate, delivery));
        map.put("total", deliveryMapper.getSelectShippingOrderPageTotal(offset, pageSize,startDate,endDate, delivery));
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
@@ -63,13 +63,13 @@
        return map;
    }

    public Map<String, Object> getseletShippingOrderDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
    public Map<String, Object> getSelectShippingOrderDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
        Integer offset = (pageNum - 1) * pageSize;

        Map<String, Object> map = new HashMap<>();
        map.put("data", deliveryDetailMapper.getseletShippingOrderDetail(offset, pageSize, orderDetail));
        map.put("delivery", deliveryMapper.getseletShippingOrderDetaildelivery(offset, pageSize, orderDetail));
        map.put("total", deliveryDetailMapper.getseletShippingOrderDetailPageTotal(offset, pageSize, orderDetail));
        map.put("data", deliveryDetailMapper.getSelectShippingOrderDetail(offset, pageSize, orderDetail));
        map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDelivery(offset, pageSize, orderDetail));
        map.put("total", deliveryDetailMapper.getSelectShippingOrderDetailPageTotal(offset, pageSize, orderDetail));

        return map;
    }
@@ -96,12 +96,12 @@
        return map;
    }

    public Map<String, Object> getseletShippingOrderDetails(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
    public Map<String, Object> getSelectShippingOrderDetails(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
        Integer offset = (pageNum - 1) * pageSize;
        Map<String, Object> map = new HashMap<>();
        map.put("data", deliveryDetailMapper.getseletShippingOrderDetails(offset, pageSize, orderDetail));
        map.put("title", deliveryMapper.getseletShippingOrderDetaildeliverys(offset, pageSize, orderDetail));
        map.put("total", deliveryDetailMapper.getseletShippingOrderDetailsPageTotal(offset, pageSize, orderDetail));
        map.put("data", deliveryDetailMapper.getSelectShippingOrderDetails(offset, pageSize, orderDetail));
        map.put("title", deliveryMapper.getSelectShippingOrderDetailDeliverys(offset, pageSize, orderDetail));
        map.put("total", deliveryDetailMapper.getSelectShippingOrderDetailsPageTotal(offset, pageSize, orderDetail));
        return map;
    }


 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -276,7 +276,7 @@
    </update>


    <select id="getseletdeliveryDetailPageTotal"  >
    <select id="getSelectDeliveryDetailPageTotal"  >
        select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
        count(dd.id) as 'total'
        from sd.delivery_detail dd
@@ -339,7 +339,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletdeliveryDetail"  resultMap="selectDelivery">
    <select id="getSelectDeliveryDetail"  resultMap="selectDelivery">
        select dd.delivery_id,
               dd.order_number,
               dd.order_id,
@@ -467,7 +467,7 @@

    <update id="updateflowcard">
        update pp.flow_card
        set received_quantity=received_quantity+${inventoryQuantity}
        set received_quantity=received_quantity+${inventoryQuantity},storage_time=now()
        where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId}
    </update>

@@ -522,7 +522,7 @@
    </select>


    <select id="getseletwarehousing" resultMap="selectFlowCard">
    <select id="getSelectWarehousing" resultMap="selectFlowCard">
        select
        fc.id,
        o.order_id,
@@ -594,7 +594,8 @@
        group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time
        limit #{offset},#{pageSize};
    </select>
    <select id="getseletwarehousingPageTotal" >
    <select id="getSelectWarehousingPageTotal" >
        select
        CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
        count(zu.order_number) as 'total' from (
        select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on

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

New file
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--返工数据-->

<mapper namespace="com.example.erp.mapper.pp.PatchLogMapper">



    <!--获取补片数据-->
    <select id="SelectReplenish" >
        select
        r.id,
        r.review_status,
        r.reporting_work_id,
        r.patch_id,
        r.process_id,
        r.order_id,
        r.order_sort,
        o.project,
        o.batch,
        od.building_number,
        od.product_name,
        ogd.technology_number,
        ogd.glass_address,
        r.patch_num,
        od.width,
        od.height,
        od.shape,
        r.patch_type,
        r.patch_reason,
        r.responsible_team,
        r.responsible_personnel,
        r.responsible_equipment,
        r.patch_area,
        r.quality_inspector,
        r.patch_processes,
        r.reviewer,
        date(r.create_time) as create_time,
        date(r.update_time) as update_time
        from pp.patch_log r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
        left join sd.`order` o on r.order_id = o.order_id
        left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
        on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
        </where>
         order by r.review_status
        limit #{offset},#{pageSize};
    </select>

    <select id="SelectReplenishPageTotal" >
        select CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
        count(zu.id) as 'total'
        from (select r.id as id
        from pp.patch_log r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
        left join sd.`order` o on r.order_id = o.order_id
        left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
        on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
        </where>
              ) as zu
        limit #{offset},#{pageSize};
    </select>




    <select id="getMaximum" >
        select count(*) from pp.patch_log where  date(create_time)=CURDATE()
    </select>


    <insert id="insertReplenish"  useGeneratedKeys="true" >
        insert into pp.patch_log(patch_id,reporting_work_id,process_id,order_id, order_sort, technology_number, responsible_team,
                              responsible_personnel, patch_type, patch_reason, patch_processes, patch_num,
                                 patch_area,responsible_equipment,quality_inspector, reviewer, review_status, create_time)
        values (
                   #{oddNumber}, #{patchLog.reportingWorkId},#{patchLog.processId},#{patchLog.orderId},#{patchLog.orderSort},#{patchLog.technologyNumber},
                #{patchLog.responsibleTeam},#{patchLog.responsiblePersonnel},#{patchLog.patchType},#{patchLog.patchReason},
                #{patchLog.patchProcesses},#{patchLog.patchNum},#{patchLog.patchArea},#{patchLog.responsibleEquipment},#{patchLog.qualityInspector},"",0,now()
               )
    </insert>

    <update id="updateReplenish"  >
        update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
    </update>

    <update id="updateDamageDetails"  >
        update pp.damage_details set quantity=quantity+#{patchLog.patchNum},patch_status=1 where id=#{patchLog.reviewer}
    </update>


    <select id="getSelectReplenish">
        select date(rw.reporting_work_time) as reportingWorkTime,
               o.order_id as orderId,
               dd.reporting_work_id as reportingWorkId,
               rw.production_id as productionId,
               rw.process_id as processId,
               o.project,
               o.batch,
               dd.id as reviewer,
               od.building_number as buildingNumber,
               dd.order_number as orderSort,
               od.product_name as productName,
               dd.technology_number as technologyNumber,
               ogd.glass_address as glassAddress,
               dd.breakage_quantity-dd.quantity as patchNum,
               od.width,
               od.height,
               od.shape,
               dd.breakage_quantity-dd.quantity as breakageQuantity,
               dd.return_process as patchProcesses,
               dd.breakage_reason as patchReason,
               dd.breakage_type as patchType,
               dd.responsible_personnel as responsiblePersonnel,
               dd.responsible_equipment as responsibleEquipment,
               dd.responsible_team as responsibleTeam,
               ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as patchArea,
               rw.qualityIns_pector as qualityInsPector
        from pp.damage_details dd
                 left join    pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number  and dd.technology_number=rwd.technology_number
                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id

                 left join sd.`order` o on rw.order_id = o.order_id
                 left join sd.order_detail od on rw.order_id = od.order_id and dd.order_number = od.order_number
                 left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=0

    </select>


</mapper>

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

@@ -11,6 +11,7 @@
    <!--获取返工数据-->
    <select id="SelectRework" >
        select
        r.id,
        r.review_status,
        r.rework_team,
        r.rework_id,
@@ -66,36 +67,39 @@

    <select id="getSelectRework">
        select o.order_id as orderId,
               rwd.reporting_work_id as reportingWorkId,
               dd.reporting_work_id as reportingWorkId,
               rw.process_id as processId,
               o.project,
               o.batch,
               rwd.order_number as orderSort,
               dd.id as reviewer,
               dd.order_number as orderSort,
               od.product_name as productName,
               ogd.technology_number as technologyNumber,
               dd.technology_number as technologyNumber,
               ogd.glass_address as glassAddress,
               rwd.wait_rework_quantity as reworkNum,
               dd.breakage_quantity-dd.quantity as reworkNum,
               od.width,
               od.height,
               od.shape,
               rwd.breakage_quantity as breakageQuantity,
               rwd.return_process as reworkProcesses,
               rwd.breakage_reason as reworkReason,
               rwd.breakage_type as reworkType,
               rwd.responsible_personnel as responsiblePersonnel,
               rwd.responsible_equipment as responsibleEquipment,
               rwd.responsible_team as responsibleTeam,
               ROUND(rwd.wait_rework_quantity * od.width * od.height / 1000000, 2) as reworkArea,
               dd.breakage_quantity-dd.quantity as breakageQuantity,
               dd.return_process as reworkProcesses,
               dd.breakage_reason as reworkReason,
               dd.breakage_type as reworkType,
               dd.responsible_personnel as responsiblePersonnel,
               dd.responsible_equipment as responsibleEquipment,
               dd.responsible_team as responsibleTeam,
               ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
               rw.qualityIns_pector as qualityInsPector
        from pp.reporting_work_detail rwd
                 left join pp.reporting_work rw on rwd.reporting_work_id = rw.reporting_work_id
                 left join sd.`order` o on rw.order_id = o.order_id
                 left join sd.order_detail od on rw.order_id = od.order_id and rwd.order_number = od.order_number
                 left join sd.order_glass_detail ogd
                           on rw.order_id = ogd.order_id and rwd.order_number = ogd.order_number
                            where  rwd.wait_rework_quantity>0
        from pp.damage_details dd
                 left join    pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number  and dd.technology_number=rwd.technology_number
                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id

        group by ogd.order_id, ogd.order_number
                 left join sd.`order` o on rw.order_id = o.order_id
                 left join sd.order_detail od on rw.order_id = od.order_id and dd.order_number = od.order_number
                 left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1

    </select>


@@ -103,8 +107,12 @@
        select count(*) from pp.rework where  date(create_time)=CURDATE()
    </select>

    <select id="getMaxFlowCard" >
        select count(*) from pp.flow_card where project_no=#{processId}
    </select>

    <insert id="insertRework"  useGeneratedKeys="true" >
        insert into pp.rework(rework_id,reporting_work_id, process_id,order_id, order_sort, technology_number, responsible_team,
        insert into pp.rework(rework_id,reporting_work_id,process_id,order_id, order_sort, technology_number, responsible_team,
                              responsible_personnel, rework_type, rework_reason, rework_processes, rework_num,
                              rework_area, rework_team,responsible_equipment,quality_inspector, reviewer, review_status, create_time)
        values (
@@ -115,13 +123,15 @@
    </insert>

    <update id="updateRework"  >
        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.reworkId}
        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.id}
    </update>

    <update id="updateReportingWorkDetail"  >
        update pp.reporting_work_detail set wait_rework_quantity=wait_rework_quantity-#{rework.reworkNum}
            where reporting_work_id=#{rework.reportingWorkId} and order_number=#{rework.orderSort} and technology_number=#{rework.technologyNumber}
    <update id="updateDamageDetails"  >
        update pp.damage_details set quantity=quantity+#{rework.reworkNum} where id=#{rework.reviewer}
    </update>





</mapper>

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

@@ -9,7 +9,7 @@
        from
            sd.customer
    </select>
    <select id="getseletCustomer">
    <select id="getSelectCustomer">
        select
            *
        from
@@ -41,7 +41,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletCustomerPageTotal">
    <select id="getSelectCustomerPageTotal">
        select
            CEILING(count(id)/#{pageSize}) as 'pageTotal',
            count(id) as 'total'

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

@@ -183,7 +183,7 @@

    </select>

    <select id="getseletShippingOrderDetaildelivery" >
    <select id="getSelectShippingOrderDetailDelivery" >
        select
        d.delivery_state,d.stock_state,d.payment_terms,
        d.customer_id,d.customer_name,d.project,d.pay_method,d.pay_date,d.contacts,d.contact_number,
@@ -199,7 +199,7 @@
    </select>


    <select id="getseletShippingOrderDetaildeliverys" >
    <select id="getSelectShippingOrderDetailDeliverys" >
        select customer_id,customer_name,project,salesman,salesman_id,contacts,contact_number,delivery_address from sd.`order`
        <where>
            <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -210,7 +210,7 @@
        limit 0,1
    </select>

    <select id="getseletShippingOrder">
    <select id="getSelectShippingOrder">
        select * from sd.delivery d
        <where>
            date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
@@ -250,7 +250,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletShippingOrderPageTotal">
    <select id="getSelectShippingOrderPageTotal">
        select
            CEILING(count(id)/#{pageSize}) as 'pageTotal',
            count(id) as 'total'

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

@@ -89,7 +89,7 @@



    <select id="getseletShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
    <select id="getSelectShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
        select od.order_id,
               o.batch,
               dd.delivery_number,
@@ -195,7 +195,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletShippingOrderDetailPageTotal">
    <select id="getSelectShippingOrderDetailPageTotal">
        select
            CEILING(count(dd.id)/#{pageSize})
        from sd.delivery_detail dd
@@ -277,7 +277,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
    <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
        select od.order_id,
               od.order_number,
               o.batch,
@@ -370,7 +370,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletShippingOrderDetailsPageTotal">
    <select id="getSelectShippingOrderDetailsPageTotal">
        select
        CEILING(count(od.id)/#{pageSize})
        from sd.order_detail od

 north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml

@@ -276,7 +276,7 @@
    </update>


    <select id="getseletdeliveryDetailPageTotal"  >
    <select id="getSelectDeliveryDetailPageTotal"  >
        select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
        count(dd.id) as 'total'
        from sd.delivery_detail dd
@@ -339,7 +339,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletdeliveryDetail"  resultMap="selectDelivery">
    <select id="getSelectDeliveryDetail"  resultMap="selectDelivery">
        select dd.delivery_id,
               dd.order_number,
               dd.order_id,
@@ -467,7 +467,7 @@

    <update id="updateflowcard">
        update pp.flow_card
        set received_quantity=received_quantity+${inventoryQuantity}
        set received_quantity=received_quantity+${inventoryQuantity},storage_time=now()
        where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId}
    </update>

@@ -522,7 +522,7 @@
    </select>


    <select id="getseletwarehousing" resultMap="selectFlowCard">
    <select id="getSelectWarehousing" resultMap="selectFlowCard">
        select
        fc.id,
        o.order_id,
@@ -594,7 +594,8 @@
        group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time
        limit #{offset},#{pageSize};
    </select>
    <select id="getseletwarehousingPageTotal" >
    <select id="getSelectWarehousingPageTotal" >
        select
        CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
        count(zu.order_number) as 'total' from (
        select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on

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

@@ -11,6 +11,7 @@
    <!--获取返工数据-->
    <select id="SelectRework" >
        select
        r.id,
        r.review_status,
        r.rework_team,
        r.rework_id,
@@ -66,36 +67,39 @@

    <select id="getSelectRework">
        select o.order_id as orderId,
               rwd.reporting_work_id as reportingWorkId,
               dd.reporting_work_id as reportingWorkId,
               rw.process_id as processId,
               o.project,
               o.batch,
               rwd.order_number as orderSort,
               dd.id as reviewer,
               dd.order_number as orderSort,
               od.product_name as productName,
               ogd.technology_number as technologyNumber,
               dd.technology_number as technologyNumber,
               ogd.glass_address as glassAddress,
               rwd.wait_rework_quantity as reworkNum,
               dd.breakage_quantity-dd.quantity as reworkNum,
               od.width,
               od.height,
               od.shape,
               rwd.breakage_quantity as breakageQuantity,
               rwd.return_process as reworkProcesses,
               rwd.breakage_reason as reworkReason,
               rwd.breakage_type as reworkType,
               rwd.responsible_personnel as responsiblePersonnel,
               rwd.responsible_equipment as responsibleEquipment,
               rwd.responsible_team as responsibleTeam,
               ROUND(rwd.wait_rework_quantity * od.width * od.height / 1000000, 2) as reworkArea,
               dd.breakage_quantity-dd.quantity as breakageQuantity,
               dd.return_process as reworkProcesses,
               dd.breakage_reason as reworkReason,
               dd.breakage_type as reworkType,
               dd.responsible_personnel as responsiblePersonnel,
               dd.responsible_equipment as responsibleEquipment,
               dd.responsible_team as responsibleTeam,
               ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
               rw.qualityIns_pector as qualityInsPector
        from pp.reporting_work_detail rwd
                 left join pp.reporting_work rw on rwd.reporting_work_id = rw.reporting_work_id
                 left join sd.`order` o on rw.order_id = o.order_id
                 left join sd.order_detail od on rw.order_id = od.order_id and rwd.order_number = od.order_number
                 left join sd.order_glass_detail ogd
                           on rw.order_id = ogd.order_id and rwd.order_number = ogd.order_number
                            where  rwd.wait_rework_quantity>0
        from pp.damage_details dd
                 left join    pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number  and dd.technology_number=rwd.technology_number
                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id

        group by ogd.order_id, ogd.order_number
                 left join sd.`order` o on rw.order_id = o.order_id
                 left join sd.order_detail od on rw.order_id = od.order_id and dd.order_number = od.order_number
                 left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1

    </select>


@@ -103,8 +107,12 @@
        select count(*) from pp.rework where  date(create_time)=CURDATE()
    </select>

    <select id="getMaxFlowCard" >
        select count(*) from pp.flow_card where project_no=#{processId}
    </select>

    <insert id="insertRework"  useGeneratedKeys="true" >
        insert into pp.rework(rework_id,reporting_work_id, process_id,order_id, order_sort, technology_number, responsible_team,
        insert into pp.rework(rework_id,reporting_work_id,process_id,order_id, order_sort, technology_number, responsible_team,
                              responsible_personnel, rework_type, rework_reason, rework_processes, rework_num,
                              rework_area, rework_team,responsible_equipment,quality_inspector, reviewer, review_status, create_time)
        values (
@@ -115,13 +123,15 @@
    </insert>

    <update id="updateRework"  >
        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.reworkId}
        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.id}
    </update>

    <update id="updateReportingWorkDetail"  >
        update pp.reporting_work_detail set wait_rework_quantity=wait_rework_quantity-#{rework.reworkNum}
            where reporting_work_id=#{rework.reportingWorkId} and order_number=#{rework.orderSort} and technology_number=#{rework.technologyNumber}
    <update id="updateDamageDetails"  >
        update pp.damage_details set quantity=quantity+#{rework.reworkNum} where id=#{rework.reviewer}
    </update>





</mapper>

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

@@ -9,7 +9,7 @@
        from
            sd.customer
    </select>
    <select id="getseletCustomer">
    <select id="getSelectCustomer">
        select
            *
        from
@@ -41,7 +41,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletCustomerPageTotal">
    <select id="getSelectCustomerPageTotal">
        select
            CEILING(count(id)/#{pageSize}) as 'pageTotal',
            count(id) as 'total'

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

@@ -183,7 +183,7 @@

    </select>

    <select id="getseletShippingOrderDetaildelivery" >
    <select id="getSelectShippingOrderDetailDelivery" >
        select
        d.delivery_state,d.stock_state,d.payment_terms,
        d.customer_id,d.customer_name,d.project,d.pay_method,d.pay_date,d.contacts,d.contact_number,
@@ -199,7 +199,7 @@
    </select>


    <select id="getseletShippingOrderDetaildeliverys" >
    <select id="getSelectShippingOrderDetailDeliverys" >
        select customer_id,customer_name,project,salesman,salesman_id,contacts,contact_number,delivery_address from sd.`order`
        <where>
            <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -210,7 +210,7 @@
        limit 0,1
    </select>

    <select id="getseletShippingOrder">
    <select id="getSelectShippingOrder">
        select * from sd.delivery d
        <where>
            date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
@@ -250,7 +250,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletShippingOrderPageTotal">
    <select id="getSelectShippingOrderPageTotal">
        select
            CEILING(count(id)/#{pageSize}) as 'pageTotal',
            count(id) as 'total'

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

@@ -89,7 +89,7 @@



    <select id="getseletShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
    <select id="getSelectShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
        select od.order_id,
               o.batch,
               dd.delivery_number,
@@ -195,7 +195,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletShippingOrderDetailPageTotal">
    <select id="getSelectShippingOrderDetailPageTotal">
        select
            CEILING(count(dd.id)/#{pageSize})
        from sd.delivery_detail dd
@@ -277,7 +277,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
    <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
        select od.order_id,
               od.order_number,
               o.batch,
@@ -370,7 +370,7 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="getseletShippingOrderDetailsPageTotal">
    <select id="getSelectShippingOrderDetailsPageTotal">
        select
        CEILING(count(od.id)/#{pageSize})
        from sd.order_detail od