new

src/api/ManufacturingCenter/MaterialArrivalManagement.js

@@ -1,5 +1,64 @@
 import request from '@/utils/request'
 
+<<<<<<< HEAD
+// 外购备料出库
+export function change3(Number, code, num) {
+=======
+// 机床名称
+export function getMachines() {
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+<<<<<<< HEAD
+      type: '2',
+      name: '车间生产管理工艺_自家备料到货更改',
+      param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num
+    }
+  })
+}
+// 查询零件
+export function searchtable(num1, num2, num3, pageCurrent, pageSize) {
+=======
+      type: '1',
+      name: '机床名称流水号_查询数据'
+    }
+  })
+}
+
+export function getGroups(stepNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
+      param: '机床流水号=' + stepNumber + '=int'
+    }
+  })
+}
+
+// 查询零件
+export function searchtable(num1, num2, num3, num4, num5, num6, num7, pageCurrent, pageSize) {
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_编制工艺_备料到货查询',
+<<<<<<< HEAD
+      param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料到货_check=' + num3,
+=======
+      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6 + '&备料到货_check=' + num7,
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+<<<<<<< HEAD
+=======
 // 外购备料出库
 export function change3(Number, code, num) {
   return request({
@@ -12,19 +71,7 @@ export function change3(Number, code, num) {
     }
   })
 }
-// 查询零件
-export function searchtable(num1, num2, num3, pageCurrent, pageSize) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间生产管理工艺_零件工艺计划_编制工艺_备料到货查询',
-      param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料到货_check=' + num3,
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询零件工艺
 export function searchtable2(num1) {
   return request({

src/api/ManufacturingCenter/ParseQuery.js

@@ -10,3 +10,28 @@ export function SelectMachine() {
     }
   })
 }
+<<<<<<< HEAD
+=======
+export function ProcessOutsourcing() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '工序外协_综合查询',
+      param: '机床流水号=' + arguments[0]
+    }
+  })
+}
+export function ProcessProportion() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '工序外协_工序占比_综合查询',
+      param: '机床流水号=' + arguments[0]
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/api/ManufacturingCenter/ProjectPlanningQuery.js

@@ -59,3 +59,18 @@ export function searchtable5(num1, num2, num3, num4, num5, num6, num7, num8, num
     }
   })
 }
+<<<<<<< HEAD
+=======
+// 查询项目总信息
+export function searchAll(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '16_项目总查询',
+      param: '项目流水号_check=' + num1 + '&项目流水号=' + num2
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -1,5 +1,29 @@
 import request from '@/utils/request'
 
+<<<<<<< HEAD
+=======
+// 查询询价单号
+export function getBillNum(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_创建询价单单号_查询数据'
+    }
+  })
+}
+export function getGongyings(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_创建询价单单号_查询数据'
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询全部未询价的标准件和外购件
 export function getExport1(num) {
   return request({
@@ -130,7 +154,11 @@ export function searchSheetDetail(num2) {
   })
 }
 // 创建询价单
+<<<<<<< HEAD
 export function createInquirySheet(num1, num2, remark, id) {
+=======
+export function createInquirySheet(num1, id, num2, remark) {
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   return request({
     url: '',
     method: 'post',

src/api/PurchasingCenter/InvoiceSettlementApplication.js

@@ -1,5 +1,19 @@
 import request from '@/utils/request'
 
+<<<<<<< HEAD
+=======
+export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_发票结算申请单_增加数据',
+      param: `发票号=${num2}&发票金额=${num3}&供应商流水号=${num4}&已付款项=${num5}&尚欠金额=${num6}&税额=${num7}&是否费用类=${num8}&备注=${num9}`
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询供应商
 export function searchSupplier() {
   return request({

src/api/PurchasingCenter/PurchaseContractSearch.js

@@ -59,3 +59,17 @@ export function deleteContract(num) {
     }
   })
 }
+<<<<<<< HEAD
+=======
+// 删除采购合同
+export function handleDone(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update 采购管理_采购合同_采购部 set 不通过处理 = 1 where 采购合同流水号 = '${num}'`
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/api/WorkshopProcurement/InvoiceSettlementApplication1.js

@@ -1,5 +1,20 @@
 import request from '@/utils/request'
 
+<<<<<<< HEAD
+=======
+export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理_发票结算申请单_增加数据',
+      param: `发票号=${num2}&发票金额=${num3}&供应商流水号=${num4}&已付款项=${num5}&尚欠金额=${num6}&税额=${num7}&是否费用类=${num8}&备注=${num9}`
+    }
+  })
+}
+
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询供应商
 export function searchSupplier() {
   return request({