cuilei
13 小时以前 84bd2806feecfe7938fcdf91469e025a8e7f5749
规范涉及mes接口的请求前缀
已修改15个文件
260 ■■■■ 文件已修改
src/views/mes/MesKittingCompletenessCheckList.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/MesProductionOrderListView.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/MesProductionWorkOrderList.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/MesProductionWorkOrderListView.vue 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/MesTransferOrderPrintList.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/MesWorkReportingList.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesKittingCompletenessCheckForm.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesProductionWorkOrderForm.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesProductionWorkOrderListModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesProductionWorkOrderReportModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesProductionWorkOrderRepublishModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesTransferOrderPrintForm.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/modules/MesWorkReportingForm.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mes/MesKittingCompletenessCheckList.vue
@@ -187,11 +187,11 @@
          }
        ],
        url: {
          list: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/list",
          delete: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/delete",
          deleteBatch: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/deleteBatch",
          exportXlsUrl: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/exportXls",
          importExcelUrl: "meskittingcompletenesscheck/mesKittingCompletenessCheck/importExcel",
          list: "/mes/mesKittingCompletenessCheck/list",
          delete: "/mes/mesKittingCompletenessCheck/delete",
          deleteBatch: "/mes/mesKittingCompletenessCheck/deleteBatch",
          exportXlsUrl: "/mes/mesKittingCompletenessCheck/exportXls",
          importExcelUrl: "mes/mesKittingCompletenessCheck/importExcel",
        },
        dictOptions:{},
src/views/mes/MesProductionOrderListView.vue
@@ -475,13 +475,13 @@
        ]
      },
      url: {
        list: '/mesproductionwork/mesProductionOrder/list',
        delete: '/mesproductionwork/mesProductionOrder/delete',
        deleteBatch: '/mesproductionwork/mesProductionOrder/deleteBatch',
        exportXlsUrl: '/mesproductionwork/mesProductionOrder/exportXls',
        importExcelUrl: 'mesproductionwork/mesProductionOrder/importExcel',
        queryWorkReportingByOrderId:'/mesworkreporting/mesWorkReporting/queryWorkReportingByOrderId',
        queryOrderPrintByOrderId:'/mestransferorderprint/mesTransferOrderPrint/queryOrderPrintByOrderId'
        list: '/mes/productionOrder/list',
        delete: '/mes/productionOrder/delete',
        deleteBatch: '/mes/productionOrder/deleteBatch',
        exportXlsUrl: '/mes/productionOrder/exportXls',
        importExcelUrl: 'mes/productionOrder/importExcel',
        queryWorkReportingByOrderId:'/mes/mesWorkReporting/queryWorkReportingByOrderId',
        queryOrderPrintByOrderId:'/mes/mesTransferOrderPrint/queryOrderPrintByOrderId'
      },
      dictOptions: {},
      superFieldList: []
src/views/mes/MesProductionWorkOrderList.vue
@@ -275,14 +275,14 @@
        }
      ],
      url: {
        list: '/mesproductionworkorder/mesProductionWorkOrder/list',
        delete: '/mesproductionworkorder/mesProductionWorkOrder/delete',
        deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel',
        list: '/mes/mesProductionWorkOrder/list',
        delete: '/mes/mesProductionWorkOrder/delete',
        deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mes/mesProductionWorkOrder/importExcel',
        listProductionLinesOption: '/base/factory/queryIdTree',
        schedule: '/mesproductionworkorder/mesProductionWorkOrder/schedule',
        publish: '/mesproductionworkorder/mesProductionWorkOrder/publish'
        schedule: '/mes/mesProductionWorkOrder/schedule',
        publish: '/mes/mesProductionWorkOrder/publish'
      },
      dictOptions: {},
      superFieldList: [],
src/views/mes/MesProductionWorkOrderListView.vue
@@ -155,26 +155,6 @@
            </template>
          </j-vxe-table>
        </a-tab-pane>
        <a-tab-pane tab="物料拉动申请" :key="refKeys2[0]" :forceRender="true">
          <div style="display: flex; align-items: center; margin-bottom: 10px;">
          </div>
          <j-vxe-table
            keep-source
            :ref="refKeys2[0]"
            :loading="mesMaterialTransferRequest.loading"
            :columns="mesMaterialTransferRequest.columns"
            :dataSource="mesMaterialTransferRequest.dataSource"
            :maxHeight="300"
            :rowNumber="true"
            :rowSelection="true"
            :toolbar="false">
            <template slot="showTransferDetail" slot-scope="{row}">
              <a-button type="primary" @click="handleTransferDetail(row)" size="small">
                <a-icon type="eye" />物料拉动明细
              </a-button>
            </template>
          </j-vxe-table>
        </a-tab-pane>
        <a-tab-pane tab="上下料查询" :key="refKeys3[0]" :forceRender="true">
          <div style="display: flex; align-items: center; margin-bottom: 10px;">
          </div>
