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

src/api/Inventory/SelfMadePartsWarehouseOut.js

@@ -0,0 +1,83 @@
+import request from '@/utils/request'
+
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_按时间排序'
+    }
+  })
+}
+
+// 查询机床
+export function searchmachine(num, check) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0'
+    }
+  })
+}
+// 获取组号
+export function searchgroup(num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
+    }
+  })
+}
+// 获取表单
+export function searchdata(entryNameValue_check, entryNameValue, machineToolValue_check, machineToolValue, groupNumberValue_check, groupNumberValue, partNumber_check, partNumber, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '自制件出库_查询数据',
+      param: '项目流水号_check=' + entryNameValue_check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + machineToolValue_check + '&机床流水号=' + machineToolValue + '&组件流水号_check=' + groupNumberValue_check + '&组件流水号=' + groupNumberValue + '&零件图号_check=' + partNumber_check + '&零件图号=' + partNumber,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 自制件出库
+export function warehousing(processPlanSerialNumber, leader, remarks) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '自制件出库_循环执行_新',
+      param: '工艺计划流水号组=' + processPlanSerialNumber + '&考勤编号=' + leader + '&出库备注=' + remarks
+    }
+  })
+}
+export function selectdepartment() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '出库管理_部门查询'
+    }
+  })
+}
+export function selectleaders(department) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '出库管理_人员查询',
+      param: '考核部门编号=' + department
+    }
+  })
+}

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -88,27 +88,27 @@ export function changeNum(num, num1, num2, num3, num4) {
   })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) {
   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}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&供货商_check=${check8}&供货商=${val11}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 查询分配后的基本件
-export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
+export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单',
-      param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&供货商_check=${check8}&供货商=${val11}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/PurchasingCenter/CreatePurchaseContract.js

@@ -18,7 +18,7 @@ export function initSupplier11(num) {
     data: {
       type: '3',
       name: ` SELECT distinct 供应商流水号,供应商名称
-              FROM 采购管理_询价单_视图
+              FROM 采购管理_询价单_视图_新
               where  not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and (是否未通过 is null or 是否未通过 <> 1) and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
     }
   })
@@ -30,7 +30,7 @@ export function searchInquirySheet(check2, value2, check3, id, check4, supplier)
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_询价单_查询数据',
+      name: '采购管理_询价单_查询数据_创建合同',
       param: `询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}`
     }
   })

src/api/WorkshopProcurement/CreatingPurchasingMaterials.js

@@ -26,14 +26,14 @@ export function addMateriel2(num1, num2) {
   })
 }
 // 保存重量和备注
-export function saveWeight(num1, num2, num3, num4, num5, num6, num7) {
+export function saveWeight(num1, num2, num3, num4, num8) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_采购计划明细_保存重量和备注_9745',
-      param: `采购计划流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&零件图号=${num5}&材料=${num6}&零件名称=${num7}`
+      param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&采购数量=${num8}`
     }
   })
 }
@@ -124,15 +124,26 @@ export function searchMateriel(num) {
     }
   })
 }
+export function searchMateriel1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '备料管理_采购计划明细_查询数据_新',
+      param: `采购计划流水号=${num}`
+    }
+  })
+}
 // 增加采购计划明细
-export function addMateriel(num1, num2) {
+export function addMateriel(num1, num2, num3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_采购计划明细_增加数据',
-      param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}`
+      param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}&数量组=${num3}`
     }
   })
 }