添加缺少的流程卡进度界面，建立数据库表对应字段的实体类

chenlu

2024-01-19 f3ff51751c39993c1504fa1158c42cd0bbe7ed14

添加缺少的流程卡进度界面，建立数据库表对应字段的实体类

 north-glass-erp/.idea/dataSources.local.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="dataSourceStorageLocal" created-in="IU-232.9559.62">
  <component name="dataSourceStorageLocal" created-in="IU-232.8660.185">
    <data-source name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
      <database-info product="MySQL" version="8.0.22" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.22" exact-driver-version="8.0">
        <extra-name-characters>#@</extra-name-characters>

 north-glass-erp/.idea/workspace.xml

@@ -5,21 +5,31 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="402214ec-6c93-4a9d-b589-f17dc90f718e" name="更改" comment="11.24提交">
      <change afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/testSort.vue" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProcessCardProgress.vue" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/BaseBom.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/Device.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/FlowCard.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/OrderBom.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/ReportingWork.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/Rework.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/SetupBom.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/WorkprogressMonthlySettlement.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/package-lock.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/package.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/router/index.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/customer/SelectCustomer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/customer/SelectCustomer.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectDelivery.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectDelivery.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectOrderList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectOrderList.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/order/SelectOrder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/order/SelectOrder.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Product.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Product.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Test.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Test.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectDeliveryList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectDeliveryList.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectReturns.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectReturns.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/vite.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/vite.config.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProductionSchedule.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProductionSchedule.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/Report.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/Report.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/TeamOutput.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/TeamOutput.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/WorkInProgress.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/WorkInProgress.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/rework/AddRework.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/rework/AddRework.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/rework/SelectRework.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/rework/SelectRework.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
    </list>
@@ -33,9 +43,9 @@
      <list>
        <option value="Vue Options API Component" />
        <option value="FxmlFile" />
        <option value="Class" />
        <option value="Interface" />
        <option value="Vue Composition API Component" />
        <option value="Class" />
      </list>
    </option>
  </component>
@@ -63,48 +73,48 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/components/pp/processCard&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
    &quot;spring.configuration.checksum&quot;: &quot;def6d90e829e50c63f98c387daecd138&quot;,
    &quot;ts.external.directory.path&quot;: &quot;D:\\file\\IntelliJ IDEA 2023.2.1\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "RequestMappingsPanelOrder0": "0",
    "RequestMappingsPanelOrder1": "1",
    "RequestMappingsPanelWidth0": "75",
    "RequestMappingsPanelWidth1": "75",
    "RunOnceActivity.OpenProjectViewOnStart": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
    "WebServerToolWindowFactoryState": "false",
    "git-widget-placeholder": "master",
    "last_opened_file_path": "D:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/views/pp/report",
    "node.js.detected.package.eslint": "true",
    "node.js.detected.package.tslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "nodejs_package_manager_path": "npm",
    "project.structure.last.edited": "模块",
    "project.structure.proportion": "0.0",
    "project.structure.side.proportion": "0.0",
    "settings.editor.selected.configurable": "preferences.pluginManager",
    "spring.configuration.checksum": "def6d90e829e50c63f98c387daecd138",
    "ts.external.directory.path": "D:\\软件\\IntelliJ IDEA 2023.2\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
    "vue.rearranger.settings.migration": "true"
  },
  &quot;keyToStringList&quot;: {
    &quot;vue.recent.templates&quot;: [
      &quot;Vue Composition API Component&quot;
  "keyToStringList": {
    "vue.recent.templates": [
      "Vue Composition API Component"
    ]
  }
}</component>
}]]></component>
  <component name="RecentsManager">
    <key name="CreateClassDialog.RecentsKey">
      <recent name="com.example.erp.tools" />
      <recent name="com.example.erp.config" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\views\pp\report" />
      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\components\pp\processCard" />
      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\components\pp\workorder" />
      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\views\pp\workOrder" />
      <recent name="D:\Documents\north-glass-erp\src\main\resources\mapper\userInfo" />
      <recent name="D:\projct\document\north-glass-erp\src\main\java\com\example\erp\service\userInfo" />
    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="D:\EPR-Refactoring\north-glass-erp\northglass-erp\src\views" />