@@ -261,9 +241,6 @@
      // 工单报工
      refKeys1: ['mesWorkReporting'],
      tableKeys1: ['mesWorkReporting'],
      //物料拉动申请
      refKeys2: ['mesMaterialTransferRequest'],
      tableKeys2: ['mesMaterialTransferRequest'],
      //上料
      refKeys3: ['mesMaterialLoading'],
      tableKeys3: ['mesMaterialLoading'],
@@ -455,101 +432,6 @@
          },
        ]
      },
      mesMaterialTransferRequest: {
        loading: false,
        dataSource: [],
        columns: [
          {
            title: '操作',
            key: 'action',
            type: JVXETypes.slot,
            slotName: 'showTransferDetail',
            width: '120px',
            align: 'center'
          },
          {
            title: '拉动单号',
            key: 'requestCode',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '工单号',
            key: 'workOrderCode',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: 'SAP预留号',
            key: 'reservationCode',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '发布状态',
            key: 'publishStatus',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '请求状态',
            key: 'requestStatus',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '请求时间',
            key: 'requestTime',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '原库存地',
            key: 'originalWarehouseName',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '目标库存地',
            key: 'targetWarehouseName',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '优先级',
            key: 'priority',
            type: JVXETypes.select,
            dictCode: 'priority',
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
          {
            title: '最晚配送时间',
            key: 'latestDeliveryTime',
            type: JVXETypes.input,
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: ''
          },
        ]
      },
      mesMaterialLoading: {
        loading: false,
        dataSource: [],
@@ -691,20 +573,19 @@
        ]
      },
      url: {
        list: '/mesproductionworkorder/mesProductionWorkOrder/list',
        delete: '/mesproductionworkorder/mesProductionWorkOrder/delete',
        deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel',
        queryWorkReportingByWorkOrderId:'/mesworkreporting/mesWorkReporting/queryWorkReportingByWorkOrderId',
        queryMaterialTransferRequestByWorkOrderId:'/mesmaterialtransferrequest/mesMaterialTransferRequest/queryMaterialTransferRequestByWorkOrderId',
        list: '/mes/mesProductionWorkOrder/list',
        delete: '/mes/mesProductionWorkOrder/delete',
        deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mes/mesProductionWorkOrder/importExcel',
        queryWorkReportingByWorkOrderId:'/mes/mesWorkReporting/queryWorkReportingByWorkOrderId',
        queryLoadingByWorkOrderId:'/mes/mesMaterialLoading/queryLoadingByWorkOrderId',
        queryCompletenessCheckByWorkOrderId:'/meskittingcompletenesscheck/mesKittingCompletenessCheck/queryCompletenessCheckByWorkOrderId',
        queryOrderById:'/mesproductionwork/mesProductionOrder/queryById',
        queryCompletenessCheckByWorkOrderId:'/mes/mesKittingCompletenessCheck/queryCompletenessCheckByWorkOrderId',
        queryOrderById:'/mes/productionOrder/queryById',
        queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId',
        queryTransferDetailBy:'/mes/mesMaterialTransferDetail/queryTransferDetailBy',
        publish: '/mesproductionworkorder/mesProductionWorkOrder/publish',
        execute: '/mesproductionworkorder/mesProductionWorkOrder/execute',
        publish: '/mes/mesProductionWorkOrder/publish',
        execute: '/mes/mesProductionWorkOrder/execute',
      },
      dictOptions: {},
      superFieldList: []
