样式

src/api/ManufacturingCenter/MaterialArrivalManagement.js

@@ -1,26 +1,11 @@
 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: '机床名称流水号_查询数据'
     }
@@ -41,24 +26,17 @@ export function getGroups(stepNumber) {
 
 // 查询零件
 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({
@@ -71,7 +49,6 @@ export function change3(Number, code, num) {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询零件工艺
 export function searchtable2(num1) {
   return request({

src/api/ManufacturingCenter/ParseQuery.js

@@ -10,8 +10,6 @@ export function SelectMachine() {
     }
   })
 }
-<<<<<<< HEAD
-=======
 export function ProcessOutsourcing() {
   return request({
     url: '',
@@ -34,4 +32,3 @@ export function ProcessProportion() {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/api/ManufacturingCenter/ProjectPlanningQuery.js

@@ -59,8 +59,6 @@ export function searchtable5(num1, num2, num3, num4, num5, num6, num7, num8, num
     }
   })
 }
-<<<<<<< HEAD
-=======
 // 查询项目总信息
 export function searchAll(num1, num2) {
   return request({
@@ -73,4 +71,3 @@ export function searchAll(num1, num2) {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d