@@ -122,7 +132,7 @@
      <command value="length" />
    </option>
  </component>
  <component name="RunManager" selected="Spring Boot.ErpApplication">
  <component name="RunManager" selected="npm.dev">
    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
      <option name="arquillianRunConfiguration">
        <value>
@@ -232,6 +242,9 @@
      <workItem from="1703031064839" duration="55055000" />
      <workItem from="1703463546867" duration="16447000" />
      <workItem from="1703811064202" duration="29032000" />
      <workItem from="1704672037960" duration="1824000" />
      <workItem from="1704931359391" duration="1850000" />
      <workItem from="1705277336625" duration="13043000" />
    </task>
    <task id="LOCAL-00001" summary="第一次推送">
      <option name="closed" value="true" />
@@ -403,13 +416,11 @@
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
          <line>254</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="7" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
          <line>179</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="8" />
        </line-breakpoint>
      </breakpoints>

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

@@ -471,6 +471,12 @@
              component: () => import('../views/pp/report/ProductionSchedule.vue'),
            },
            {
              //流程卡进度
              path: 'processCardProgress',
              name: 'processCardProgress',
              component: () => import('../views/pp/report/ProcessCardProgress.vue'),
            },
            {
              //品质报表
              path: 'qualityReport',
              name: 'qualityReport',

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

@@ -67,13 +67,13 @@
    { type: 'checkbox',fixed:"left", title: '选择', width: 80 },
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {field: '排产编号', title: '排产编号', sortable: true, width: 120 },
    {field: '销售单号', title: '销售单号',slots: { filter: 'num1_filter' }, sortable: true, width: 100 },
    {field: '客户名称', title: '客户名称', sortable: true, width: 110},
    {field: '项目名称', title: '项目名称', sortable: true , width: 100},
    {field: '销售单号', title: '销售单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 100 },
    {field: '客户名称', title: '客户名称', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 110},
    {field: '项目名称', title: '项目名称', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 120},
    {field: '序号', title: '序号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90},
    {field: '产品名称', title: '产品名称', sortable: true, width: 140},
    {field: '宽', title: '宽', sortable: true , width: 70},
    {field: '高', title: '高', sortable: true , width: 70},
    {field: '产品名称', title: '产品名称', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 140},
    {field: '宽', title: '宽', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 90},
    {field: '高', title: '高',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true , width: 90},
    {field: '数量', title: '数量', sortable: true , width: 70},
    {field: '面积', title: '面积', sortable: true , width: 90},
    {field: '排产数量' , width: 120,editRender: { name: 'input', attrs: { placeholder: '' } }, title: '排产数量', sortable: true},

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

@@ -68,7 +68,7 @@
    {field: '流程卡号', width: 120, title: '流程卡号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '产品编号', title: '产品编号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '产品名称', title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '项目名称', title: '项目名称', sortable: true,showOverflow:"ellipsis"},
    {field: '项目名称', title: '项目名称', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '总数量', title: '总数量', sortable: true},
    {field: '总面积', title: '总面积', sortable: true},
    {field: '分箱数', title: '分箱数', sortable: true,showOverflow:"ellipsis"},

 north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue

@@ -69,7 +69,7 @@
    {field: '4',width: 120, title: '数量',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '5', width: 100,title: '面积', sortable: true,showOverflow:"ellipsis"},
    {field: '6', width: 100,title: '订单交接时间', sortable: true},
    {field: '7',width: 100, title: '销售单号', sortable: true},
    {field: '7',width: 100, title: '销售单号', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '8',width: 120, title: '开始切割时间', sortable: true,showOverflow:"ellipsis"},
    {field: '9', width: 120,title: '流转工序', sortable: true},
    {field: '10', width: 120,title: '完工数量', sortable: true},

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

New file
@@ -0,0 +1,245 @@
<script setup>

import {reactive, ref} 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
    }
  }
}

//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

//子组件接收参数

