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

src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js

@@ -11,6 +11,18 @@ export function getMachines() {
     }
   })
 }
+// 机床名称
+export function getMachinesStatue(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: ` select COUNT(*) as 是否发货 from [发货管理_发货单明细] left join [发货管理_发货单]
+              on [发货管理_发货单].发货单流水号 = [发货管理_发货单明细].发货单流水号 where 机床流水号 = ${num}`
+    }
+  })
+}
 // 获取组号
 export function getGroups(stepNumber) {
   return request({
@@ -18,8 +30,8 @@ export function getGroups(stepNumber) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
-      param: '机床流水号=' + stepNumber + '=int'
+      name: '车间生产管理工艺_组件状态查询_查询所有组',
+      param: '机床流水号=' + stepNumber
     }
   })
 }

src/api/ManufacturingCenter/StatusQuery.js

@@ -20,15 +20,14 @@ export function intPartState() {
     }
   })
 }
-export function searchmachine(num, check, pageCurrent, pageSize) {
+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',
-      Pagination: pageCurrent + '&' + pageSize
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0'
     }
   })
 }
@@ -39,30 +38,19 @@ export function searchgroup(num, pageCurrent, pageSize) {
     data: {
       type: '1',
       name: 'PDM_组件名称_查询数据',
-      param: '机床流水号=' + num,
-      Pagination: pageCurrent + '&' + pageSize
+      param: '机床流水号=' + num
     }
   })
 }
-export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue) {
+export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int'
-    }
-  })
-}
-export function editData(num, state) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理工艺_零件工艺计划_考核状态',
-      param: '工艺计划流水号=' + num + '=int&考核状态=' + state + '=int'
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/api/ManufacturingCenter/maintainInformation.js

@@ -0,0 +1,119 @@
+import request from '@/utils/request'
+
+// 获取工位    表1
+export function getTableData1() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'SELECT *FROM [基础数据_设备工位点检表]inner join dbo.基础数据_点检类型名称 on [基础数据_设备工位点检表].点检表类型 = 基础数据_点检类型名称.点检表类型流水号'
+    }
+  })
+}
+// 点检类型    表2
+export function getTableData2() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'select * from 基础数据_点检类型名称'
+    }
+  })
+}
+// 点检内容    表3
+export function getTableData3(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: `select * from 基础数据_点检内容 where 点检表类型 = ${num}`
+    }
+  })
+}
+// 表1 编辑
+export function editType(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update [基础数据_设备工位点检表] set 点检表类型 = ${num1} where ID = ${num2}`
+    }
+  })
+}
+export function confirmEdit1(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update [基础数据_点检类型名称] set 点检表类型名称 = '${num1}' where 点检表类型流水号 = ${num2}`
+    }
+  })
+}
+export function confirmEdit2(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update 基础数据_点检内容 set 保养周期 = ${num1} ,保养项目 = '${num2}' where ID = ${num3}`
+    }
+  })
+}
+export function openDelete1(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `delete 基础数据_点检类型名称 where 点检表类型流水号 = ${num1}`
+    }
+  })
+}
+export function selectCount(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: `SELECT 工位号 FROM [基础数据_设备工位点检表] where 点检表类型 = ${num1}`
+    }
+  })
+}
+export function openDelete2(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `delete 基础数据_点检内容 where ID = ${num1}`
+    }
+  })
+}
+export function submit1(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `insert into 基础数据_点检类型名称 (点检表类型名称) values ('${num1}')`
+    }
+  })
+}
+export function submit2(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: ` declare @id int = 0
+              SELECT top 1 @id = ID FROM [ERPTOOL_GJ].[dbo].基础数据_点检内容 order by ID desc
+              set @id = @id + 1
+              insert into 基础数据_点检内容 (点检任务编号,点检表类型,保养项目,保养周期) values (@id,${num1},'${num2}',${num3})`
+    }
+  })
+}

src/api/MarketingCenter/ProjectProgress.js

@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function search1() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_项目名称_总_查询'
+    }
+  })
+}
+export function search2() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'SELECT count(客户名称) as 客户数量,[省份] FROM [客户关系管理系统_客户_查询数据_MESWOR_视图]where [客户名称是否启用] = 1 group by [省份]'
+    }
+  })
+}
+export function search3() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'SELECT count(客户名称) as 客户数量,[省份] FROM [客户关系管理系统_客户_查询数据_MESWOR_视图]where [客户名称是否启用] = 1 group by [省份]'
+    }
+  })
+}

src/api/Outsourcing/OutsourcingPartsQuery.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 获取零件工序信息（零件号表中）
+export function getprocedure(processPlan, single) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新',
+      param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int'
+    }
+  })
+}
+// 查询外协零件
+export function searchTable(check, supplierNameValue, check1, MaterialsValue, pageSize, pageCurrent) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理_外协零件_查询数据',
+      param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -75,6 +75,18 @@ export function getExport2(num) {
     }
   })
 }
+// 使用库存
+export function changeNum(num, num1, num2, num3, num4) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_离线采购_占用数量_插入',
+      param: `物料流水号=${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) {
   return request({
@@ -114,14 +126,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
   })
 }
 // 查询询价单
-export function searchCreateInquirySheet(pageCurrent, pageSize, check1, name, check2, num, id) {
+export function searchCreateInquirySheet(pageCurrent, pageSize, check2, num, id) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_询价单_查询数据',
-      param: `供应商名称_check=${check1}&供应商名称=${name}&询价单编号_check=${check2}&询价单编号=${num}&采购员流水号_check=1&采购员流水号=${id}`,
+      param: `询价单编号_check=${check2}&询价单编号=${num}&采购员流水号_check=1&采购员流水号=${id}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -254,7 +266,7 @@ export function saveOrder(num1, num2, num3) {
     data: {
       type: '2',
       name: '采购管理_询价单明细_保存数据',
-      param: `询价单明细流水号组=${num1}&数量组=${num2}&备注组=${num3}`
+      param: `询价单明细流水号=${num1}&数量=${num2}&备注=${num3}`
     }
   })
 }

src/api/PurchasingCenter/CreatePurchaseContract.js

@@ -24,14 +24,14 @@ export function initSupplier11(num) {
   })
 }
 // 查询询价单列表 表1
-export function searchInquirySheet(check1, value1, check2, value2, check3, id, check4, supplier) {
+export function searchInquirySheet(check2, value2, check3, id, check4, supplier) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_询价单_查询数据',
-      param: `供应商名称_check=${check1}&供应商名称=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}`
+      param: `询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}`
     }
   })
 }

src/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function getData(date1, date2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购效率_查询数据_折线图',
+      param: '开始时间=' + date1 + '&结束时间=' + date2
+    }
+  })
+}
+
+export function getData1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购效率分析_查询',
+      param: '采购合同流水号=' + num
+    }
+  })
+}

src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询供应商
+export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_供应商_查询数据_根据条件',
+      param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
+    }
+  })
+}
+// 查询备料
+export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '备料管理_外购备料_综合查询数据',
+      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}