''

2022-02-28 10:09:59 +08:00 · 2022-02-28 10:06:17 +08:00 · 2022-02-25 15:12:37 +08:00 · 2022-02-25 11:01:58 +08:00 · 2022-02-25 11:01:39 +08:00 · 2022-02-25 10:58:17 +08:00
26 changed files with 202 additions and 126 deletions
--- a/package.json
+++ b/package.json
@@ -66,7 +66,6 @@
    "nprogress": "0.2.0",
    "outlayer": "^2.1.1",
    "path-to-regexp": "2.4.0",
-    "raphael": "git+https://gitee.com/shihairong/raphael",
    "screenfull": "4.2.0",
    "script-loader": "0.7.2",
    "showdown": "1.9.0",
@@ -97,7 +96,7 @@
    "@vue/test-utils": "1.0.0-beta.29",
    "autoprefixer": "^9.5.1",
    "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "10.0.1",
+    "babel-eslint": "8.2.2",
    "babel-jest": "23.6.0",
    "chalk": "2.4.2",
    "chokidar": "2.1.5",
--- 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
  })
@@ -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/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/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/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/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/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,62 @@ 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: '/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 }
      }
    ]
  },
--- 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/vue.config.js
+++ b/vue.config.js
@@ -46,8 +46,18 @@ module.exports = {
    // 这里写入需要代理的api和对应的目标地址
    proxy: {
      '/api': {
+<<<<<<< HEAD
+        target: 'http://localhost:8080',
+        // target: 'http://192.168.0.148:8080',
+=======
+<<<<<<< HEAD
+        // target: 'http://localhost:8080',
+        target: 'http://192.168.0.148:8080',
+=======
        // target: 'http://192.168.0.148:8080',
        target: 'http://a.wms.picaiba.com/api',
+>>>>>>> 14bf2dc2f6d116f4005fe216e91bb59aa7ba338f
+>>>>>>> develop
        // target: 'http://192.168.0.127:8080',
        // target: 'http://192.168.0.165:8080',
        // target: 'http://192.168.43.105:8080',
Author	SHA1	Message	Date
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