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

src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js

@@ -7,7 +7,7 @@ export function getMachines() {
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_全部_查询数据'
+      name: 'PDM_机床名称_查询数据_查询全部'
     }
   })
 }
@@ -18,9 +18,32 @@ export function getGroups(stepNumber) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组_新',
+      name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
       param: '机床流水号=' + stepNumber + '=int'
     }
   })
 }
-
+// 查询零件
+export function selectParts(check1, stepNumber, check2, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_车间组件完成情况_查询数据',
+      param: '组件流水号_check=' + check1 + '&组件流水号=' + stepNumber + '&工艺计划流水号_check=' + check2 + '&工艺计划流水号=' + num
+    }
+  })
+}
+// 查询工序
+export function selectProcedure(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工序_查询数据_车间组件完成情况',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}

src/api/ManufacturingCenter/PartAssignment.js

@@ -67,14 +67,14 @@ export function searchTable1(PurchaseOrder, check4) {
     }
   })
 }
-export function addData(num1, num2, id, time) {
+export function addData(num1, num2, id, time, remarks) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单_增加数据',
-      param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time
+      param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + '&备注=' + remarks
     }
   })
 }

src/api/WorkshopProcurement/NewArrivalList.js

@@ -38,26 +38,26 @@ export function searchLxPurchaseOrder(pageCurrent, pageSize, check1, num, check2
   })
 }
 // 查询采购计划明细
-export function searchMateriel(num) {
+export function searchMateriel(num, check, num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_采购计划明细_查询数据_未选入',
-      param: `供应商=${num}`
+      param: `供应商=${num}&零件图号_check=${check}&零件图号=${num1}`
     }
   })
 }
 // 查询离线采购计划明细
-export function searchLxMateriel(num) {
+export function searchLxMateriel(num, check, num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_离线采购计划明细_查询数据_未选入',
-      param: `供应商流水号=${num}`
+      param: `供应商流水号=${num}&零件图号_check=${check}&零件图号=${num1}`
     }
   })
 }

src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js

@@ -132,15 +132,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
   })
 }
 // 查询到货单
-export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) {
+export function searchArriveOrder(num, num1, num2, num3, num5) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_到货单查询',
-      param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`
     }
   })
 }