const gridOptions = reactive({
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true },//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {field: '1', width: 150, title: '产品名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: '2',width: 130, title: '单片名称', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '3', width: 120,title: '订单类型', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '4',width: 110, title: '流程卡号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '5', width: 90,title: '标记', sortable: true,showOverflow:"ellipsis"},
    {field: '6', width: 90,title: '数量', sortable: true},
    {field: '7',width: 90, title: '次破数量', sortable: true},
    {field: '8',width: 120, title: '切割', sortable: true},
    {field: '9',width: 120, title: '磨边', sortable: true},
    {field: '10',width: 120, title: '钢化', sortable: true},
    {field: '11',width: 120, title: '入库面积', sortable: true},
  ],//表头按钮

  toolbarConfig: {
    // buttons: [{
    //
    // }],
    import: false,
    export: true,
    print: true,
    zoom: true,
    custom: true
  },
  data:  [
    {
      1:'10mm超白UD60平钢(外)+12Ar(结)+10mm超白平钢+12Ar(结)+10mm超白平钢(内)',
      2:'10mm超白UD60平钢(外)',
      3:'普通订单',
      4:'NG23052602A01/1',
      5:'1',
      6:'33',
      7:'1',
      8:'22',
      9:'22',
      10:'22',
      11:'314.13',
    },
    {
      1:'10mm超白UD60平钢(外)+12Ar(结)+10mm超白平钢+12Ar(结)+10mm超白平钢(内)',
      2:'10mm超白平钢+12Ar(结)',
      3:'普通订单',
      4:'NG23052602A01/2',
      5:'2',
      6:'33',
      7:'1',
      8:'22',
      9:'22',
      10:'22',
      11:'314.13',
    },
    {
      1:'10mm超白UD60平钢(外)+12Ar(结)+10mm超白平钢+12Ar(结)+10mm超白平钢(内)',
      2:'10mm超白平钢(内)',
      3:'普通订单',
      4:'NG23052602A01/3',
      5:'3',
      6:'33',
      7:'1',
      8:'22',
      9:'22',
      10:'22',
      11:'314.13',
    },
  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['7','8','9','10']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        }
        return ''
      })
    ]
  }

})

const value = ref('')
const options = [
  {
    value: 'Option1',
    label: 'Option1',
  },
  {
    value: 'Option2',
    label: 'Option2',
  },
  {
    value: 'Option3',
    label: 'Option3',
  },
]

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

})

const mergeCells = ref([
  { row: 0, col: 1, rowspan: 3, colspan: 0},
  { row: 3, col: 1, rowspan: 3, colspan: 0},

  { row: 0, col: 6, rowspan: 3, colspan: 0},
  { row: 3, col: 6, rowspan: 3, colspan: 0},

])

</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>
        &nbsp;&nbsp;
        <el-button type="primary">查询</el-button>
      </el-row>

    </div>
    <vxe-grid
        max-height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        :merge-cells="mergeCells"

    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <!--      下拉显示所有信息插槽-->
      <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>
            <span>{{ row[item.field] }}</span>
          </li>
        </ul>
      </template>

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

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>


    </vxe-grid>
  </div>
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
}
#selectForm {
  width: 60%;
  text-align: center;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue

@@ -62,7 +62,6 @@
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {field: '1', width: 100, title: '序号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: '2',width: 120, title: '楼层编号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '3', width: 100,title: '形状', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -217,7 +216,7 @@
  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['7','11','12','13','14','15','16','17','18']
    let footList=['11','12','13','14','15','16','17','18']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
@@ -262,6 +261,9 @@
})

const mergeCells = ref([
  { row: 0, col: 1, rowspan: 3, colspan: 0},
  { row: 3, col: 1, rowspan: 3, colspan: 0},

  { row: 0, col: 2, rowspan: 3, colspan: 0},
  { row: 3, col: 2, rowspan: 3, colspan: 0},

@@ -271,11 +273,8 @@
  { row: 0, col: 4, rowspan: 3, colspan: 0},
  { row: 3, col: 4, rowspan: 3, colspan: 0},

  { row: 0, col: 5, rowspan: 3, colspan: 0},
  { row: 3, col: 5, rowspan: 3, colspan: 0},

  { row: 0, col: 8, rowspan: 3, colspan: 0},
  { row: 3, col: 8, rowspan: 3, colspan: 0},

])

