a

2019-10-17 18:13:47 +08:00
parent 5f791ce475 1f336d7026
commit 1989b23ce9
18 changed files with 1149 additions and 588 deletions
--- a/src/api/Inventory/CreatePickingList.js
+++ b/src/api/Inventory/CreatePickingList.js
@@ -42,8 +42,8 @@ export function searchTable(...params) {
    data: {
      type: '1',
      name: '车间装配管理_领料单_三表_查询数据',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`,
-      Pagination: params[4] + '&' + params[5]
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&零件类型=${params[8]}`,
+      Pagination: params[6] + '&' + params[7]
    }
  })
 }
@@ -91,7 +91,7 @@ export function searchListDetail(...params) {
    method: 'post',
    data: {
      type: '1',
-      name: '车间装配管理_领料单明细_查询数据',
+      name: '车间装配管理_领料单明细_查询数据_新',
      param: `领料单流水号=${params[0]}`
    }
  })
@@ -120,3 +120,15 @@ export function dropListDetail(num) {
    }
  })
 }
+// 查询领料单明细详情
+export function searchListDetailMX(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单明细_详情_查询数据',
+      param: `领料单流水号=${params[0]}&基本件流水号=${params[1]}&标准件和外购件流水号=${params[2]}`
+    }
+  })
+}
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -54,7 +54,7 @@ export function searchListDetail(...params) {
    method: 'post',
    data: {
      type: '1',
-      name: '车间装配管理_领料单明细_查询数据',
+      name: '车间装配管理_领料单明细_查询数据_新',
      param: `领料单流水号=${params[0]}`
    }
  })
@@ -102,8 +102,8 @@ export function submitOutStore(...params) {
    method: 'post',
    data: {
      type: '2',
-      name: '库存管理_物料出库_出库记录_增加数据',
-      param: `物料流水号=${params[0]}&货位流水号=${params[1]}&出库数量=${params[2]}&出库人流水号=${params[3]}&基本件流水号=${params[4]}&标准件和外购件流水号=${params[5]}&请购单明细流水号=${params[6]}&领料单流水号=${params[7]}&领料人流水号=${params[8]}&仓库流水号=${params[9]}&出库类别=${params[10]}`
+      name: '库存管理_物料出库_出库记录_增加数据_循环',
+      param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}`
    }
  })
 }
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -76,14 +76,14 @@ export function getExport2(num) {
  })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`,
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
@@ -353,3 +353,37 @@ export function searchMerge(num) {
    }
  })
 }
+export function getPerson(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'select * from dbo.人事档案管理_人员名单 inner join dbo.菜单系统模块_人员与角色 ' +
+      'on 人事档案管理_人员名单.人员编号=菜单系统模块_人员与角色.人员编号 ' +
+      'where 角色编号=3 or 角色编号=2'
+    }
+  })
+}
+export function tiaozheng1(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购件入库_创建询价单_调整采购任务_循环执行',
+      param: '人员编号=' + num1 + '&标准件和外购件流水号组=' + num2
+    }
+  })
+}
+export function tiaozheng2(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购件入库_创建询价单_调整采购任务_基本件_循环执行',
+      param: '人员编号=' + num1 + '&基本件流水号组=' + num2
+    }
+  })
+}
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -11,18 +11,18 @@ export function initSupplier() {
    }
  })
 }
-// export function initSupplier(num) {
-//   return request({
-//     url: '',
-//     method: 'post',
-//     data: {
-//       type: '3',
-//       name: `SELECT distinct 供应商流水号,供应商名称
-// FROM 采购管理_询价单_视图
-// where  not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
-//     }
-//   })
-// }
+export function initSupplier11(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: ` SELECT distinct 供应商流水号,供应商名称
+              FROM 采购管理_询价单_视图
+              where  not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
+    }
+  })
+}
 // 查询询价单列表 表1
 export function searchInquirySheet(check1, value1, check2, value2, check3, id, check4, supplier) {
  return request({
--- a/src/api/WorkshopProcurement/NewArrivalList.js
+++ b/src/api/WorkshopProcurement/NewArrivalList.js
@@ -1,39 +1,50 @@
 import request from '@/utils/request'

+export function searchCailiao(name) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '备料管理_外购备料到货_材料查询',
+      param: `供应商=${name}`
+    }
+  })
+}
 // 查询采购单
-export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) {
+export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, material) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '备料管理_采购计划_查询数据_到货',
-      param: `采购单号_check=${check1}&采购单号=${num}&供应商_check=${check2}&供应商=${name}`,
+      param: `采购单号_check=${check1}&采购单号=${num}&供应商_check=${check2}&供应商=${name}&材料=${material}`,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
 }
 // 查询采购计划明细
-export function searchMateriel(num) {
+export function searchMateriel(num, num1) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '备料管理_采购计划明细_查询数据_未选入',
-      param: `采购计划流水号=${num}`
+      param: `采购计划流水号=${num}&材料=${num1}`
    }
  })
 }
 // 查询到货单
-export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) {
+export function searchArriveOrder(num, num1, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '备料管理_到货单查询_新',
-      param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`,
+      param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
@@ -97,14 +108,14 @@ export function deleteArrivalMX(num) {
    }
  })
 }
-export function EditArrivalOrderMX(num, num1, num2, num3, num4, num5) {
+export function EditArrivalOrderMX(num, num2, num3, num4, num5) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '备料管理_编辑到货单明细',
-      param: `到货单明细流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}`
+      param: `到货单明细流水号=${num}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}`
    }
  })
 }
--- a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js
+++ b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js
@@ -1,14 +1,14 @@
 import request from '@/utils/request'

 // 发票查询
-export function searchInvoice(pageCurrent, pageSize, check1, num1, check2, supplierName0) {
+export function searchInvoice(pageCurrent, pageSize, check1, num1, check2, supplierName0, num2, num3, num4, num5, num6) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '备料管理_发票_查询数据',
-      param: '发票号_check=' + check1 + '&发票号=' + num1 + '&供应商名称_check=' + check2 + '&供应商名称=' + supplierName0,
+      param: '发票号_check=' + check1 + '&发票号=' + num1 + '&供应商名称_check=' + check2 + '&供应商名称=' + supplierName0 + '&供应商流水号_check=' + num2 + '&供应商流水号=' + num3 + '&日期_check=' + num4 + '&开始日期=' + num5 + '&结束日期=' + num6,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
@@ -156,3 +156,13 @@ export function addMateriel(num, num1) {
    }
  })
 }
+export function getGongyingshang() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '备料管理_发票_初始化获取供应商'
+    }
+  })
+}