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

guoyuji

2024-02-02 2d932e208bc78ef9a07aa0ef9a832333b1eb64bb

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

 .idea/jarRepositories.xml

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

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

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

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

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

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

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

    MessageShow(filterData.value);
    return ;

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


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


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

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

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

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

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

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

})

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

})


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

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


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

      </template>

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

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

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

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

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


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

//子组件接收参数

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

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

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

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


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

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


  /*else{

    MessageShow(dateValue);
  }


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


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

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



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

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

})
let filterData = ref({})

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

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

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



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

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


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


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

 north-glass-erp/northglass-erp/vite.config.js

@@ -16,7 +16,7 @@
    }
  }, 
  server: {
    port: 80,//端口号
    port: 81,//端口号
    host: true,//ip地址 或 '0.0.0.0' 或 "loaclhost"
    open: false, //启动后是否自动打开浏览器
    https: false, // 是否开启 https

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

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

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


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

    @Autowired
    ReportWorkService reportWorkService;

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

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

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

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

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

import java.time.LocalDate;

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

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


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

}

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

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


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

import java.util.List;

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

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


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

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

}

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

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

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

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

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

    @Autowired
    ReportingWorkDetailMapper reportingWorkDetailMapper;

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

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



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

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

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

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

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

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

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

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

        </association>

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

        </association>

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

    </resultMap>

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

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

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

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

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

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

        </association>


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

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

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

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

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

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


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



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


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

        <where>

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

            and rework_team is not null

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

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

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


        </where>

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


    <!--<where>

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

        </where>-->

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

</mapper>

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

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

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

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


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


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

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

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

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

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

        </association>

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

        </association>

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

    </resultMap>

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

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

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

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

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

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

        </association>


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

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

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

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

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

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


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



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


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

        <where>

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

            and rework_team is not null

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

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

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


        </where>

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


    <!--<where>

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

        </where>-->

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

</mapper>