</script>

 north-glass-erp/northglass-erp/src/views/pp/report/Report.vue

@@ -49,6 +49,7 @@
          <el-menu-item index="/main/report/WorkInProgress">在制品报表</el-menu-item>
          <el-menu-item index="/main/report/ProcessToBeCompleted">工序待完成</el-menu-item>
          <el-menu-item index="/main/report/ProductionSchedule">生产发货进度</el-menu-item>
          <el-menu-item index="/main/report/ProcessCardProgress">流程卡进度</el-menu-item>
          <el-menu-item index="/main/report/OrderPlanDecomposition">订单计划分解</el-menu-item>
        </el-sub-menu>
        <el-sub-menu  index="2" popper-class="test">

 north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue

@@ -67,7 +67,7 @@
    {field: '2',width: 100, title: '序号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '3', width: 100,title: '落架顺序', sortable: true,},
    {field: '4',width: 120, title: '项目名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '5', width: 100,title: '批次', sortable: true,showOverflow:"ellipsis"},
    {field: '5', width: 100,title: '批次', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '6', width: 100,title: '楼层编号', sortable: true},
    {field: '7',width: 90, title: '宽', sortable: true},
    {field: '8',width: 90, title: '高', sortable: true,showOverflow:"ellipsis"},

 north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue

@@ -67,7 +67,7 @@
    {field: '2',width: 120, title: '工序', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '3', width: 130,title: '班组名称', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '4',width: 120, title: '项目名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '5', width: 100,title: '流程卡号', sortable: true,showOverflow:"ellipsis"},
    {field: '5', width: 100,title: '流程卡号', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '6', width: 100,title: '产品大类', sortable: true},
    {field: '7',width: 100, title: '产品小类', sortable: true},
    {field: '8',width: 120, title: '在制品名称', sortable: true,showOverflow:"ellipsis"},

 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue

@@ -67,7 +67,7 @@
    {field: '2',width: 120, title: '流程卡号', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '3', width: 130,title: '客户名称', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: '4',width: 120, title: '项目名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '5', width: 100,title: '批次', sortable: true,showOverflow:"ellipsis"},
    {field: '5', width: 100,title: '批次', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '6', width: 100,title: '序号', sortable: true},
    {field: '7',width: 100, title: '形状', sortable: true},
    {field: '8',width: 120, title: '楼层编号', sortable: true,showOverflow:"ellipsis"},

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue

@@ -68,7 +68,7 @@
    {field: 'reportingWorkTime',width: 120, title: '报工时间', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'processCard', width: 130,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: 100,title: '批次', sortable: true,showOverflow:"ellipsis"},
    {field: 'batch', width: 100,title: '批次', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'device', width: 100,title: '设备', sortable: true},
    {field: 'thisProcess',width: 100, title: '本工序', sortable: true},
    {field: 'finishedNumber',width: 120, title: '本工序完工', sortable: true,showOverflow:"ellipsis"},

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

@@ -70,7 +70,7 @@
    {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: 'batch',width: 100, title: '批次', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'serialNumber',width: 80, title: '序号', sortable: true},
    {field: 'singlePieceName',width: 120, title: '单片名称', sortable: true},
    {field: 'marking',width: 80, title: '标记', sortable: true,showOverflow:"ellipsis"},

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

@@ -83,7 +83,7 @@
    {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: 'batch',width: 100, title: '批次', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'serialNumber',width: 80, title: '序号', sortable: true},
    {field: 'singlePieceName',width: 120, title: '单片名称', sortable: true},
    {field: 'marking',width: 80, title: '标记', sortable: true,showOverflow:"ellipsis"},

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

import java.time.LocalDate;

public class BaseBom {
    @TableId(type = IdType.AUTO)
    //自增id
    private Integer id;
    //产品大类编号
    private String productCategoriesId;
    //大类名称
    private String productCategories;
    //基数
    private Integer base;
    //物料编码
    private String materialId;
    //物料名称
    private String materialName;
    //主单位
    private String mainUnit;
    //换算率
    private String conversion;
    //副单位
    private String deputyUnit;
    //数量
    private String number;
    //工序
    private String process;
    //产地
    private String producingArea;
    //审核状态
    private Integer reviewStatus;
    //创建人
    private String founder;
    //审核人
    private String reviewer;
    //使用状态
    private Integer state;
    //建立时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

}

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

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

import java.time.LocalDate;

public class Device {
    //自增ID
    private Integer id;
    //设备编号
    private String deviceId;
    //标准名称
    private String standardName;
    //设备名称
    private String deviceName;
    //购买时间
    private LocalDate purchaseTime;
    //安装时间
    private LocalDate installTime;
    //使用周期(年)
    private Integer lifeCycle;
    //使用状态
    private Integer useState;
    //所在工艺
    private String process;
    //作废状态
    private String cancelState;
    //创建时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

}

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

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

import java.time.LocalDate;

public class DeviceMaintenance {
    //自增id
    private Integer id;
    //设备编号
    private String deviceId;
    //类型
    private Integer type;
    //故障日期
    private LocalDate faultTime;
    //故障原因
    private String faultReason;
    //保养日期
    private LocalDate maintenanceTime;
    //保养说明
    private String maintenanceIllustrate;
    //维修/保养开始时间
    private LocalDate startTime;
    //维修/保养结束时间
    private LocalDate stopTime;
    //维修/保养人员
    private String personnel;
    //费用
    private String cost;
    //创建时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

    //外键设备表
    private Device  device;

}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

import java.time.LocalDate;

public class FlowCard {
    @TableId(type = IdType.AUTO)
    //自增id
    private Integer id;
    //销售单号
    private String orderId;
    //生产订单号
    private String productionId;
    //流程卡号
    private String processId;
    //序号
    private Integer orderNumber;
    //工艺确认序号
    private Integer technologyNumber;
    //已优化数量
    private Integer optimizeQuantity;
    //排版状态
    private Integer layoutStatus;
    //补片数量
    private Integer numberPatches;
    //库存数量
    private Integer inventoryQuantity;
    //已入数量
    private Integer receivedQuantity;
    //补片编号
    private String patchId;
    //工程占用
    private Integer engineeringOccupancy;
    //库存数量
    private Integer inventoryNumber;
    //入库时间
    private LocalDate storageTime;
    //生产终止状态
    private Integer terminationStatus;
    //打印状态
    private Integer printStatus;
    //备用键
    private String alternateKey;
    //分架员
    private String founder;
    //分架时间
    private LocalDate splitFrameTime;
    //建立时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

    //外键订单表
//    private Order order;
//    //外键订单明细表
//    private OrderDetail orderDetail;
//    //外键订单工艺审核表
//    private orderGlassDetail orderGlassDetail;
}

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

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

import java.time.LocalDate;

public class OrderBom {
    //自增ID
    private Integer id;
    //销售单号
    private String orderId;
    //产品编号
    private String prodId;
    //产品名称
    private String productName;
    //产品数量
    private Integer number;
    //工序
    private String process;
    //物料编码
    private String materialId;
    //物料名称
    private String materialName;
    //物料数量
    private Integer materialNumber;
    //产地
    private String producingArea;
    //采购数量
    private Integer purchaseQuantity;
    //审核状态
    private Integer reviewStatus;
    //采购状态
    private Integer procureStatus;
    //采购单号
    private String procureId;
    //单价
    private String unitPrice;
    //供应商状态
    private Integer supplierStatus;
    //计划日期
    private LocalDate scheduleDate;
    //建立时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

import java.time.LocalDate;

public class ReportingWork {
    @TableId(type = IdType.AUTO)
    //自增id
    private Integer id;
    //报工编号
    private String reportingWorkId;
    //销售单号
    private String orderId;
    //生产订单号
    private String productionId;
    //流程卡号
    private String processId;
    //设备编号
    private String deviceId;
    //设备名称
    private String deviceName;
    //上工序
    private String previousProcess;
    //上工序数量
    private Integer previousProcessQuantity;
    //本工序
    private String thisProcess;
    //上工序数量
    private Integer thisProcessQuantity;
    //本工序完工数量
    private Integer thisCompletedQuantity;
    //本工序次破数量
    private Integer thisWornQuantity;
    //下工序
    private String nextProcess;
    //班次
    private String classes;
    //班组编号
    private String teamsgroupsId;
    //班组名称
    private String teamsgroupsName;
    //报工状态
    private Integer reportingWorkState;
    //审核人
    private String reviewed;
    //审核状态
    private Integer reviewedState;
    //备注
    private String notes;
    //质检员
    private String qualityInsPector;
    //包装方式
    private String packagingMethod;
    //报工时间
    private LocalDate reportingWorkTime;
    //审核时间
    private LocalDate examineTime;
    //质检时间
    private LocalDate qualityInsTime;
    //建立时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

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

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

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

public class ReportingWorkDetail {
    //自增ID
    private Integer id;
    //报工编号
    private String reportingWorkId;
    //产品序号
    private String orderNumber;
    //工艺确认序号
    private String technologyNumber;
    //完工数量
    private Integer completedQuantity;
    //次破数量
    private Integer breakageNumber;
    //次破原因
    private String breakageReason;
    //可利用
    private Integer available;
    //退回工序
    private String returnProcess;
    //责任工序
    private String responsibleProcess;
    //责任人员
    private String responsiblePersonnel;
    //责任班组
    private String responsibleTeam;
    //责任设备
    private String responsibleEquipment;
    //质检员
    private String qualityInspector;
    //补片状态
    private Integer patchStatus;
    //在制品名称
    private String workProgress;
    //质检状态
    private Integer qualityInsStatus;
    //报工类型
    private Integer type;

    //外键报工主表
    private  ReportingWork reportingWork;

}

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

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

import java.time.LocalDate;

public class Rework {
    //自增id
    private Integer id;
    //返工编号
    private String reworkId;
    //流程卡号
    private String processId;
    //返工类型
    private String reworkType;
    //返工原因
    private String reworkReason;
    //返工工序
    private String reworkProcesses;
    //返工数量
    private Integer reworkNum;
    //返工面积
    private Double reworkArea;
    //返工班组
    private String reworkTeam;
    //审核人
    private String reviewer;
    //审核状态
    private Integer reviewStatus;
    //创建时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

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

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

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

import java.time.LocalDate;

public class SetupBom {
    //自增ID
    private Integer id;
    //产品编号
    private String prodId;
    //产品名称
    private String productName;
    //基数
    private Integer base;
    ///物料编码
    private String materialID;
    //物料名称
    private String materialName;
    //单位
    private String unit;
    //换算率
    private String conversion;
    //单位2
    private String unit2;
    //数量
    private Integer number;
    //工序
    private String process;
    //产地
    private String producingArea;
    //审核状态
    private Integer reviewStatus;
    //创建人
    private String founder;
    //审核人
    private String reviewer;
    //使用状态
    private Integer state;
    //生产状态
    private Integer productionStatus;
    //建立时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

}

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

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

import java.time.LocalDate;

public class WorkprogressMonthlySettlement {
    //自增ID
    private Integer id;
    //产品编号
    private String prodId;
    //产品名称
    private String productName;
    //加工要求
    private String processingNote;
    //工序
    private String process;
    //宽
    private Double width;
    //高
    private Double height;
    //厚度
    private Double thickness;
    //单价
    private Double price;
    //总金额
    private Double grossAmount;
    //月结日期
    private LocalDate monthlyClosingDate;
    //建立时间
    private LocalDate createTime;
    //修改时间
    private LocalDate updateTime;

}

 north-glass-erp/src/main/resources/application.yml

@@ -10,12 +10,12 @@
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        user_info:
          url: jdbc:mysql://10.153.19.18:3306/erp_user_info?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        erp_sd:
          url: jdbc:mysql://10.153.19.18:3306/erp_sd?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/erp_sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

 north-glass-erp/target/classes/application.yml

@@ -10,12 +10,12 @@
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        user_info:
          url: jdbc:mysql://10.153.19.18:3306/erp_user_info?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        erp_sd:
          url: jdbc:mysql://10.153.19.18:3306/erp_sd?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/erp_sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver