Merge remote-tracking branch 'origin/dev' into dev

src/api/mes/pro/request.js

+import request from '@/utils/request'
+
+// 查询领料申请列表
+export function listMaterialRequest(query) {
+  return request({
+    url: '/pro/materialRequest/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询领料申请详细
+export function getMaterialRequest(materialRequestId) {
+  return request({
+    url: '/pro/materialRequest/' + materialRequestId,
+    method: 'get'
+  })
+}
+
+// 新增领料申请
+export function addMaterialRequest(data) {
+  return request({
+    url: '/pro/materialRequest',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改领料申请
+export function updateMaterialRequest(data) {
+  return request({
+    url: '/pro/materialRequest',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除领料申请
+export function delMaterialRequest(materialRequestId) {
+  return request({
+    url: '/pro/materialRequest/' + materialRequestId,
+    method: 'delete'
+  })
+}

src/api/mes/pro/return.js

+import request from '@/utils/request'
+
+// 查询退料申请列表
+export function listMaterialReturn(query) {
+  return request({
+    url: '/pro/materialReturn/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询退料申请详细
+export function getMaterialReturn(materialReturnId) {
+  return request({
+    url: '/pro/materialReturn/' + materialReturnId,
+    method: 'get'
+  })
+}
+
+// 新增退料申请
+export function addMaterialReturn(data) {
+  return request({
+    url: '/pro/materialReturn',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改退料申请
+export function updateMaterialReturn(data) {
+  return request({
+    url: '/pro/materialReturn',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除退料申请
+export function delMaterialReturn(materialReturnId) {
+  return request({
+    url: '/pro/materialReturn/' + materialReturnId,
+    method: 'delete'
+  })
+}