机床查询、使用滞货

2019-01-21 09:37:51 +08:00
parent 969a1bc8d6
commit bce18ed9cd
17 changed files with 373 additions and 514 deletions
--- a/src/api/Assembly/AssemblyInformationInput.js
+++ b/src/api/Assembly/AssemblyInformationInput.js
@@ -11,18 +11,6 @@ export function initProject() {
    }
  })
 }
-// 机床查询
-export function searchMachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 查询组件工艺
 export function searchDetail(num) {
  return request({
--- a/src/api/Assembly/AssemblyPlan.js
+++ b/src/api/Assembly/AssemblyPlan.js
@@ -11,27 +11,15 @@ export function initProject() {
    }
  })
 }
-// 机床查询
-export function searchmachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_计划下达_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, check2, time, time1, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, check2, time, time1, pageCurrent, pageSize) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '车间装配管理_计划信息_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue + '&计划完成日期_check=' + check2 + '=int&开始时间=' + time + '&结束时间=' + time1,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue + '&计划完成日期_check=' + check2 + '=int&开始时间=' + time + '&结束时间=' + time1,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
--- a/src/api/Assembly/AssemblyProcessAssignment.js
+++ b/src/api/Assembly/AssemblyProcessAssignment.js
@@ -11,18 +11,6 @@ export function initProject() {
    }
  })
 }
-// 机床查询
-export function searchmachine(num, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
-    }
-  })
-}
 export function initPerson() {
  return request({
    url: '',
@@ -35,14 +23,14 @@ export function initPerson() {
  })
 }
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, pageCurrent, pageSize) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '车间装配管理_工艺任务_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
--- a/src/api/Assembly/PrintingAssemblyProcessCard.js
+++ b/src/api/Assembly/PrintingAssemblyProcessCard.js
@@ -11,18 +11,6 @@ export function initProject() {
    }
  })
 }
-// 机床查询
-export function searchMachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 查询组件工艺
 export function searchDetail(num) {
  return request({
@@ -48,14 +36,14 @@ export function searchProcess(num) {
  })
 }
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, pageCurrent, pageSize) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '车间装配管理_项目打印_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
--- a/src/api/ManufacturingCenter/PartAssignment.js
+++ b/src/api/ManufacturingCenter/PartAssignment.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'

-// 初始化项目
+// 初始化机床项目
 export function initProject() {
  return request({
    url: '',
@@ -11,18 +11,6 @@ export function initProject() {
    }
  })
 }
-// 机床查询
-export function searchmachine(num, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
-    }
-  })
-}
 // 组件查询
 export function searchgroup(num) {
  return request({
@@ -35,14 +23,14 @@ export function searchgroup(num) {
    }
  })
 }
-export function searchTable(projectValue, check1, machineNumberValue, check2, groupNumberValue, check3) {
+export function searchTable(machineNumberValue, check2, groupNumberValue, check3) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '车间管理_基本件采购_查询数据',
-      param: '项目流水号_check=' + check1 + '&项目流水号=' + projectValue + '&机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + '&组件流水号_check=' + check3 + '&组件流水号=' + groupNumberValue
+      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + '&组件流水号_check=' + check3 + '&组件流水号=' + groupNumberValue
    }
  })
 }
@@ -79,25 +67,25 @@ export function searchTable1(PurchaseOrder, check4) {
    }
  })
 }
-export function addData(num, num1, num2, id, time) {
+export function addData(num1, num2, id, time) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '车间管理_基本件采购_请购单_增加数据',
-      param: '请购单编号=' + num + '&请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time
+      param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time
    }
  })
 }
-export function editData(RequisitionList, num, num1, time) {
+export function editData(RequisitionList, num1, time) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '车间管理_基本件采购_请购单_编辑数据',
-      param: '请购单流水号=' + RequisitionList + '&请购单编号=' + num + '&请购车间=' + num1 + '&请购时间=' + time
+      param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 + '&请购时间=' + time
    }
  })
 }
@@ -145,14 +133,14 @@ export function purchaseRequisition(RequisitionList, projectName, projectFloatVa
    }
  })
 }
-export function purchaseRequisition1(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, StandardPartsAndOutsourcing, MaterialName, MaterialSpecification, MaterialModel, NumberOfParts, PartType, time, MaterialNum, ReMarks) {
+export function purchaseRequisition1(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, StandardPartsAndOutsourcing, MaterialName, MaterialCode, MaterialSpecification, MaterialModel, NumberOfParts, PartType, time, MaterialNum, ReMarks) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '车间管理_基本件采购_请购单明细_请购',
-      param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&标准件和外购件流水号=' + StandardPartsAndOutsourcing + '&物料名称=' + MaterialName + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + '&备注=' + ReMarks
+      param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&标准件和外购件流水号=' + StandardPartsAndOutsourcing + '&物料名称=' + MaterialName + '&物料代码=' + MaterialCode + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + '&备注=' + ReMarks
    }
  })
 }
@@ -275,3 +263,25 @@ export function Delete1(num) {
    }
  })
 }
+export function editStock(num, num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '零件分配_标准件和外购件_使用库存',
+      param: '标准件和外购件流水号=' + num + '&数量=' + num1 + '&零件数量=' + num2
+    }
+  })
+}
+export function editNum(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间管理_标准件和外购件_更改数量',
+      param: '请购单明细流水号=' + num + '&数量=' + num1
+    }
+  })
+}
--- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js
+++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js
@@ -79,14 +79,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
  })
 }
 // 生成采购合同
-export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, AdvanceCharge) {
+export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, singleQuota, readyQuota, AdvanceCharge) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '车间管理_基本件采购_请购单和请购单明细_增加数据',
-      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&预付款=${AdvanceCharge}`
+      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&单件定额工时组=${singleQuota}&准结定额工时组=${readyQuota}&预付款=${AdvanceCharge}`
    }
  })
 }