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

src/api/ManufacturingCenter/CreatePreparationBill.js

@@ -33,7 +33,7 @@ export function edit(num1) {
     data: {
       type: '2',
       name: '车间生产管理工艺_备料单导出_状态更改',
-      param: '工艺计划流水号=' + num1
+      param: `工艺计划流水号=${num1}&备料打印=1`
     }
   })
 }
@@ -45,7 +45,7 @@ export function edit2(num1) {
     data: {
       type: '2',
       name: '车间生产管理工艺_备料单导出_外购备料',
-      param: '工艺计划流水号=' + num1
+      param: `工艺计划流水号组=${num1}&是否外购备料=1`
     }
   })
 }

src/api/ManufacturingCenter/EquipmentConditionAnalysis.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+export function getData(num, num1, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理_设备运行情况_查询数据',
+      param: '工位号=' + num + '&日期=' + num1,
+      pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function getData1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理_设备运行情况_查询数据_全员',
+      param: '日期=' + num
+    }
+  })
+}
+export function getData2(num, num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理_设备运行情况_查询数据_折线图',
+      param: '工位号=' + num + '&开始时间=' + num1 + '&结束时间=' + num2
+    }
+  })
+}
+// 初始化 人员和工位
+export function getMachine() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_加工顺序调整_查询工位及人员'
+    }
+  })
+}

src/api/ManufacturingCenter/InitialProduction.js

@@ -122,4 +122,15 @@ export function dele(num, a, b) {
     }
   })
 }
-
+// 打回
+export function edit(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: 'MRP_计划订单_组件零件清单_基本件_打回数据',
+      param: '组件零件基本件流水号=' + num
+    }
+  })
+}

src/api/ManufacturingCenter/MaterialArrivalManagement.js

@@ -98,3 +98,15 @@ export function handlechange2(Number, code) {
   })
 }
 
+// 打回
+export function edit(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料单导出_状态更改',
+      param: `工艺计划流水号=${num1}&备料打印=0`
+    }
+  })
+}

src/api/TechnologyCenter/ImportParts.js

@@ -85,7 +85,7 @@ export function importBasics(establishment, proofread, review, date, projectName
     data: {
       type: '2',
       name: '组件明细表_基本件_导入数据gj',
-      param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}`
+      param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}&导入类型=0=int=output`
     }
   })
 }
@@ -96,7 +96,7 @@ export function importTotal(establishment, projectName, machineNum, machineName,
     data: {
       type: '2',
       name: '组件明细表_总图_导入数据gj',
-      param: `编制=${establishment}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件数量=${componentNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}`
+      param: `编制=${establishment}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件数量=${componentNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&导入类型=0=int=output`
     }
   })
 }

src/api/WorkshopProcurement/CreatingPurchasingMaterials.js

@@ -173,3 +173,15 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
     }
   })
 }
+// 打回备料
+export function edit2(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料单导出_外购备料',
+      param: `工艺计划流水号组=${num1}&是否外购备料=0`
+    }
+  })
+}