Merge branch 'master' of http://123.56.95.229:10010/r/高精

2020-02-08 16:13:49 +08:00
parent a565d53262 4e1ce7eb2e
commit 6d4033c92a
33 changed files with 1485 additions and 1347 deletions
--- a/src/api/ManufacturingCenter/ContractDetailsInquiry.js
+++ b/src/api/ManufacturingCenter/ContractDetailsInquiry.js
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 初始化 项目名称
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_总计划'
+    }
+  })
+}
+
+// 查询机床
+export function initMachine(projectNum) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据2',
+      param: `项目流水号=${projectNum}`
+    }
+  })
+}
+
+// 查询项目详情
+export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '项目工时统计_合同详情查询_工时综合查询',
+      param: `项目流水号=${projectNum}&机床流水号=${machineValue}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -1,74 +1,38 @@
 import request from '@/utils/request'

-// 初始化 外协厂商
-export function initOutHelp() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
-    }
-  })
-}
 // 查询表格数据
-export function searchtable(num2, ManufacturerName, num10, ManufacturerAbbreviation, num3, address, num4, roleName, phNumber, Fax, pageCurrent, pageSize) {
+export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据_付款计划',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=0&表单号_check=' + num2 + '&表单号=' + ManufacturerName + '&外协厂家_check=' + num10 + '&外协厂家=' + ManufacturerAbbreviation + '&任务下达日期时间_check=' + num3 + '&开始时间=' + address + '&结束时间=' + num4 + '&实际付款时间段_check=' + roleName + '&实际付款开始时间=' + phNumber + '&实际付款结束时间=' + Fax + '&外协计划员编号_check=0&外协计划员编号=0',
+      name: '车间生产管理工艺_外协付款_查询',
+      param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
 }
-// 修改实际付款日期
-export function payTime(num, time) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据_实际付款时间',
-      param: '外协加工任务单流水号=' + num + '&实际付款时间=' + time
-    }
-  })
-}
-// 修改扣款数据、扣款说明
-export function WithdrawingEdit(num, quality, Explain) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协扣款_编辑数据',
-      param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款说明=' + Explain
-    }
-  })
-}
-// 单据状态： 1 未成交 2 成交 3 作废
-export function payment(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据_作废',
-      param: '外协加工任务单流水号=' + num + '&单据状态=3'
-    }
-  })
-}
-// 查询零件信息
-export function getParts(check, Number, pageCurrent, pageSize) {
+export function getInvoice(Number, pageCurrent, pageSize) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + Number + '=int',
+      param: '外协厂家流水号_check=1&外协厂家流水号=' + Number,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function getPayment(Number, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_外协付款记录_查询数据',
+      param: '外协厂家流水号=' + Number,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -12,14 +12,14 @@ export function initOutHelp() {
  })
 }
 // 初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3) {
+export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num,
+      name: '车间生产管理_外协加工任务单_查询数据_2020',
+      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
--- a/src/api/WorkshopProcurement/OfflineProcurement.js
+++ b/src/api/WorkshopProcurement/OfflineProcurement.js
@@ -49,15 +49,14 @@ export function deletePurchaseOrder(PurchaseOrderNameValue) {
  })
 }
 // 查询采购单
-export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check3, name2) {
+export function searchPurchaseOrder(check1, num, check3, name2) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '备料管理_离线采购计划_查询数据',
-      param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}`
    }
  })
 }
@@ -109,15 +108,14 @@ export function getGroups(stepNumber) {
  })
 }

-export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) {
+export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, ordername, order) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新',
-      param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order,
-      Pagination: pageCurrent + '&' + pageSize
+      param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order
    }
  })
 }
--- a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
+++ b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
@@ -13,27 +13,29 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
  })
 }
 // 查询备料
-export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) {
+export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order, pageSize, pageCurrent) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '备料管理_外购备料_综合查询数据',
-      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue,
+      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue +
+      '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
 }
 // 导出
-export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) {
+export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '备料管理_外购备料_综合查询数据',
-      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue
+      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue +
+      '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order
    }
  })
 }