@@ -770,15 +651,13 @@
      this.$refs.MesProductionOrderModal.disableSubmit = true;
    },
    async onSelectChange(selectedRowKeys){
      //mesWorkReporting,mesMaterialTransferRequest,mesMaterialLoading,mesKittingCompletenessCheck
      //mesWorkReporting,·,mesMaterialLoading,mesKittingCompletenessCheck
      this.mesWorkReporting.loading = true
      this.mesMaterialTransferRequest.loading = true
      this.mesMaterialLoading.loading = true
      this.mesKittingCompletenessCheck.loading = true
      this.selectedRowKeys = selectedRowKeys
      this.mesWorkReporting.dataSource=[]
      this.mesMaterialTransferRequest.dataSource=[]
      this.mesMaterialLoading.dataSource=[]
      this.mesKittingCompletenessCheck.dataSource=[]
      if (selectedRowKeys.length > 0) {
@@ -787,15 +666,12 @@
          'workOrderId':selectedId
        }
        const mesWorkReportingResult = await getAction(this.url.queryWorkReportingByWorkOrderId, parm)
        const mesMaterialTransferRequestResult = await getAction(this.url.queryMaterialTransferRequestByWorkOrderId, parm)
        const mesMaterialLoadingResult = await getAction(this.url.queryLoadingByWorkOrderId, parm)
        const mesKittingCompletenessCheckResult = await getAction(this.url.queryCompletenessCheckByWorkOrderId, parm)
        this.mesWorkReporting.dataSource = mesWorkReportingResult.result
        this.mesMaterialTransferRequest.dataSource = mesMaterialTransferRequestResult.result
        this.mesMaterialLoading.dataSource = mesMaterialLoadingResult.result
        this.mesKittingCompletenessCheck.dataSource = mesKittingCompletenessCheckResult.result
        this.mesWorkReporting.loading = false
        this.mesMaterialTransferRequest.loading = false
        this.mesMaterialLoading.loading = false
        this.mesKittingCompletenessCheck.loading = false
      }
src/views/mes/MesTransferOrderPrintList.vue
@@ -187,12 +187,12 @@
          }
        ],
        url: {
          list: "/mestransferorderprint/mesTransferOrderPrint/list",
          delete: "/mestransferorderprint/mesTransferOrderPrint/delete",
          deleteBatch: "/mestransferorderprint/mesTransferOrderPrint/deleteBatch",
          exportXlsUrl: "/mestransferorderprint/mesTransferOrderPrint/exportXls",
          importExcelUrl: "mestransferorderprint/mesTransferOrderPrint/importExcel",
          list: "/mes/mesTransferOrderPrint/list",
          delete: "/mes/mesTransferOrderPrint/delete",
          deleteBatch: "/mes/mesTransferOrderPrint/deleteBatch",
          exportXlsUrl: "/mes/mesTransferOrderPrint/exportXls",
          importExcelUrl: "mes/mesTransferOrderPrint/importExcel",
        },
        dictOptions:{},
        superFieldList:[],
src/views/mes/MesWorkReportingList.vue
@@ -227,11 +227,11 @@
          }
        ],
        url: {
          list: "/mesworkreporting/mesWorkReporting/list",
          delete: "/mesworkreporting/mesWorkReporting/delete",
          deleteBatch: "/mesworkreporting/mesWorkReporting/deleteBatch",
          exportXlsUrl: "/mesworkreporting/mesWorkReporting/exportXls",
          importExcelUrl: "mesworkreporting/mesWorkReporting/importExcel",
          list: "/mes/mesWorkReporting/list",
          delete: "/mes/mesWorkReporting/delete",
          deleteBatch: "/mes/mesWorkReporting/deleteBatch",
          exportXlsUrl: "/mes/mesWorkReporting/exportXls",
          importExcelUrl: "mes/mesWorkReporting/importExcel",
        },
        dictOptions:{},
src/views/mes/modules/MesKittingCompletenessCheckForm.vue
@@ -72,9 +72,9 @@
        validatorRules: {
        },
        url: {
          add: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/add",
          edit: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/edit",
          queryById: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/queryById"
          add: "/mes/mesKittingCompletenessCheck/add",
          edit: "/mes/mesKittingCompletenessCheck/edit",
          queryById: "/mes/mesKittingCompletenessCheck/queryById"
        }
      }
    },
@@ -121,7 +121,7 @@
              that.confirmLoading = false;
            })
          }
        })
      },
    }
src/views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue
@@ -107,8 +107,8 @@
      url: {
        report: '/mesworkreporting/mesWorkReporting/add',
        selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList',
        workOrderCompletenessCheck: '/mesproductionworkorder/mesProductionWorkOrder/workOrderCompletenessCheck',
        add: '/meskittingcompletenesscheck/mesKittingCompletenessCheck/addBatch'
        workOrderCompletenessCheck: '/mes/mesProductionWorkOrder/workOrderCompletenessCheck',
        add: '/mes/mesKittingCompletenessCheck/addBatch'
      },
      workOrderOptions: []
    }
