Merge branch 'develop' into fzq

2022-03-03 20:49:39 +08:00
parent 04cc50f504 878c9b22f7
commit 8801c44b98
36 changed files with 3098 additions and 182 deletions
--- a/src/api/art-manage/art.js
+++ b/src/api/art-manage/art.js
@@ -94,7 +94,7 @@ export function listAllEquipmentRecipe(data) {
 // 保存某个工艺下的所有节点
 export function addProcessFlows(data) {
  return request({
-    url: 'process/process-flow-equipment/add',
+    url: '/api/process/process-flow-equipment/add',
    method: 'post',
    data
  })
--- a/src/api/basicData/EquipmentScrapGrade.js
+++ b/src/api/basicData/EquipmentScrapGrade.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2021-07-06 11:10:22
+ * @LastEditTime: 2022-03-03 13:46:55
 * @Description:
 */
 import request from '@/utils/request'

 export function EquipmentScrapGradeList(data) { // 获取废片等级列表
  return request({
-    url: '/basic/equipment-scraps-grade/pageForEquipmentGrade',
+    url: '/api/wms/equipment-scraps-grade/pageForEquipmentGrade',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function EquipmentScrapGradeList(data) { // 获取废片等级列表

 export function EquipmentScrapGradeDetail(id) { // 获取废片等级单条数据
  return request({
-    url: '/basic/equipment-scraps-grade/get',
+    url: '/api/wms/equipment-scraps-grade/get',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,7 @@ export function EquipmentScrapGradeDetail(id) { // 获取废片等级单条数

 export function EquipmentScrapGradeUpdate(data) { // 更新废片等级单条数据
  return request({
-    url: '/basic/equipment-scraps-grade/update',
+    url: '/api/wms/equipment-scraps-grade/update',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function EquipmentScrapGradeUpdate(data) { // 更新废片等级单条数

 export function EquipmentScrapGradeAdd(data) { // 新增废片等级单条数据
  return request({
-    url: '/basic/equipment-scraps-grade/add',
+    url: '/api/wms/equipment-scraps-grade/add',
    method: 'post',
    data
  })
@@ -41,7 +41,7 @@ export function EquipmentScrapGradeAdd(data) { // 新增废片等级单条数据

 export function EquipmentScrapGradeDelete(id) { // 删除废片等级单条数据
  return request({
-    url: '/basic/equipment-scraps-grade/delete',
+    url: '/api/wms/equipment-scraps-grade/delete',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/GroupModule/staff.js
+++ b/src/api/basicData/GroupModule/staff.js
@@ -1,8 +1,8 @@
 /*
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-17 16:04:51
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 15:10:05
 * @Description:
 */
 import request from '@/utils/request'
@@ -56,7 +56,7 @@ export function staffDelete(id) { // 删除员工单条数据

 export function workerList(data) { // 添加组员列表
  return request({
-    url: '/basic/team-det/workerList',
+    url: '/api/wms/team-det/workerList',
    method: 'post',
    data
  })
@@ -64,7 +64,7 @@ export function workerList(data) { // 添加组员列表

 export function getRoleList() {
  return request({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
    method: 'post',
    data: {
      dictTypeId: '1383318968677273601',
--- a/src/api/basicData/Scrap/ScrapInfo.js
+++ b/src/api/basicData/Scrap/ScrapInfo.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2021-03-10 14:25:18
+ * @LastEditTime: 2022-03-03 13:46:40
 * @Description:
 */
 import request from '@/utils/request'

 export function scrapInfoList(data) { // 获取报废信息列表
  return request({
-    url: '/basic/scrap-information/page',
+    url: '/api/wms/scrap-information/page',
    method: 'post',
    data
  })
@@ -20,7 +20,7 @@ export function scrapInfoDetail(id) { // 获取报废信息单条数据
    'id': id
  }
  return request({
-    url: '/basic/scrap-information/get',
+    url: '/api/wms/scrap-information/get',
    method: 'post',
    data
  })
@@ -28,7 +28,7 @@ export function scrapInfoDetail(id) { // 获取报废信息单条数据

 export function scrapInfoUpdate(data) { // 更新报废信息单条数据
  return request({
-    url: '/basic/scrap-information/update',
+    url: '/api/wms/scrap-information/update',
    method: 'post',
    data
  })
@@ -36,7 +36,7 @@ export function scrapInfoUpdate(data) { // 更新报废信息单条数据

 export function scrapInfoAdd(data) { // 新增报废信息单条数据
  return request({
-    url: '/basic/scrap-information/add',
+    url: '/api/wms/scrap-information/add',
    method: 'post',
    data
  })
@@ -44,14 +44,14 @@ export function scrapInfoAdd(data) { // 新增报废信息单条数据

 export function scrapInfoCode() { // 获取报废信息code
  return request({
-    url: '/basic/scrap-information/get-code',
+    url: '/api/wms/scrap-information/get-code',
    method: 'post'
  })
 }

 export function scrapInfoDelete(id) { // 删除报废信息单条数据
  return request({
-    url: '/basic/scrap-information/delete',
+    url: '/api/wms/scrap-information/delete',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/Scrap/ScrapType.js
+++ b/src/api/basicData/Scrap/ScrapType.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2021-03-10 14:25:59
+ * @LastEditTime: 2022-03-03 13:46:46
 * @Description:
 */
 import request from '@/utils/request'

 export function scrapTypeList(data) { // 获取报废类型列表
  return request({
-    url: '/basic/scrap-type-information/page',
+    url: '/api/wms/scrap-type-information/page',
    method: 'post',
    data
  })
@@ -20,7 +20,7 @@ export function scrapTypeDetail(id) { // 获取报废类型单条数据
    'id': id
  }
  return request({
-    url: '/basic/scrap-type-information/get',
+    url: '/api/wms/scrap-type-information/get',
    method: 'post',
    data
  })
@@ -28,7 +28,7 @@ export function scrapTypeDetail(id) { // 获取报废类型单条数据

 export function scrapTypeUpdate(data) { // 更新报废类型单条数据
  return request({
-    url: '/basic/scrap-type-information/update',
+    url: '/api/wms/scrap-type-information/update',
    method: 'post',
    data
  })
@@ -36,7 +36,7 @@ export function scrapTypeUpdate(data) { // 更新报废类型单条数据

 export function scrapTypeAdd(data) { // 新增报废类型单条数据
  return request({
-    url: '/basic/scrap-type-information/add',
+    url: '/api/wms/scrap-type-information/add',
    method: 'post',
    data
  })
@@ -44,14 +44,14 @@ export function scrapTypeAdd(data) { // 新增报废类型单条数据

 export function scrapTypeCode() { // 获取报废类型code
  return request({
-    url: '/basic/scrap-type-information/get-code',
+    url: '/api/wms/scrap-type-information/get-code',
    method: 'post'
  })
 }

 export function scrapTypeDelete(id) { // 删除报废类型单条数据
  return request({
-    url: '/basic/scrap-type-information/delete',
+    url: '/api/wms/scrap-type-information/delete',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/StateConfig.js
+++ b/src/api/basicData/StateConfig.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2021-01-13 16:11:45
+ * @LastEditTime: 2022-03-03 16:10:54
 * @Description:
 */
 import request from '@/utils/request'

 export function StateConfigList(data) { // 获取状态列表
  return request({
-    url: '/basic/configure-display/page',
+    url: '/api/wms/configure-display/page',
    method: 'post',
    data
  })
--- a/src/api/basicData/dataDictionary.js
+++ b/src/api/basicData/dataDictionary.js
@@ -1,15 +1,15 @@
 /*
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-19 15:57:56
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 15:10:16
 * @Description:
 */
 import request from '@/utils/request'

 export function dataDictionaryDataList(data) { // 获取字典类型列表
  return request({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function dataDictionaryDataList(data) { // 获取字典类型列表

 export function dataDictionaryDataDetail(id) { // 获取字典类型单条数据
  return request({
-    url: '/basic/platform-dict/selectPlatformDictDataById',
+    url: '/api/wms/platform-dict/selectPlatformDictDataById',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,7 @@ export function dataDictionaryDataDetail(id) { // 获取字典类型单条数据

 export function dataDictionaryDataUpdate(data) { // 更新字典类型单条数据
  return request({
-    url: '/basic/platform-dict/updatePlatformDictData',
+    url: '/api/wms/platform-dict/updatePlatformDictData',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function dataDictionaryDataUpdate(data) { // 更新字典类型单条数

 export function dataDictionaryDataAdd(data) { // 新增字典类型单条数据
  return request({
-    url: '/basic/platform-dict/savePlatformDictData',
+    url: '/api/wms/platform-dict/savePlatformDictData',
    method: 'post',
    data
  })
@@ -41,7 +41,7 @@ export function dataDictionaryDataAdd(data) { // 新增字典类型单条数据

 export function dataDictionaryDataDelete(id) { // 删除字典类型单条数据
  return request({
-    url: '/basic/platform-dict/deletePlatformDictData',
+    url: '/api/wms/platform-dict/deletePlatformDictData',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/dataDictionaryType.js
+++ b/src/api/basicData/dataDictionaryType.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2021-04-16 12:51:29
+ * @LastEditTime: 2022-03-03 15:29:30
 * @Description:
 */
 import request from '@/utils/request'

 export function dataDictionaryTypeList(data) { // 获取字典类型列表
  return request({
-    url: '/basic/platform-dict/selectPlatformDictTypeListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictTypeListByPage',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function dataDictionaryTypeList(data) { // 获取字典类型列表

 export function dataDictionaryTypeDetail(id) { // 获取字典类型单条数据
  return request({
-    url: '/basic/platform-dict/selectDictTypeById',
+    url: '/api/wms/platform-dict/selectDictTypeById',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,7 @@ export function dataDictionaryTypeDetail(id) { // 获取字典类型单条数据

 export function dataDictionaryTypeUpdate(data) { // 更新字典类型单条数据
  return request({
-    url: '/basic/platform-dict/updatePlatformDictType',
+    url: '/api/wms/platform-dict/updatePlatformDictType',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function dataDictionaryTypeUpdate(data) { // 更新字典类型单条数

 export function dataDictionaryTypeAdd(data) { // 新增字典类型单条数据
  return request({
-    url: '/basic/platform-dict/savePlatformDictType',
+    url: '/api/wms/platform-dict/savePlatformDictType',
    method: 'post',
    data
  })
@@ -41,7 +41,7 @@ export function dataDictionaryTypeAdd(data) { // 新增字典类型单条数据

 export function dataDictionaryTypeDelete(id) { // 删除字典类型单条数据
  return request({
-    url: '/basic/platform-dict/deletePlatformDictType',
+    url: '/api/wms/platform-dict/deletePlatformDictType',
    method: 'post',
    data: { id }
  })
--- a/src/api/equipment/maintain.js
+++ b/src/api/equipment/maintain.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2021-01-15 17:42:07
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-12 10:31:01
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 13:52:50
 * @FilePath: \basic-admin\src\api\equipment\maintain.js
 * @Description: 保养计划 & 保养记录 接口定义
 */
@@ -109,7 +109,7 @@ export function getMaintainLog(data) {
 // 获取设备列表
 export function getEqList(data) {
  return request({
-    url: '/basic/equipment/page',
+    url: '/api/wms/equipment/page',
    method: 'post',
    data
  })
--- a/src/api/material-manage/material.js
+++ b/src/api/material-manage/material.js
@@ -1,15 +1,22 @@
+/*
+ * @Author: zwq
+ * @Date: 2021-09-18 16:09:07
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 09:52:41
+ * @Description:
+ */
 import request from '@/utils/request'

 export function list(data) {
  return request({
-    url: 'material/material-date/materialList',
+    url: 'api/process/process-flow-equipment/equipmentList',
    method: 'post',
    data
  })
 }
 export function listEquipment(data) {
  return request({
-    url: 'material/equipment-material-replace/equipmentList',
+    url: 'api/process/process-flow-equipment/equipmentList',
    method: 'post',
    data
  })
--- a/src/api/orderManage/workOrder/workOrder.js
+++ b/src/api/orderManage/workOrder/workOrder.js
@@ -1,15 +1,15 @@
 /*
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-20 10:30:39
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 13:57:00
 * @Description:
 */
 import request from '@/utils/request'

 export function workOrderList(data) { // 获取工单列表
  return request({
-    url: '/order/work-order/page',
+    url: '/api/order/work-order/page',
    method: 'post',
    data
  })
@@ -20,7 +20,7 @@ export function workOrderDetail(id) { // 获取工单单条数据
    'id': id
  }
  return request({
-    url: '/order/work-order/get',
+    url: '/api/order/work-order/get',
    method: 'post',
    data
  })
@@ -28,7 +28,7 @@ export function workOrderDetail(id) { // 获取工单单条数据

 export function workOrderUpdate(data) { // 更新工单单条数据
  return request({
-    url: '/order/work-order/update',
+    url: '/api/order/work-order/update',
    method: 'post',
    data
  })
@@ -36,7 +36,7 @@ export function workOrderUpdate(data) { // 更新工单单条数据

 export function workOrderAdd(data) { // 新增工单单条数据
  return request({
-    url: '/order/work-order/add',
+    url: '/api/order/work-order/add',
    method: 'post',
    data
  })
@@ -44,14 +44,14 @@ export function workOrderAdd(data) { // 新增工单单条数据

 export function workOrderCode() { // 获取工单code
  return request({
-    url: '/order/work-order/get-code',
+    url: '/api/order/work-order/get-code',
    method: 'post'
  })
 }

 export function workOrderDelete(id) { // 删除工单单条数据
  return request({
-    url: '/order/work-order/delete',
+    url: '/api/order/work-order/delete',
    method: 'post',
    data: { id }
  })
@@ -59,7 +59,7 @@ export function workOrderDelete(id) { // 删除工单单条数据

 export function workOrderIssueList(data) { // 获取工单下发列表
  return request({
-    url: '/order/wo-sync/page',
+    url: '/api/order/wo-sync/page',
    method: 'post',
    data
  })
@@ -67,7 +67,7 @@ export function workOrderIssueList(data) { // 获取工单下发列表

 export function packagingBoxList(data) { // 获取包装基板列表
  return request({
-    url: '/order/wo-packaging-box-substrate/page',
+    url: '/api/order/wo-packaging-box-substrate/page',
    method: 'post',
    data
  })
@@ -75,7 +75,7 @@ export function packagingBoxList(data) { // 获取包装基板列表

 export function packagingList(data) { // 获取包装标签列表
  return request({
-    url: '/order/wo-packaging-box/page',
+    url: '/api/order/wo-packaging-box/page',
    method: 'post',
    data
  })
@@ -86,7 +86,7 @@ export function packagingDetail(id) { // 获取包装标签详情
    'id': id
  }
  return request({
-    url: '/order/wo-packaging-box/get',
+    url: '/api/order/wo-packaging-box/get',
    method: 'post',
    data
  })
@@ -94,7 +94,7 @@ export function packagingDetail(id) { // 获取包装标签详情

 export function syncAdd(data) { // 新增下发工单单条数据
  return request({
-    url: '/order/wo-sync/add',
+    url: '/api/order/wo-sync/add',
    method: 'post',
    data
  })
@@ -102,7 +102,7 @@ export function syncAdd(data) { // 新增下发工单单条数据

 export function packagingInventoryList(data) { // 获取包装清单列表
  return request({
-    url: '/order/wo-packaging-box/page-for-inventory',
+    url: '/api/order/wo-packaging-box/page-for-inventory',
    method: 'post',
    data
  })
@@ -110,7 +110,7 @@ export function packagingInventoryList(data) { // 获取包装清单列表

 export function updateForStatus(data) { // 激活
  return request({
-    url: '/order/work-order/updateForStatus',
+    url: '/api/order/work-order/updateForStatus',
    method: 'post',
    data
  })
--- a/src/api/quality-manage/scrap.js
+++ b/src/api/quality-manage/scrap.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2021-03-15 10:27:40
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-09 14:35:26
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 15:40:29
 * @FilePath: \basic-admin\src\api\quality-manage\scrap.js
 * @Description:
 */
@@ -9,7 +9,7 @@ import request from '@/utils/request'

 export function getScrapList(data) {
  return request({
-    url: '/quality/scrap/page',
+    url: '/api/wms/scrap/page',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function getScrapList(data) {

 export function delScrapInfo(data) {
  return request({
-    url: '/quality/scrap/delete',
+    url: '/api/wms/scrap/delete',
    method: 'post',
    data
  })
@@ -25,7 +25,7 @@ export function delScrapInfo(data) {

 export function editScrapInfo(data) {
  return request({
-    url: '/quality/scrap/update',
+    url: '/api/wms/scrap/update',
    method: 'post',
    data
  })
@@ -33,14 +33,14 @@ export function editScrapInfo(data) {

 export function addScrapInfo(data) {
  return request({
-    url: '/quality/scrap/create',
+    url: '/api/wms/scrap/create',
    method: 'post',
    data
  })
 }
 export function getScrapInfo(data) {
  return request({
-    url: '/quality/scrap/findById',
+    url: '/api/wms/scrap/findById',
    method: 'post',
    data
  })
@@ -49,7 +49,7 @@ export function getScrapInfo(data) {
 // 废品报废 原因
 export function getscrapReason(data) {
  return request({
-    url: '/basic/scrap-information/get',
+    url: '/api/wms/scrap-information/get',
    method: 'post',
    data
  })
@@ -58,7 +58,7 @@ export function getscrapReason(data) {
 // 根据设备id查询肺片等级
 export function getScrap(id) {
  return request({
-    url: '/basic/equipment-scraps-grade/getScrapsGradeByEquipmentId',
+    url: '/api/wms/equipment-scraps-grade/getScrapsGradeByEquipmentId',
    method: 'post',
    data: { id }
  })
--- a/src/api/quality-manage/scrapCategoryStatistics.js
+++ b/src/api/quality-manage/scrapCategoryStatistics.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2021-03-15 10:27:40
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-09 14:35:26
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 15:40:35
 * @FilePath: \basic-admin\src\api\quality-manage\scrap.js
 * @Description:
 */
@@ -9,7 +9,7 @@ import request from '@/utils/request'

 export function getList(data) {
  return request({
-    url: '/quality/scrap/findReportByEquipmentId',
+    url: '/api/wms/scrap/findReportByEquipmentId',
    method: 'post',
    data
  })
@@ -18,7 +18,7 @@ export function getList(data) {
 // 废品报废 原因
 export function getscrapReason(data) {
  return request({
-    url: '/basic/scrap-information/get',
+    url: '/api/wms/scrap-information/get',
    method: 'post',
    data
  })