Merge pull request '修改菜单，增加质量管理' (#26 ) from zwq into develop

Reviewed-on: #26
修改菜单，增加质量管理
2022-03-03 16:15:37 +08:00 · 2022-03-03 16:15:01 +08:00 · 2022-03-02 11:04:49 +08:00 · 2022-03-02 11:03:56 +08:00 · 2022-02-28 10:59:14 +08:00 · 2022-02-28 10:58:51 +08:00
42 changed files with 576 additions and 304 deletions
--- a/src/api/art-manage/art.js
+++ b/src/api/art-manage/art.js
@@ -2,42 +2,42 @@ import request from '@/utils/request'

 export function list(data) {
  return request({
-    url: '/process/process-flow/page',
+    url: '/api/process/process-flow/page',
    method: 'post',
    data
  })
 }
 export function getInfo(data) {
  return request({
-    url: '/process/process-flow/get',
+    url: '/api/process/process-flow/get',
    method: 'post',
    data
  })
 }
 export function enabled(data) {
  return request({
-    url: '/process/process-flow/enabled',
+    url: '/api/process/process-flow/enabled',
    method: 'post',
    data
  })
 }
 export function del(data) {
  return request({
-    url: '/process/process-flow/delete',
+    url: '/api/process/process-flow/delete',
    method: 'post',
    data
  })
 }
 export function update(data) {
  return request({
-    url: '/process/process-flow/update',
+    url: '/api/process/process-flow/update',
    method: 'post',
    data
  })
 }
 export function add(data) {
  return request({
-    url: '/process/process-flow/add',
+    url: '/api/process/process-flow/add',
    method: 'post',
    data
  })
@@ -45,7 +45,7 @@ export function add(data) {
 // 获取基板列表
 export function listSubstrate(data) {
  return request({
-    url: '/process/process-flow/substrateList',
+    url: '/api/process/process-flow/substrateList',
    method: 'post',
    data
  })
@@ -53,7 +53,7 @@ export function listSubstrate(data) {
 // 获取BOM列表
 export function listBom(data) {
  return request({
-    url: '/process/process-flow/bomList',
+    url: '/api/process/process-flow/bomList',
    method: 'post',
    data
  })
@@ -70,7 +70,7 @@ export function listEquipmentBom(data) {
 // 获取所有设备的bom
 export function listAllEquipmentBom(data) {
  return request({
-    url: '/process/process-flow-equipment/allEquipmentBomList',
+    url: '/api/process/process-flow-equipment/allEquipmentBomList',
    method: 'post',
    data
  })
@@ -86,7 +86,7 @@ export function listEquipmentRecipe(data) {
 // 获取所有设备下的配方
 export function listAllEquipmentRecipe(data) {
  return request({
-    url: '/process/process-flow-equipment/allEquipmentRecipeList',
+    url: '/api/process/process-flow-equipment/allEquipmentRecipeList',
    method: 'post',
    data
  })
@@ -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
  })
@@ -102,7 +102,7 @@ export function addProcessFlows(data) {
 // 获取工艺流程下所有节点
 export function listProcessFlowNode(data) {
  return request({
-    url: '/process/process-flow-equipment/list',
+    url: '/api/process/process-flow-equipment/list',
    method: 'post',
    data
  })
@@ -111,7 +111,7 @@ export function listProcessFlowNode(data) {
 // 获取工序列表
 export function listProcess(data) {
  return request({
-    url: '/process/work-sequence/list',
+    url: '/api/process/work-sequence/list',
    method: 'post',
    data
  })
@@ -120,7 +120,7 @@ export function listProcess(data) {
 // 获取工艺自动code
 export function getCode() {
  return request({
-    url: '/process/process-flow/getCode',
+    url: '/api/process/process-flow/getCode',
    method: 'post'
  })
 }
--- a/src/api/art-manage/process.js
+++ b/src/api/art-manage/process.js
@@ -1,8 +1,8 @@
 /*
 * @Author: gtz
 * @Date: 2021-04-06 20:20:10
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-07 16:14:47
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-02-25 09:04:24
 * @Description: file content
 */

@@ -10,7 +10,7 @@ import request from '@/utils/request'

 export function list(data) {
  return request({
-    url: '/process/work-sequence/page',
+    url: '/api/process/work-sequence/page',
    method: 'post',
    data
  })
@@ -18,7 +18,7 @@ export function list(data) {

 export function getInfo(data) {
  return request({
-    url: '/process/work-sequence/get',
+    url: '/api/process/work-sequence/get',
    method: 'post',
    data
  })
@@ -26,7 +26,7 @@ export function getInfo(data) {

 export function del(data) {
  return request({
-    url: '/process/work-sequence/delete',
+    url: '/api/process/work-sequence/delete',
    method: 'post',
    data
  })
@@ -34,7 +34,7 @@ export function del(data) {

 export function update(data) {
  return request({
-    url: '/process/work-sequence/update',
+    url: '/api/process/work-sequence/update',
    method: 'post',
    data
  })
@@ -42,7 +42,7 @@ export function update(data) {

 export function add(data) {
  return request({
-    url: '/process/work-sequence/add',
+    url: '/api/process/work-sequence/add',
    method: 'post',
    data
  })
--- a/src/api/basicData/Cache/area.js
+++ b/src/api/basicData/Cache/area.js
@@ -9,7 +9,7 @@ import request from '@/utils/request'

 export function areaList(data) { // 获取缓存区区域信息列表
  return request({
-    url: '/api/wms/area/shelf',
+    url: '/api/wms/area/page',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function areaList(data) { // 获取缓存区区域信息列表

 export function areaDetail(id) { // 获取缓存区区域信息单条数据
  return request({
-    url: '/api/wms/area/get',
+    url: '/api/wms/area/getById',
    method: 'post',
    data: { id }
  })
@@ -41,7 +41,7 @@ export function areaAdd(data) { // 新增缓存区区域信息单条数据

 export function areaCode() { // 获取缓存区区域信息code
  return request({
-    url: '/api/wms/area/get-code',
+    url: '/api/wms/area/getCode',
    method: 'post'
  })
 }
--- a/src/api/basicData/Cache/cache.js
+++ b/src/api/basicData/Cache/cache.js
@@ -41,7 +41,7 @@ export function cacheAdd(data) { // 新增缓存区信息单条数据

 export function cacheCode() { // 获取缓存区信息code
  return request({
-    url: '/api/wms/area/get-code',
+    url: '/api/wms/area/getCode',
    method: 'post'
  })
 }
--- a/src/api/basicData/Cache/shelf.js
+++ b/src/api/basicData/Cache/shelf.js
@@ -9,7 +9,7 @@ import request from '@/utils/request'

 export function shelfList(data) { // 获取货架信息列表
  return request({
-    url: '/basic/shelf/page',
+    url: '/api/wms/area/shelf',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function shelfList(data) { // 获取货架信息列表

 export function shelfDetail(id) { // 获取货架信息单条数据
  return request({
-    url: '/basic/shelf/get',
+    url: '/api/wms/area/shelfById',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,8 @@ export function shelfDetail(id) { // 获取货架信息单条数据

 export function shelfUpdate(data) { // 更新货架信息单条数据
  return request({
-    url: '/basic/shelf/update',
+    // url: '/basic/shelf/update',
+    url: '/api/wms/area/updateshelf',
    method: 'post',
    data
  })
@@ -33,7 +34,7 @@ export function shelfUpdate(data) { // 更新货架信息单条数据

 export function shelfAdd(data) { // 新增货架信息单条数据
  return request({
-    url: '/basic/shelf/add',
+    url: '/api/wms/area/addshelf',
    method: 'post',
    data
  })
@@ -41,14 +42,14 @@ export function shelfAdd(data) { // 新增货架信息单条数据

 export function shelfCode() { // 获取货架信息code
  return request({
-    url: '/basic/shelf/get-code',
+    url: '/api/wms/area/getCode',
    method: 'post'
  })
 }

 export function shelfDelete(id) { // 删除货架信息单条数据
  return request({
-    url: '/basic/shelf/delete',
+    url: '/api/wms/area/deleteshelf',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/Cache/storageBox.js
+++ b/src/api/basicData/Cache/storageBox.js
@@ -41,7 +41,7 @@ export function storageBoxAdd(data) { // 新增存储箱单条数据

 export function storageBoxCode() { // 获取存储箱code
  return request({
-    url: '/api/wms/storagebox/get-code',
+    url: '/api/wms/storagebox/getCode',
    method: 'post'
  })
 }
@@ -56,7 +56,7 @@ export function storageBoxDelete(id) { // 删除存储箱单条数据

 export function PositionDetailInfoAdd(data) { // 新增存储箱地址单条数据
  return request({
-    url: '/api/wms/storagebox-site/add',
+    url: '/api/wms/storagebox/add',
    method: 'post',
    data
  })
--- a/src/api/basicData/Equipment/equipmentGroup.js
+++ b/src/api/basicData/Equipment/equipmentGroup.js
@@ -10,7 +10,8 @@ import request from '@/utils/request'

 export function equipmentGroupList(data) { // 获取设备分组列表
  return request({
-    url: '/equipment/equipment-group/findAll',
+    // url: '/equipment/equipment-group/findAll',
+    url: '/api/wms/equipment/page',
    method: 'post',
    data
  })
--- a/src/api/basicData/Equipment/equipmentInfo.js
+++ b/src/api/basicData/Equipment/equipmentInfo.js
@@ -41,7 +41,7 @@ export function equipmentInfoAdd(data) { // 新增设备信息单条数据

 export function equipmentInfoCode() { // 获取设备信息code
  return request({
-    url: '/api/wms/equipment/get-code',
+    url: '/api/wms/equipment/getCode',
    method: 'post'
  })
 }
@@ -64,8 +64,10 @@ export function equipmentInfoFileAdd(data) { // 设备信息上传

 export function getEquipmentInfoFile(data) { // 设备信息下载
  return request({
-    url: '/api/wms/equipment-file/get-by-param',
-    method: 'post',
+    // url: '/api/wms/equipment-file/get-by-param',
+    url: '/api/common/attachment/downloadFile',
+    // method: 'post',
+    method: 'get',
    data
  })
 }
--- a/src/api/basicData/Equipment/equipmentInfoAttr.js
+++ b/src/api/basicData/Equipment/equipmentInfoAttr.js
@@ -9,7 +9,8 @@ import request from '@/utils/request'

 export function equipmentInfoAttrList(data) { // 获取设备属性列表
  return request({
-    url: '/basic/equipment-attr/page',
+    // url: '/basic/equipment-attr/page',
+    url: '/api/wms/equipment/page',
    method: 'post',
    data
  })
@@ -17,7 +18,8 @@ export function equipmentInfoAttrList(data) { // 获取设备属性列表

 export function equipmentInfoAttrDetail(id) { // 获取设备属性单条数据
  return request({
-    url: '/basic/equipment-attr/get',
+    // url: '/basic/equipment-attr/get',
+    url: '/api/wms/equipment/attrById',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/Equipment/equipmentType.js
+++ b/src/api/basicData/Equipment/equipmentType.js
@@ -9,7 +9,8 @@ import request from '@/utils/request'

 export function equipmentTypeList(data) { // 获取设备类型列表
  return request({
-    url: '/basic/equipment-type/page',
+    // url: '/basic/equipment-type/page',
+    url: '/api/wms/equipment/page',
    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/Materials/material.js
+++ b/src/api/basicData/Materials/material.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2021-01-15 16:03:31
+ * @LastEditTime: 2022-02-24 08:57:40
 * @Description:
 */
 import request from '@/utils/request'

 export function materialList(data) { // 获取物料信息列表
  return request({
-    url: '/basic/material/page',
+    url: '/api/wms/material/page',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function materialList(data) { // 获取物料信息列表

 export function materialDetail(id) { // 获取物料信息单条数据
  return request({
-    url: '/basic/material/get',
+    url: '/api/wms/material/get',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,7 @@ export function materialDetail(id) { // 获取物料信息单条数据

 export function materialUpdate(data) { // 更新物料信息单条数据
  return request({
-    url: '/basic/material/update',
+    url: '/api/wms/material/update',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function materialUpdate(data) { // 更新物料信息单条数据

 export function materialAdd(data) { // 新增物料信息单条数据
  return request({
-    url: '/basic/material/add',
+    url: '/api/wms/material/add',
    method: 'post',
    data
  })
@@ -41,14 +41,14 @@ export function materialAdd(data) { // 新增物料信息单条数据

 export function materialCode() { // 获取物料信息code
  return request({
-    url: '/basic/material/get-code',
+    url: '/api/wms/material/get-code',
    method: 'post'
  })
 }

 export function materialDelete(id) { // 删除物料信息单条数据
  return request({
-    url: '/basic/material/delete',
+    url: '/api/wms/material/delete',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/Materials/materialAttr.js
+++ b/src/api/basicData/Materials/materialAttr.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2021-01-16 12:09:29
+ * @LastEditTime: 2022-02-24 14:46:16
 * @Description:
 */
 import request from '@/utils/request'

 export function materialAttrList(data) { // 获取物料属性列表
  return request({
-    url: '/basic/material-attr/page',
+    url: '/api/wms/material-attr/page',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function materialAttrList(data) { // 获取物料属性列表

 export function materialAttrDetail(id) { // 获取物料属性单条数据
  return request({
-    url: '/basic/material-attr/get',
+    url: '/api/wms/material-attr/get',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,7 @@ export function materialAttrDetail(id) { // 获取物料属性单条数据

 export function materialAttrUpdate(data) { // 更新物料属性单条数据
  return request({
-    url: '/basic/material-attr/update',
+    url: '/api/wms/material-attr/update',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function materialAttrUpdate(data) { // 更新物料属性单条数据

 export function materialAttrAdd(data) { // 新增物料属性单条数据
  return request({
-    url: '/basic/material-attr/add',
+    url: '/api/wms/material-attr/add',
    method: 'post',
    data
  })
@@ -41,14 +41,14 @@ export function materialAttrAdd(data) { // 新增物料属性单条数据

 export function materialAttrCode() { // 获取物料属性code
  return request({
-    url: '/basic/material-attr/get-code',
+    url: '/api/wms/material-attr/get-code',
    method: 'post'
  })
 }

 export function materialAttrDelete(id) { // 删除物料属性单条数据
  return request({
-    url: '/basic/material-attr/delete',
+    url: '/api/wms/material-attr/delete',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/Materials/materialsType.js
+++ b/src/api/basicData/Materials/materialsType.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2021-01-16 11:52:14
+ * @LastEditTime: 2022-02-24 14:46:20
 * @Description:
 */
 import request from '@/utils/request'

 export function materialsTypeList(data) { // 获取物料类型列表
  return request({
-    url: '/basic/material-type/page',
+    url: '/api/wms/material-type/page',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function materialsTypeList(data) { // 获取物料类型列表

 export function materialsTypeDetail(id) { // 获取物料类型单条数据
  return request({
-    url: '/basic/material-type/get',
+    url: '/api/wms/material-type/get',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,7 @@ export function materialsTypeDetail(id) { // 获取物料类型单条数据

 export function materialsTypeUpdate(data) { // 更新物料类型单条数据
  return request({
-    url: '/basic/material-type/update',
+    url: '/api/wms/material-type/update',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function materialsTypeUpdate(data) { // 更新物料类型单条数据

 export function materialsTypeAdd(data) { // 新增物料类型单条数据
  return request({
-    url: '/basic/material-type/add',
+    url: '/api/wms/material-type/add',
    method: 'post',
    data
  })
@@ -41,14 +41,14 @@ export function materialsTypeAdd(data) { // 新增物料类型单条数据

 export function materialsTypeCode() { // 获取物料类型code
  return request({
-    url: '/basic/material-type/get-code',
+    url: '/api/wms/material-type/get-code',
    method: 'post'
  })
 }

 export function materialsTypeDelete(id) { // 删除物料类型单条数据
  return request({
-    url: '/basic/material-type/delete',
+    url: '/api/wms/material-type/delete',
    method: 'post',
    data: { id }
  })
--- 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/dict/index.js
+++ b/src/api/dict/index.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2021-01-21 18:08:29
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-12 10:11:14
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-02-24 14:55:06
 * @FilePath: \basic-admin\src\api\dict\index.js
 * @Description: 数据字典定义
 */
@@ -11,7 +11,7 @@ import { requestWithCache } from '@/utils/request'
 // 获取设备列表列表
 export function getDictDevice(data) {
  return requestWithCache({
-    url: '/basic/equipment/page',
+    url: '/api/wms/equipment/page',
    method: 'post',
    data
  }).then(res => {
@@ -41,7 +41,7 @@ export function getDictDeviceType(data) {
 // 获取物料列表
 export function getDictBom(data) {
  return requestWithCache({
-    url: '/basic/material/page',
+    url: '/api/wms/material/page',
    method: 'post',
    data
  }).then(res => {
@@ -71,7 +71,7 @@ export function getDictSupplier(data) {
 // 获取单位列表
 export function getDictUnit(data) {
  return requestWithCache({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
    method: 'post',
    data: {
      current: 1,
@@ -105,7 +105,7 @@ export function getDictMaterial(data) {
 // 获取维修类型
 export function getDictRepairType(data) {
  return requestWithCache({
-    url: '/basic/maintenance-type/page',
+    url: '/api/wms/maintenance-type/page',
    method: 'post',
    data: {
      current: 1,
@@ -129,7 +129,7 @@ export function getDictRepairType(data) {
 // 获取员工列表
 export function getDictWorker() {
  return requestWithCache({
-    url: '/basic/worker/page',
+    url: '/api/wms/worker/page',
    method: 'post',
    data: {
      current: 1,
@@ -153,7 +153,7 @@ export function getDictWorker() {
 // 获取基础备品备件列表
 export function getDictSparepart(data) {
  return requestWithCache({
-    url: '/basic/tool-spare-part/page',
+    url: '/api/wms/tool-spare-part/page',
    method: 'post',
    data: {
      current: 1,
@@ -176,7 +176,7 @@ export function getDictSparepart(data) {
 // 获取备件型号
 export function getDictModel(data) {
  return requestWithCache({
-    url: '/basic/tool-spare-part/list',
+    url: '/api/wms/tool-spare-part/list',
    method: 'post',
    data: {
      current: 1,
@@ -200,7 +200,7 @@ export function getDictModel(data) {
 // 质量---报废： 报废原因
 export function scrapReasonList(data) {
  return requestWithCache({
-    url: '/basic/scrap-information/page',
+    url: '/api/wms/scrap-information/page',
    method: 'post',
    data: {
      current: 1,
@@ -250,7 +250,7 @@ export function faultLevelList(data) {
 // 获取保养周期
 export function maintainPeriod(data) {
  return requestWithCache({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
    method: 'post',
    data: {
      current: 1,
@@ -327,7 +327,7 @@ export function equipmentTypeParam(id) {

 export function statusList(id) {
  return requestWithCache({
-    url: '/basic/configure-display/page',
+    url: '/api/wms/configure-display/page',
    method: 'post',
    data: {
      current: 1,
@@ -350,7 +350,7 @@ export function statusList(id) {
 // 获取角色列表
 export function workerRoleList() {
  return requestWithCache({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
    method: 'post',
    data: {
      dictTypeId: '1383318968677273601',
--- a/src/api/equipment/bom.js
+++ b/src/api/equipment/bom.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2021-01-05 15:25:38
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-21 13:26:36
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-02-24 14:48:53
 * @FilePath: \basic-admin\src\api\equipment\bom.js
 * @Description: 设备管理——设备物料bom管理 接口定义
 */
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取物料bom列表
 export function getBOMList(data) {
  return request({
-    url: '/equipment/equipment-bom/findAllByEQNameOrEQCodeOrMaterialNameWithPage',
+    url: '/api/wms/equipment-bom/findAllByEQNameOrEQCodeOrMaterialNameWithPage',
    method: 'post',
    data
  })
@@ -19,7 +19,7 @@ export function getBOMList(data) {
 // 新增物料bom
 export function addBOM(data) {
  return request({
-    url: '/equipment/equipment-bom/create',
+    url: '/api/wms/equipment-bom/create',
    method: 'post',
    data
  })
@@ -28,7 +28,7 @@ export function addBOM(data) {
 // 修改物料bom
 export function editBOM(data) {
  return request({
-    url: '/equipment/equipment-bom/update',
+    url: '/api/wms/equipment-bom/update',
    method: 'post',
    data
  })
@@ -37,7 +37,7 @@ export function editBOM(data) {
 // 删除物料bom
 export function delBOM(data) {
  return request({
-    url: '/equipment/equipment-bom/delete',
+    url: '/api/wms/equipment-bom/delete',
    method: 'post',
    data
  })
@@ -46,7 +46,7 @@ export function delBOM(data) {
 // 根据id获取物料bom
 export function getBOMInfo(data) {
  return request({
-    url: '/equipment/equipment-bom/findById',
+    url: '/api/wms/equipment-bom/findById',
    method: 'post',
    data
  })
@@ -55,7 +55,7 @@ export function getBOMInfo(data) {
 // 获取设备物料bom列表
 export function getDeviceBOMList(data) {
  return request({
-    url: '/equipment/equipment-bom-detail/findAllByEQBomIdWithPage',
+    url: '/api/wms/equipment-bom-detail/findAllByEQBomIdWithPage',
    method: 'post',
    data
  })
@@ -64,7 +64,7 @@ export function getDeviceBOMList(data) {
 // 新增设备物料bom
 export function addDeviceBOM(data) {
  return request({
-    url: '/equipment/equipment-bom-detail/create',
+    url: '/api/wms/equipment-bom-detail/create',
    method: 'post',
    data
  })
@@ -73,7 +73,7 @@ export function addDeviceBOM(data) {
 // 修改设备物料bom
 export function editDeviceBOM(data) {
  return request({
-    url: '/equipment/equipment-bom-detail/update',
+    url: '/api/wms/equipment-bom-detail/update',
    method: 'post',
    data
  })
@@ -82,7 +82,7 @@ export function editDeviceBOM(data) {
 // 删除设备物料bom
 export function delDeviceBOM(data) {
  return request({
-    url: '/equipment/equipment-bom-detail/delete',
+    url: '/api/wms/equipment-bom-detail/delete',
    method: 'post',
    data
  })
@@ -91,7 +91,7 @@ export function delDeviceBOM(data) {
 // 根据id获取设备物料bom详细
 export function getDeviceBOMInfo(data) {
  return request({
-    url: '/equipment/equipment-bom-detail/findById',
+    url: '/api/wms/equipment-bom-detail/findById',
    method: 'post',
    data
  })
@@ -101,7 +101,7 @@ export function getDeviceBOMInfo(data) {

 export function getMaterialList(data) {
  return request({
-    url: '/basic/material/page',
+    url: '/api/wms/material/page',
    method: 'post',
    data
  })
--- 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/equipment/recipe.js
+++ b/src/api/equipment/recipe.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2021-01-28 15:01:57
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-20 10:50:48
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-02-24 14:49:42
 * @FilePath: \basic-admin\src\api\equipment\recipe.js
 * @Description: 设备配方设置
 */
@@ -11,7 +11,7 @@ import request from '@/utils/request'
 // 获取设备配方CODE
 export function getDeviceRecipeCode(data) {
  return request({
-    url: '/equipment/equipment-recipe/getEquipmentRecipeCode',
+    url: '/api/wms/equipment-recipe/getEquipmentRecipeCode',
    method: 'post',
    data
  })
@@ -20,7 +20,7 @@ export function getDeviceRecipeCode(data) {
 // 获取设备配方列表
 export function getDeviceRecipeList(data) {
  return request({
-    url: '/equipment/equipment-recipe/findAllByEquipmentTypeAndRecipeName',
+    url: '/api/wms/equipment-recipe/findAllByEquipmentTypeAndRecipeName',
    method: 'post',
    data
  })
@@ -29,7 +29,7 @@ export function getDeviceRecipeList(data) {
 // 新建设备配方
 export function addDeviceRecipe(data) {
  return request({
-    url: '/equipment/equipment-recipe/create',
+    url: '/api/wms/equipment-recipe/create',
    method: 'post',
    data
  })
@@ -38,7 +38,7 @@ export function addDeviceRecipe(data) {
 // 编辑设备配方
 export function editDeviceRecipe(data) {
  return request({
-    url: '/equipment/equipment-recipe/update',
+    url: '/api/wms/equipment-recipe/update',
    method: 'post',
    data
  })
@@ -47,7 +47,7 @@ export function editDeviceRecipe(data) {
 // 删除设备配方
 export function delDeviceRecipe(data) {
  return request({
-    url: '/equipment/equipment-recipe/delete',
+    url: '/api/wms/equipment-recipe/delete',
    method: 'post',
    data
  })
@@ -56,7 +56,7 @@ export function delDeviceRecipe(data) {
 // 获取设备配方
 export function getDeviceRecipe(data) {
  return request({
-    url: '/equipment/equipment-recipe/findById',
+    url: '/api/wms/equipment-recipe/findById',
    method: 'post',
    data
  })
@@ -65,7 +65,7 @@ export function getDeviceRecipe(data) {
 // 根据id获取设备配方参数列表
 export function getDeviceRecipeParamList(data) {
  return request({
-    url: '/equipment/equipment-recipe-parameter/findAllByRecipeIdWithPage',
+    url: '/api/wms/equipment-recipe-parameter/findAllByRecipeIdWithPage',
    method: 'post',
    data
  })
@@ -74,7 +74,7 @@ export function getDeviceRecipeParamList(data) {
 // 新增设备配方参数
 export function addDeviceRecipeParam(data) {
  return request({
-    url: '/equipment/equipment-recipe-parameter/create',
+    url: '/api/wms/equipment-recipe-parameter/create',
    method: 'post',
    data
  })
@@ -83,7 +83,7 @@ export function addDeviceRecipeParam(data) {
 // 修改设备配方参数
 export function editDeviceRecipeParam(data) {
  return request({
-    url: '/equipment/equipment-recipe-parameter/update',
+    url: '/api/wms/equipment-recipe-parameter/update',
    method: 'post',
    data
  })
@@ -92,7 +92,7 @@ export function editDeviceRecipeParam(data) {
 // 删除设备配方参数
 export function delDeviceRecipeParam(data) {
  return request({
-    url: '/equipment/equipment-recipe-parameter/delete',
+    url: '/api/wms/equipment-recipe-parameter/delete',
    method: 'post',
    data
  })
@@ -101,7 +101,7 @@ export function delDeviceRecipeParam(data) {
 // 获取设备配方参数详细 (等待接口补全)
 export function getDeviceRecipeParam(data) {
  return request({
-    url: '/equipment/equipment-recipe-parameter/findById',
+    url: '/api/wms/equipment-recipe-parameter/findById',
    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
  })
--- a/src/api/report-manage/formSort.js
+++ b/src/api/report-manage/formSort.js
@@ -1,15 +1,15 @@
 /*
 * @Author: gtz
 * @Date: 2021-04-01 09:24:20
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-16 13:24:51
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-02-25 09:06:19
 * @Description: file content
 */
 import request from '@/utils/request'

 export function page(data) {
  return request({
-    url: '/report/report-sheet-category/page',
+    url: '/api/report/report-sheet-category/page',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function page(data) {

 export function list(data) {
  return request({
-    url: '/report/report-sheet-category/list',
+    url: '/api/report/report-sheet-category/list',
    method: 'post',
    data
  })
@@ -25,7 +25,7 @@ export function list(data) {

 export function del(data) {
  return request({
-    url: '/report/report-sheet-category/delete',
+    url: '/api/report/report-sheet-category/delete',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function del(data) {

 export function update(data) {
  return request({
-    url: '/report/report-sheet-category/update',
+    url: '/api/report/report-sheet-category/update',
    method: 'post',
    data
  })
@@ -41,7 +41,7 @@ export function update(data) {

 export function add(data) {
  return request({
-    url: '/report/report-sheet-category/add',
+    url: '/api/report/report-sheet-category/add',
    method: 'post',
    data
  })
@@ -49,7 +49,7 @@ export function add(data) {

 export function getData(data) {
  return request({
-    url: '/report/report-sheet-category/get',
+    url: '/api/report/report-sheet-category/get',
    method: 'post',
    data
  })
--- a/src/api/report-manage/report.js
+++ b/src/api/report-manage/report.js
@@ -1,15 +1,15 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-07 18:39:03
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-22 20:03:49
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-02-25 09:05:53
 * @Description: file content
 */
 import request from '@/utils/request'

 export function page(data) {
  return request({
-    url: '/report/report-sheet/page',
+    url: '/api/report/report-sheet/page',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function page(data) {

 export function del(data) {
  return request({
-    url: '/report/report-sheet/delete',
+    url: '/api/report/report-sheet/delete',
    method: 'post',
    data
  })
@@ -25,7 +25,7 @@ export function del(data) {

 export function getInfo(data) {
  return request({
-    url: '/report/report-sheet/get',
+    url: '/api/report/report-sheet/get',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function getInfo(data) {

 export function update(data) {
  return request({
-    url: '/report/report-sheet/update',
+    url: '/api/report/report-sheet/update',
    method: 'post',
    data
  })
@@ -42,7 +42,7 @@ export function update(data) {
 // 报表分类列表
 export function listCategory(data) {
  return request({
-    url: '/report/report-sheet-category/list',
+    url: '/api/report/report-sheet-category/list',
    method: 'post',
    data
  })
--- a/src/lang/i18n.js
+++ b/src/lang/i18n.js
@@ -952,6 +952,18 @@ export default {
        zh: '质量检测计划',
        en: 'Quality Detect Plan'
      },
+      scrapManagement: {
+        zh: '废片管理',
+        en: 'Scrap management',
+        gradeInfo: {
+          zh: '等级信息',
+          en: 'Grade Info'
+        },
+        scrapInfo: {
+          zh: '废片信息',
+          en: 'Scrap Info'
+        }
+      },
      knowledge: {
        zh: '维护保养知识库',
        en: 'Maintain the knowledge base'
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -149,8 +149,7 @@ export const constantRoutes = [
      },
      {
        path: 'equipmentInfo',
-        component: () =>
-              import('@/views/basicData/Equipment/equipmentInfo'),
+        component: () => import('@/views/basicData/Equipment/equipmentInfo'),
        name: 'equipmentInfo',
        meta: { title: routerTitle.basicData.equipment.equipmentInfo?.[language] || routerTitle.basicData.equipment.equipmentInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
      },
@@ -160,6 +159,80 @@ export const constantRoutes = [
        name: 'equipmentInfoAdd',
        hidden: true,
        meta: { title: routerTitle.basicData.equipment.equipmentInfoAdd?.[language] || routerTitle.basicData.equipment.equipmentInfoAdd.en, icon: 'form', affix: true, required: true, requireToken: true }
+      },
+      {
+        path: '/Materials',
+        component: () => import('@/views/basicData/index'),
+        name: 'Materials',
+        meta: { title: routerTitle.basicData.materials?.[language] || routerTitle.basicData.materials.en, icon: 'form', affix: true, required: true, requireToken: true },
+        children: [
+          {
+            path: 'Material',
+            component: () => import('@/views/basicData/Materials/material'),
+            name: 'Material',
+            meta: { title: routerTitle.basicData.materials.material?.[language] || routerTitle.basicData.materials.material.en, icon: 'form', affix: true, required: true, requireToken: true }
+          },
+          {
+            path: 'MaterialAdd',
+            component: () => import('@/views/basicData/Materials/components/material-add'),
+            name: 'MaterialAdd',
+            hidden: true,
+            meta: { title: routerTitle.basicData.materials.MaterialAdd?.[language] || routerTitle.basicData.materials.MaterialAdd.en, icon: 'form', affix: true, required: true, requireToken: true }
+          },
+          {
+            path: 'MaterialsType',
+            component: () =>
+              import('@/views/basicData/Materials/materialsType'),
+            name: 'MaterialsType',
+            meta: { title: routerTitle.basicData.materials.materialType?.[language] || routerTitle.basicData.materials.materialType.en, icon: 'form', affix: true, required: true, requireToken: true }
+          }
+        ]
+      },
+      {
+        path: '/dataDictionary',
+        component: () => import('@/views/basicData/index'),
+        name: 'dataDictionary',
+        meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true },
+        children: [{
+          path: 'dataDictionary',
+          component: () => import('@/views/basicData/dataDictionary'),
+          name: 'dataDictionary',
+          meta: { title: routerTitle.basicData.dataDictionaryType?.[language] || routerTitle.basicData.dataDictionaryType.en, icon: 'form', affix: true, required: true, requireToken: true }
+        }, {
+          path: 'dataDictionaryData',
+          component: () => import('@/views/basicData/components/dataDictionaryData'),
+          hidden: true,
+          name: 'dataDictionaryData',
+          meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true }
+        }]
+      }
+    ]
+  },
+  {
+    path: '/art',
+    component: Layout,
+    redirect: '/art/list',
+    name: 'ArtManager',
+    meta: { title: routerTitle.technology?.[language] || routerTitle.technology.en, icon: 'form', iconPart: 'ArtManager', affix: true, required: true, requireToken: true },
+    children: [
+      {
+        path: 'list',
+        component: () => import('@/views/art/list'),
+        name: 'ArtList',
+        meta: { title: routerTitle.technology.technologylist?.[language] || routerTitle.technology.technologylist.en, icon: 'form', affix: true, required: true, requireToken: true }
+      },
+      {
+        path: 'process',
+        component: () => import('@/views/art/process/list'),
+        name: 'Process',
+        meta: { title: routerTitle.technology.technologyprocess?.[language] || routerTitle.technology.technologyprocess.en, icon: 'form', affix: true, required: true, requireToken: true },
+        hidden: true
+      },
+      {
+        path: 'processList',
+        component: () => import('@/views/art/processList'),
+        name: 'Process',
+        meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true }
      }
    ]
  },
@@ -246,104 +319,92 @@ export const constantRoutes = [
    component: Layout,
    redirect: '/quality',
    name: 'qualityManage',
-    hidden: true,
    meta: { title: routerTitle.quality?.[language] || routerTitle.quality.en, icon: 'form', iconPart: 'qualityManage', affix: true, required: true, requireToken: true },
    children: [
-      {
-        path: 'scrap',
-        component: () => import('@/views/QualityManager/scrap'),
-        name: 'scrapManage',
-        meta: { title: routerTitle.quality.scrap?.[language] || routerTitle.quality.scrap.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true }
-      },
-      {
-        path: 'scrapcategorystatistics',
-        component: () => import('@/views/QualityManager/scrap/scrapCategoryStatistics'),
-        name: 'scrapCategoryStatistics',
-        meta: { title: routerTitle.quality.scrapcategorystatistics?.[language] || routerTitle.quality.scrapcategorystatistics.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true }
-      },
      {
        path: 'plan',
-        component: () => import('@/views/QualityManager/plan'),
+        component: () => import('@/views/QualityManager/QCPplan'),
        name: 'PlanManage',
        meta: { title: routerTitle.quality.plan?.[language] || routerTitle.quality.plan.en, icon: 'form', affix: true }
-      }, {
-        path: 'planparam',
-        component: () => import('@/views/QualityManager/plan/subpage/detail'),
-        name: 'PlanParamManage',
-        hidden: true,
-        meta: { title: routerTitle.quality.planform?.[language] || routerTitle.quality.planform.en, icon: 'form', affix: true }
-      }, {
-        path: 'issue',
-        component: () => import('@/views/QualityManager/plan/issuedplan'),
-        name: 'PlanIssuedManage',
-        meta: { title: routerTitle.quality.issuedplan?.[language] || routerTitle.quality.issuedplan.en, icon: 'form', affix: true }
      },
      {
        path: '/offlineDetec',
        component: () => import('@/views/basicData/index'),
        name: 'offlineDetec',
-        meta: { title: routerTitle.quality.offlineDetec?.[language] || routerTitle.quality.offlineDetec.en, icon: 'form', affix: true, required: true, requireToken: true },
+        meta: { title: routerTitle.quality.scrapManagement?.[language] || routerTitle.quality.scrapManagement.en, icon: 'form', affix: true, required: true, requireToken: true },
        children: [
          {
-            path: 'detecParam',
-            component: () =>
-              import('@/views/QualityManager/offlineDetec/detecParam'),
-            name: 'detecParam',
-            hidden: true,
-            meta: { title: routerTitle.quality.offlineDetec.detecParam?.[language] || routerTitle.quality.offlineDetec.detecParam.detecParam.en, icon: 'form', affix: true, required: true, requireToken: true }
+            path: 'ScrapInfo',
+            component: () => import('@/views/basicData/Scrap/ScrapInfo'),
+            name: 'ScrapInfo',
+            meta: { title: routerTitle.basicData.scrap.scrapInfo?.[language] || routerTitle.basicData.scrap.scrapInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
          },
          {
-            path: 'detecParamAdd',
-            component: () =>
-              import('@/views/QualityManager/offlineDetec/components/detecParam-add'),
-            name: 'detecParamAdd',
-            hidden: true,
-            meta: { title: routerTitle.quality.offlineDetec.detecParam?.[language] || routerTitle.quality.offlineDetec.detecParam.detecParam.en, icon: 'form', affix: true, required: true, requireToken: true }
+            path: 'ScrapType',
+            component: () => import('@/views/basicData/Scrap/ScrapType'),
+            name: 'ScrapType',
+            meta: { title: routerTitle.basicData.scrap.scrapType?.[language] || routerTitle.basicData.scrap.scrapType.en, icon: 'form', affix: true, required: true, requireToken: true }
          },
          {
-            path: 'equipmentDetectParam',
-            component: () =>
-              import('@/views/basicData/Equipment/equipmentDetectParam'),
-            name: 'equipmentDetectParam',
-            hidden: true,
-            meta: { title: routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam?.[language] || routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam.en, icon: 'form', affix: true, required: true, requireToken: true }
+            path: 'EquipmentScrapGrade',
+            component: () => import('@/views/basicData/EquipmentScrapGrade'),
+            name: 'EquipmentScrapGrade',
+            meta: { title: routerTitle.basicData.EquipmentScrapGrade?.[language] || routerTitle.basicData.EquipmentScrapGrade.en, icon: 'form', affix: true, required: true, requireToken: true }
          },
          {
-            path: 'equipmentDetectParamAdd',
-            component: () =>
-              import('@/views/basicData/Equipment/components/equipmentDetectParam-add'),
-            name: 'equipmentDetectParamAdd',
-            meta: { title: routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam?.[language] || routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam.en, icon: 'form', affix: true, required: true, requireToken: true }
-          },
-          {
-            path: 'detecRegistration',
-            component: () =>
-              import('@/views/QualityManager/offlineDetec/detecRegistration'),
-            name: 'detecRegistration',
-            meta: { title: routerTitle.quality.offlineDetec.detecRegistration?.[language] || routerTitle.quality.offlineDetec.detecRegistration.en, icon: 'form', affix: true, required: true, requireToken: true }
+            path: 'scrap',
+            component: () => import('@/views/QualityManager/scrap'),
+            name: 'scrapManage',
+            meta: { title: routerTitle.quality.scrap?.[language] || routerTitle.quality.scrap.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true }
          }
        ]
-      },
-      {
-        path: '/spc',
-        component: () => import('@/views/spc/index'),
-        name: 'spcManage',
-        meta: { title: routerTitle.spc?.[language] || routerTitle.spc.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, openUrl: 'http://58.210.206.230:8000/thirdLogin?username=ZJCadmin&password=123456' }
-      },
-      {
-        path: 'knowledge',
-        component: () => import('@/views/QualityManager/base/knowledge'),
-        name: 'knowledge',
-        meta: { title: routerTitle.quality.knowledge?.[language] || routerTitle.quality.knowledge.en, icon: 'form', iconPart: 'formwhite', affix: true }
      }
    ]
  },
+  {
+    path: '/form',
+    component: Layout,
+    redirect: '/form',
+    name: 'formManage',
+    meta: { title: routerTitle.form?.[language] || routerTitle.form.en, icon: 'form', iconPart: 'formManage', affix: true, required: true, requireToken: true, unuse: false },
+    children: [{
+      path: 'report',
+      component: () => import('@/views/report-manage/ReportSortChoise'),
+      name: 'Report',
+      meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true }
+    },
+    {
+      path: 'report-sort-list',
+      component: () => import('@/views/report-manage/Report'),
+      name: 'ReportSortList',
+      hidden: true,
+      meta: { title: routerTitle.form.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true }
+    },
+    {
+      path: 'report-view',
+      component: () => import('@/views/report-manage/ReportView'),
+      name: 'ReportDesign',
+      meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true },
+      hidden: true
+    },
+    {
+      path: 'report-design',
+      component: () => import('@/views/report-manage/ReportDesign'),
+      name: 'ReportDesign',
+      meta: { title: routerTitle.form.reportDesign?.[language] || routerTitle.form.reportDesign.en, icon: 'form', affix: true, required: true, requireToken: true }
+    },
+    {
+      path: 'report-sort',
+      component: () => import('@/views/report-manage/ReportSort/index'),
+      name: 'ReportSort',
+      meta: { title: routerTitle.form.reportSort?.[language] || routerTitle.form.reportSort.en, icon: 'form', affix: true, required: true, requireToken: true }
+    }]
+  },
  {
    path: '/basic',
    component: Layout,
    redirect: '/user/manager',
    name: 'ArticleManager',
-    hidden: true,
    meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
    children: [
      {
--- a/src/views/QualityManager/QCPplan.vue
+++ b/src/views/QualityManager/QCPplan.vue
@@ -0,0 +1,178 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 15:41:11
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 14:28:58
+ * @Description:
+-->
+<template>
+  <div class="app-container">
+    <head-form
+      :placeholder-name="placeholderName"
+      :key-name="keyName"
+      :show-add="showAdd"
+      @getDataList="getList"
+      @add="addNew"
+    />
+    <base-table
+      :page="listQuery.current"
+      :limit="listQuery.size"
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    >
+      <method-btn
+        slot="handleBtn"
+        :width="trueWidth"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="listQuery.current"
+      :limit.sync="listQuery.size"
+      @pagination="getList()"
+    />
+  </div>
+</template>
+
+<script>
+import i18n from '@/lang'
+import { StateConfigList, StateConfigDelete } from '@/api/basicData/StateConfig'
+import HeadForm from '@/components/basicData/HeadForm'
+import BaseTable from '@/components/BaseTable'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
+import { timeFormatter } from '@/filters'
+import basicData from '@/filters/basicData'
+/**
+ * 表格表头配置项 TypeScript接口注释
+ * tableConfig<ConfigItem> = []
+ *
+ * Interface ConfigItem = {
+ *  prop: string,
+ *  label: string,
+ *  width: string,
+ *  align: string,
+ *  subcomponent: function,
+ *  filter: function
+ * }
+ *
+ *
+ */
+
+const tableBtn = [
+  {
+    type: 'edit',
+    btnName: 'btn.edit'
+  }
+  // {
+  //   type: 'delete',
+  //   btnName: 'btn.delete'
+  // }
+]
+const tableProps = [
+  {
+    prop: 'createTime',
+    label: i18n.t('module.basicData.factory.createTime'),
+    filter: timeFormatter,
+    align: 'center'
+  },
+  {
+    prop: 'status',
+    label: i18n.t('module.basicData.StateConfig.status'),
+    align: 'center'
+  },
+  {
+    prop: 'twinkle',
+    label: i18n.t('module.basicData.StateConfig.Twinkle'),
+    filter: basicData('onDuty'),
+    align: 'center'
+  },
+  {
+    prop: 'colour',
+    label: i18n.t('module.basicData.StateConfig.DisplayColor'),
+    align: 'center'
+  },
+  {
+    prop: 'description',
+    label: i18n.t('module.basicData.visual.Remarks'),
+    align: 'center'
+  }
+]
+
+export default {
+  name: 'QCPplan',
+  components: { Pagination, BaseTable, MethodBtn, HeadForm },
+  data() {
+    return {
+      keyName: i18n.t('module.basicData.visual.keyword'),
+      placeholderName: this.$t('module.basicData.StateConfig.status'),
+      addOrUpdateVisible: false,
+      tableBtn,
+      trueWidth: 150,
+      tableProps,
+      list: [],
+      total: 0,
+      showAdd: false,
+      listLoading: true,
+      listQuery: {
+        current: 1,
+        size: 10
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    handleClick(raw) {
+      console.log(raw)
+      if (raw.type === 'delete') {
+        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.status}]?`, this.$t('module.basicData.visual.Tips'), {
+          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
+          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
+          type: 'warning'
+        }).then(() => {
+          StateConfigDelete(raw.data.id).then(response => {
+            this.$message({
+              message: this.$t('module.basicData.visual.success'),
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.getList()
+              }
+            })
+          })
+        }).catch(() => {})
+      }
+    },
+    getList(key) {
+      this.listLoading = true
+      this.listQuery.status = key
+      StateConfigList(this.listQuery).then(response => {
+        if (response.data.records) {
+          this.list = response.data.records
+        } else {
+          this.list.splice(0, this.list.length)
+        }
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>
--- a/src/views/art/process/process-chart.vue
+++ b/src/views/art/process/process-chart.vue
@@ -13,11 +13,11 @@
              {{ i.equipmentId ? equipmentObj[i.equipmentId] : $t('module.art.eqName') }}
            </el-button>
          </el-col>
-          <el-col :span="4" class="process-table-main-item-item">
+          <!-- <el-col :span="4" class="process-table-main-item-item">
            <el-button v-if="!processPortObj[item.workSequenceId]" disabled>
              {{ i.equipmentRecipeId ? equipmentRecipeObj[i.equipmentRecipeId] : $t('module.art.recipeName') }}
            </el-button>
-          </el-col>
+          </el-col> -->
          <!-- <el-col :span="4" class="process-table-main-item-item">
            <el-button v-if="!processPortObj[item.workSequenceId]" disabled>
              {{ i.nodeType ? nodeTypesObj[i.nodeType] : $t('module.art.artType') }}
@@ -36,7 +36,7 @@
 </template>
 <script>
 import {
-  listAllEquipmentRecipe,
+  // listAllEquipmentRecipe,
  listProcessFlowNode,
  listProcess
 } from '@/api/art-manage/art.js'
@@ -57,7 +57,7 @@ export default {
      processObj: {},
      processPortObj: {},
      equipmentRecipeList: [],
-      equipmentRecipeObj: [],
+      // equipmentRecipeObj: [],
      equipmentList: [],
      equipmentObj: {},
      showAddList: [],
@@ -102,12 +102,12 @@ export default {
      console.log(this.processList)
      console.log(this.processObj)
      // 获取配方列表
-      const allRecipeRes = await listAllEquipmentRecipe()
-      this.equipmentRecipeList = allRecipeRes.data
-      allRecipeRes.data.map(item => {
-        this.equipmentRecipeObj[item.id] = item.name
-      })
-      console.log(this.equipmentRecipeList)
+      // const allRecipeRes = await listAllEquipmentRecipe()
+      // this.equipmentRecipeList = allRecipeRes.data
+      // allRecipeRes.data.map(item => {
+      //   this.equipmentRecipeObj[item.id] = item.name
+      // })
+      // console.log(this.equipmentRecipeList)
      // 获取设备列表
      const allEquipmentRes = await listEquipment()
      this.equipmentList = allEquipmentRes.data
--- a/src/views/art/process/process-table.vue
+++ b/src/views/art/process/process-table.vue
@@ -19,11 +19,11 @@
                {{ i.equipmentId ? equipmentObj[i.equipmentId] : $t('module.art.eqName') }}
              </el-button>
            </el-col>
-            <el-col :span="4" class="process-table-main-item-item">
+            <!-- <el-col :span="4" class="process-table-main-item-item">
              <el-button v-if="!processPortObj[item.workSequenceId]" icon="el-icon-edit" @click="choiceRecipe(index, idx, i.equipmentRecipeId)">
                {{ i.equipmentRecipeId ? equipmentRecipeObj[i.equipmentRecipeId] : $t('module.art.recipeName') }}
              </el-button>
-            </el-col>
+            </el-col> -->
            <!-- <el-col :span="4" class="process-table-main-item-item">
              <el-button v-if="!processPortObj[item.workSequenceId]" icon="el-icon-edit" @click="choiceArtType(index, idx, i.nodeType)">
                {{ i.nodeType ? nodeTypesObj[i.nodeType] : $t('module.art.artType') }}
@@ -55,7 +55,7 @@ import processTableSelect from './process-table-select.vue'
 import processTableAdd from './process-table-add.vue'
 import vuedraggable from 'vuedraggable'
 import {
-  listAllEquipmentRecipe,
+  // listAllEquipmentRecipe,
  addProcessFlows,
  listProcessFlowNode,
  listProcess
@@ -82,7 +82,7 @@ export default {
      processObj: {},
      processPortObj: {},
      equipmentRecipeList: [],
-      equipmentRecipeObj: [],
+      // equipmentRecipeObj: [],
      equipmentList: [],
      equipmentObj: {},
      showAddList: [],
@@ -131,12 +131,12 @@ export default {
      console.log(this.processList)
      console.log(this.processObj)
      // 获取配方列表
-      const allRecipeRes = await listAllEquipmentRecipe()
-      this.equipmentRecipeList = allRecipeRes.data
-      allRecipeRes.data.map(item => {
-        this.equipmentRecipeObj[item.id] = item.name
-      })
-      console.log(this.equipmentRecipeList)
+      // const allRecipeRes = await listAllEquipmentRecipe()
+      // this.equipmentRecipeList = allRecipeRes.data
+      // allRecipeRes.data.map(item => {
+      //   this.equipmentRecipeObj[item.id] = item.name
+      // })
+      // console.log(this.equipmentRecipeList)
      // 获取设备列表
      const allEquipmentRes = await listEquipment()
      this.equipmentList = allEquipmentRes.data
@@ -197,8 +197,8 @@ export default {
        nodeType: '',
        processFlowId: this.processFlowId,
        workSequenceId: this.dataList[index].workSequenceId,
-        description: this.dataList[index].processFlowEquipmentParams[0]?.description ? this.dataList[index].processFlowEquipmentParams[0].description : '',
-        remark: this.dataList[index].processFlowEquipmentParams[0]?.remark ? this.dataList[index].processFlowEquipmentParams[0].remark : ''
+        description: this.dataList[index].processFlowEquipmentParams[0].description ? this.dataList[index].processFlowEquipmentParams[0].description : '',
+        remark: this.dataList[index].processFlowEquipmentParams[0].remark ? this.dataList[index].processFlowEquipmentParams[0].remark : ''
      })
      e.stopPropagation()
    },
@@ -232,16 +232,16 @@ export default {
      this.$refs.processtableselect.init('equipmentId', first, sec, id, this.processObj[processId].equipments)
    },
    // 选择配方
-    choiceRecipe(first, sec, id) {
-      if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
-        this.$refs.processtableselect.init('equipmentRecipeId', first, sec, id, this.equipmentRecipeList.filter(f => f.equipmentId === this.dataList[first].processFlowEquipmentParams[sec].equipmentId))
-      } else {
-        this.$message.error(this.$t('module.art.choiceEqError'))
-      }
-    },
+    // choiceRecipe(first, sec, id) {
+    //   if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
+    //     this.$refs.processtableselect.init('equipmentRecipeId', first, sec, id, this.equipmentRecipeList.filter(f => f.equipmentId === this.dataList[first].processFlowEquipmentParams[sec].equipmentId))
+    //   } else {
+    //     this.$message.error(this.$t('module.art.choiceEqError'))
+    //   }
+    // },
    // 选择工艺类型
    choiceArtType(first, sec, id) {
-      if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
+      if (this.dataList[first].processFlowEquipmentParams[sec].equipmentId) {
        this.$refs.processtableselect.init('nodeType', first, sec, id, this.nodeTypes)
      } else {
        this.$message.error(this.$t('module.art.choiceEqError'))
@@ -307,13 +307,14 @@ export default {
              hasNull = true
            }
          })
-        } else {
-          item.processFlowEquipmentParams.map(i => {
-            if (!i.equipmentId || !i.equipmentRecipeId) {
-              hasNull = true
-            }
-          })
        }
+        // else {
+        //   item.processFlowEquipmentParams.map(i => {
+        //     if (!i.equipmentId || !i.equipmentRecipeId) {
+        //       hasNull = true
+        //     }
+        //   })
+        // }
      })
      // console.log(JSON.stringify(vm.dataList))
      // if (vm.dataList.length === 0) {
--- a/src/views/basicData/Cache/cache.vue
+++ b/src/views/basicData/Cache/cache.vue
@@ -44,6 +44,7 @@ import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { timeFormatter } from '@/filters'
+
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
--- a/src/views/basicData/Cache/components/cache-add.vue
+++ b/src/views/basicData/Cache/components/cache-add.vue
@@ -98,7 +98,7 @@
        />
      </base-table>
    </div>
-    <cacheArea-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.id" @refreshDataList="getList" />
+    <shelfAttr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.id" @refreshDataList="getList" />
  </div>
 </template>

@@ -107,7 +107,7 @@ import { cacheDetail, cacheUpdate, cacheAdd, cacheCode } from '@/api/basicData/C
 import { areaList, areaDelete } from '@/api/basicData/Cache/area'
 import BaseTable from '@/components/BaseTable'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import cacheAreaAdd from './cacheArea-add.vue'
+import shelfAttrAdd from './shelfAttr-add.vue'
 import shelfBtn from './shelfBtn.vue'
 const tableBtn = [
  {
@@ -154,7 +154,7 @@ const tableProps = [
 ]

 export default {
-  components: { BaseTable, MethodBtn, cacheAreaAdd },
+  components: { BaseTable, MethodBtn, shelfAttrAdd },
  data() {
    return {
      addOrUpdateVisible: false,
--- a/src/views/basicData/Cache/components/shelf-add.vue
+++ b/src/views/basicData/Cache/components/shelf-add.vue
@@ -75,7 +75,7 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'name',
+    prop: 'shelfName',
    label: i18n.t('module.basicData.cache.ShelfName'),
    align: 'center'
  },
--- a/src/views/basicData/Cache/components/shelfAttr-add.vue
+++ b/src/views/basicData/Cache/components/shelfAttr-add.vue
@@ -12,7 +12,7 @@
  >
    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
      <el-form-item :label="$t('module.basicData.cache.ShelfName')" prop="name">
-        <el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfName')])" clearable />
+        <el-input v-model="dataForm.shelfName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfName')])" clearable />
      </el-form-item>
      <el-form-item :label="$t('module.basicData.cache.ShelfCode')" prop="code">
        <el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfCode')])" clearable />
@@ -56,15 +56,17 @@ export default {
      visible: false,
      isPage: false,
      dataForm: {
+        abbr: 'n',
        id: 0,
        areaId: '',
-        name: '',
+        shelfName: '',
        code: '',
-        shelfNumber: ''
+        shelfNumber: '',
+        total: ''
      },
      areaArr: [],
      dataRule: {
-        name: [
+        shelfName: [
          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.ShelfName')]), trigger: 'blur' }
        ],
        code: [
@@ -112,6 +114,7 @@ export default {
      this.$refs['dataForm'].validate((valid) => {
        if (valid) {
          const data = this.dataForm
+          console.log(data)
          if (this.dataForm.id) {
            shelfUpdate(data).then(res => {
              this.$message({
--- a/src/views/basicData/Cache/shelf.vue
+++ b/src/views/basicData/Cache/shelf.vue
@@ -181,6 +181,7 @@ export default {
      this.listLoading = true
      this.listQuery.name = key
      shelfList(this.listQuery).then(response => {
+        console.log(response)
        if (response.data.records) {
          this.list = response.data.records
          this.list.forEach(item => {
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -103,8 +103,8 @@ export default {
    return {
      loginForm: {
        username: 13588441519,
-        password: 123456,
-        // password: '123abc.'
+        // password: 123456,
+        password: '123abc.',
        mobile: 13588441519,
        oauthCode: 13588441519,
        openId: 13588441519,
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,6 +46,7 @@ module.exports = {
    // 这里写入需要代理的api和对应的目标地址
    proxy: {
      '/api': {
+        // target: 'http://localhost:8080',
        // target: 'http://192.168.0.148:8080',
        target: 'http://a.wms.picaiba.com/api',
        // target: 'http://192.168.0.127:8080',
Author	SHA1	Message	Date
朱文强	8966dec79a	Merge pull request '修改菜单，增加质量管理' (#26 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #26	2022-03-03 16:15:37 +08:00
zwq	9513fb484b	修改菜单，增加质量管理	2022-03-03 16:15:01 +08:00
朱文强	68193ecfb3	Merge pull request '更新' (#25 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #25	2022-03-02 11:04:49 +08:00
zwq	5a42c80256	更新	2022-03-02 11:03:56 +08:00
朱文强	0cd8970053	Merge pull request '更新' (#24 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #24	2022-02-28 10:59:14 +08:00
zwq	597934be2e	更新	2022-02-28 10:58:51 +08:00
朱文强	fcb01aaa4b	Merge pull request '更新' (#23 ) from zwq into develop Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #23	2022-02-28 10:54:13 +08:00
zwq	93be36708d	更新	2022-02-28 10:53:52 +08:00
朱文强	80439e7e01	Merge pull request 'zwq' (#22 ) from zwq into develop Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #22	2022-02-28 10:50:12 +08:00
zwq	6a338438bf	更新	2022-02-28 10:49:30 +08:00
zwq	e74632e5fa	更新	2022-02-28 10:45:03 +08:00
朱文强	21d7a8f7eb	Merge pull request 'fzq' (#20 ) from fzq into develop Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #20	2022-02-28 10:33:30 +08:00
Fanzink	6d2311be44	''	2022-02-28 10:09:59 +08:00
Fanzink	3eac46beeb	''	2022-02-28 10:06:17 +08:00
Fanzink	64c27487c5	''	2022-02-25 15:12:37 +08:00
朱文强	14bf2dc2f6	Merge pull request '修改接口api' (#16 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #16	2022-02-25 11:01:58 +08:00
zwq	de1a7835e1	修改接口api	2022-02-25 11:01:39 +08:00
朱文强	e023b9c23e	Merge pull request '更新' (#15 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #15	2022-02-25 10:58:17 +08:00
朱文强	6e18a42c03	Merge branch 'develop' into zwq	2022-02-25 10:58:05 +08:00
zwq	7e6881ff74	更新	2022-02-25 10:57:07 +08:00
施海荣	7c6d7b63e3	Merge pull request 'fix: 🐛 修正构建包安装顺序' (#14 ) from cicd into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #14	2022-02-23 13:23:22 +08:00
施海荣	c4e7af8fba	Merge pull request 'fix: 🏗️ 修复raphael依赖找不到问题' (#13 ) from cicd into develop Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #13	2022-02-23 12:47:16 +08:00
施海荣	aa15b551fb	Merge pull request 'fix: 🐛 修正构建脚本' (#12 ) from cicd into develop Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #12	2022-02-23 11:42:46 +08:00
Fanzink	2628c14e99	''	2022-02-16 19:36:26 +08:00
Fanzink	fe1c64845e	‘基础资料对接口’	2022-02-16 19:32:54 +08:00
Fanzink	d47343af69	Merge branch 'develop' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into develop	2022-01-18 17:02:28 +08:00
Fanzink	b800893ea5	‘对接口’	2022-01-18 17:02:15 +08:00
Fanzink	aa94abd681	Merge branch 'develop' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into develop	2022-01-17 15:35:25 +08:00
Fanzink	ce4bf752f0	Merge branch 'develop' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into develop	2022-01-17 15:32:41 +08:00
Fanzink	16610e1390	1	2022-01-17 15:32:28 +08:00