src/views/mes/modules/MesProductionWorkOrderForm.vue
@@ -112,9 +112,9 @@
        validatorRules: {
        },
        url: {
          add: "/mesproductionworkorder/mesProductionWorkOrder/add",
          edit: "/mesproductionworkorder/mesProductionWorkOrder/edit",
          queryById: "/mesproductionworkorder/mesProductionWorkOrder/queryById"
          add: "/mes/mesProductionWorkOrder/add",
          edit: "/mes/mesProductionWorkOrder/edit",
          queryById: "/mes/mesProductionWorkOrder/queryById"
        }
      }
    },
src/views/mes/modules/MesProductionWorkOrderListModal.vue
@@ -97,7 +97,7 @@
        workOrderDateOptions: [],
        url: {
          queryShiftGroupByFactoryId: '/base/shiftGroup/queryShiftGroupByFactoryId',
          addSchedulePlan: '/mesproductionworkorder/mesProductionWorkOrder/addSchedulePlan'
          addSchedulePlan: '/mes/mesProductionWorkOrder/addSchedulePlan'
        },
        editRules: {
          materialNumber: [
src/views/mes/modules/MesProductionWorkOrderReportModal.vue
@@ -81,7 +81,7 @@
        sm: { span: 18 },
      },
      url: {
        report: '/mesworkreporting/mesWorkReporting/add',
        report: '/mes/mesWorkReporting/add',
        selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList'
      },
      workOrderOptions: []
src/views/mes/modules/MesProductionWorkOrderRepublishModal.vue
@@ -73,7 +73,7 @@
        sm: { span: 18 },
      },
      url: {
        republish: '/mesproductionworkorder/mesProductionWorkOrder/republish'
        republish: '/mes/mesProductionWorkOrder/republish'
      }
    }
  },
src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue
@@ -232,17 +232,17 @@
      },
      // 表头
      url: {
        list: '/mesproductionworkorder/mesProductionWorkOrder/list',
        delete: '/mesproductionworkorder/mesProductionWorkOrder/delete',
        deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel',
        list: '/mes/mesProductionWorkOrder/list',
        delete: '/mes/mesProductionWorkOrder/delete',
        deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch',
        exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls',
        importExcelUrl: 'mes/mesProductionWorkOrder/importExcel',
        listProductionLinesOption: '/base/factory/queryIdTree',
        queryShiftGroupByFactoryId: '/base/shiftGroup/queryShiftGroupByFactoryId',
        queryFactoryById: '/base/factory/queryById',
        queryLswMaterialByProductionType: '/lsw/lswMaterial/queryLswMaterialByProductionType',
        schedule: '/mesproductionworkorder/mesProductionWorkOrder/schedule',
        addSchedulePlan: '/mesproductionworkorder/mesProductionWorkOrder/addSchedulePlan'
        schedule: '/mes/mesProductionWorkOrder/schedule',
        addSchedulePlan: '/mes/mesProductionWorkOrder/addSchedulePlan'
      },
      editRules: {
        materialNumber: [
src/views/mes/modules/MesTransferOrderPrintForm.vue
@@ -97,9 +97,9 @@
        validatorRules: {
        },
        url: {
          add: "/mestransferorderprint/mesTransferOrderPrint/add",
          edit: "/mestransferorderprint/mesTransferOrderPrint/edit",
          queryById: "/mestransferorderprint/mesTransferOrderPrint/queryById"
          add: "/mes/mesTransferOrderPrint/add",
          edit: "/mes/mesTransferOrderPrint/edit",
          queryById: "/mes/mesTransferOrderPrint/queryById"
        }
      }
    },
@@ -146,7 +146,7 @@
              that.confirmLoading = false;
            })
          }
        })
      },
    }
src/views/mes/modules/MesWorkReportingForm.vue
@@ -97,9 +97,9 @@
        validatorRules: {
        },
        url: {
          add: "/mesworkreporting/mesWorkReporting/add",
          edit: "/mesworkreporting/mesWorkReporting/edit",
          queryById: "/mesworkreporting/mesWorkReporting/queryById"
          add: "/mes/mesWorkReporting/add",
          edit: "/mes/mesWorkReporting/edit",
          queryById: "/mes/mesWorkReporting/queryById"
        }
      }
    },
@@ -146,7 +146,7 @@
              that.confirmLoading = false;
            })
          }
        })
      },
    }