Merge remote-tracking branch 'origin/master'

mes/qd/src/api/wms/basedata/st/storattr.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/Storattr',
+    url: '/api/stIvtBsrealstorattr',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/Storattr/',
+    url: '/api/stIvtBsrealstorattr',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/Storattr',
+    url: '/api/stIvtBsrealstorattr',
     method: 'put',
     data
   })
@@ -26,7 +26,7 @@ export function edit(data) {
 
 export function getStor(params) {
   return request({
-    url: 'api/Storattr/getStor',
+    url: '/api/stIvtBsrealstorattr/getStor',
     method: 'get',
     params
   })
@@ -34,10 +34,18 @@ export function getStor(params) {
 
 export function changeActive(data) {
   return request({
-    url: 'api/Storattr/changeActive',
+    url: '/api/stIvtBsrealstorattr/changeActive',
     method: 'put',
     data
   })
 }
 
-export default { add, edit, del, getStor, changeActive }
+export function queryStor(data) {
+  return request({
+    url: '/api/stIvtBsrealstorattr/queryStor',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getStor, changeActive, queryStor }

mes/qd/src/api/wms/st/in/semiProductIn.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
     return request({
-        url: '/api/in/semiProductIn',
+        url: '/api/in/semiproductIn',
         method: 'post',
         data
     })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
     return request({
-        url: '/api/in/semiProductIn',
+        url: '/api/in/semiproductIn',
         method: 'delete',
         data: ids
     })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
     return request({
-        url: '/api/in/semiProductIn',
+        url: '/api/in/semiproductIn',
         method: 'put',
         data
     })
@@ -26,7 +26,7 @@ export function edit(data) {
 
 export function getType(params) {
     return request({
-        url: '/api/in/semiProductIn/getType',
+        url: '/api/in/semiproductIn/getType',
         method: 'get',
         params
     })
@@ -34,7 +34,7 @@ export function getType(params) {
 
 export function getIODtl(data) {
     return request({
-        url: '/api/in/semiProductIn/getIODtl',
+        url: '/api/in/semiproductIn/getIODtl',
         method: 'post',
         data
     })
@@ -42,7 +42,7 @@ export function getIODtl(data) {
 
 export function insertDtl(data) {
     return request({
-        url: '/api/in/semiProductIn/insertDtl',
+        url: '/api/in/semiproductIn/insertDtl',
         method: 'post',
         data
     })
@@ -50,7 +50,7 @@ export function insertDtl(data) {
 
 export function commit(data) {
     return request({
-        url: '/api/in/semiProductIn/commit',
+        url: '/api/in/semiproductIn/commit',
         method: 'post',
         data
     })
@@ -58,135 +58,127 @@ export function commit(data) {
 
 export function checkVehicle(data) {
     return request({
-        url: '/api/in/semiProductIn/checkVehicle',
+        url: '/api/in/semiproductIn/checkVehicle',
         method: 'post',
         data
     })
 }
 
 export function confirmvehicle(data) {
-    return request({
-        url: '/api/in/semiProductIn/confirmvehicle',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/api/in/semiproductIn/confirmvehicle',
+    method: 'post',
+    data
+  })
 }
 
 export function getDisDtl(data) {
-    return request({
-        url: '/api/in/semiProductIn/getDisDtl',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/api/in/semiproductIn/getDisDtl',
+    method: 'post',
+    data
+  })
 }
 
 export function divStruct(data) {
-    return request({
-        url: '/api/in/semiProductIn/divStruct',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/api/in/semiproductIn/divStruct',
+    method: 'post',
+    data
+  })
 }
 
 export function unDivStruct(data) {
-    return request({
-        url: '/api/in/semiProductIn/unDivStruct',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/api/in/semiproductIn/unDivStruct',
+    method: 'post',
+    data
+  })
 }
 
 export function divPoint(data) {
-    return request({
-        url: '/api/in/semiProductIn/divPoint',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/api/in/semiproductIn/divPoint',
+    method: 'post',
+    data
+  })
 }
 
 export function bucketDtl(data) {
-    return request({
-        url: '/api/in/semiProductIn/bucketDtl',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/api/in/semiproductIn/bucketDtl',
+    method: 'post',
+    data
+  })
 }
 
 export function updateTask(data) {
-    return request({
-        url: '/api/in/semiProductIn/updateTask',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/api/in/semiproductIn/updateTask',
+    method: 'post',
+    data
+  })
 }
 
 export function confirmTask(data) {
-    return request({
-        url: '/api/in/semiProductIn/confirmTask',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/api/in/semiproductIn/confirmTask',
+    method: 'post',
+    data
+  })
 }
 
 export function confirm(data) {
-    return request({
-        url: '/api/in/semiProductIn/confirm',
-        method: 'post',
-        data
-    })
+  return request({
+      url: '/api/in/semiproductIn/confirm',
+      method: 'post',
+      data
+  })
 }
 
 export function delDis(data) {
-    return request({
-        url: '/api/in/semiProductIn/delDis',
-        method: 'post',
-        data
-    })
+  return request({
+      url: '/api/in/semiproductIn/delDis',
+      method: 'post',
+      data
+  })
 }
 
 export function queryBoxMater(data) {
-    return request({
-        url: '/api/in/semiProductIn/queryBoxMater',
-        method: 'post',
-        data
-    })
-}
-
-export function queryStor() {
-    return request({
-        url: '/api/in/semiProductIn/queryStor',
-        method: 'post'
-    })
+  return request({
+    url: '/api/in/semiproductIn/queryBoxMater',
+    method: 'post',
+    data
+  })
 }
 
 export function getDisTask(data) {
-    return request({
-        url: '/api/in/semiProductIn/getDisTask',
-        method: 'post',
-        data
-    })
+  return request({
+      url: '/api/in/semiproductIn/getDisTask',
+      method: 'post',
+      data
+  })
 }
 
 export default {
-    add,
-    edit,
-    del,
-    getType,
-    insertDtl,
-    getIODtl,
-    commit,
-    checkVehicle,
-    confirmvehicle,
-    getDisDtl,
-    divStruct,
-    unDivStruct,
-    divPoint,
-    delDis,
-    queryBoxMater,
-    bucketDtl,
-    updateTask,
-    confirmTask,
-    confirm,
-    queryStor,
-    getDisTask
-}
+  add,
+  edit,
+  del,
+  getType,
+  insertDtl,
+  getIODtl,
+  commit,
+  checkVehicle,
+  confirmvehicle,
+  getDisDtl,
+  divStruct,
+  unDivStruct,
+  divPoint,
+  delDis,
+  queryBoxMater,
+  bucketDtl,
+  updateTask,
+  confirmTask,
+  confirm,
+  getDisTask
+}

mes/qd/src/api/wms/st/in/workprocedureios.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/workprocedureiosIn',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/workprocedureiosIn/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/workprocedureiosIn',
-    method: 'put',
-    data
-  })
-}
-
-export function getBillTypes() {
-  return request({
-    url: 'api/workprocedureiosIn/getBillTypes',
-    method: 'get'
-  })
-}
-
-export function selectStartPoint(data) {
-  return request({
-    url: 'api/workprocedureiosIn/selectStartPoint',
-    method: 'post',
-    data
-  })
-}
-
-export function getStartArea(data) {
-  return request({
-    url: 'api/workprocedureiosIn/getStartArea',
-    method: 'post',
-    data
-  })
-}
-
-export function getEndArea(data) {
-  return request({
-    url: 'api/workprocedureiosIn/getEndArea',
-    method: 'post',
-    data
-  })
-}
-
-export function genTask(data) {
-  return request({
-    url: 'api/workprocedureiosIn/genTask',
-    method: 'post',
-    data
-  })
-}
-
-export function getEndAareaByworkprocedureId(data) {
-  return request({
-    url: 'api/workprocedureiosIn/getEndAareaByworkprocedureId',
-    method: 'post',
-    data
-  })
-}
-export default { add, edit, del, getBillTypes, selectStartPoint, getStartArea, getEndArea, genTask, getEndAareaByworkprocedureId }