refactor(入库任务): 对接wcs

src/api/mes/wm/wmsInTask.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, {requestWcs} from '@/utils/request'
 
 // 查询入库任务列表
 export function listWmsInTask(query) {
@@ -46,7 +46,15 @@ export function delWmsInTask(id) {
 // 批量执行入库任务
 export function issueBatchWmsInTask(data) {
   return request({
-    url: '/wm/wmsInTask/open/issueBatch',
+    url: '/wm/wmsInTask/open/issueBatch/' + data,
+    method: 'post',
+  })
+}
+
+// 下发任务至 WCS
+export function issueWmsInTaskToWcs(data) {
+  return requestWcs({
+    url: '/ToolDeliveryInfo',
     method: 'post',
     data
   })

src/utils/request.js

@@ -20,6 +20,13 @@ const service = axios.create({
   timeout: 30000
 })
 
+const serviceWcs = axios.create({
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: "http://192.168.8.60:1880",
+  // 超时
+  timeout: 30000
+})
+
 // request拦截器
 service.interceptors.request.use(config => {
   // 是否需要设置 token
@@ -113,11 +120,9 @@ service.interceptors.response.use(res => {
     let {message} = error;
     if (message == "Network Error") {
       message = "后端接口连接异常";
-    }
+    } else if (message.includes("timeout")) {
-    else if (message.includes("timeout")) {
       message = "系统接口请求超时";
-    }
+    } else if (message.includes("Request failed with status code")) {
-    else if (message.includes("Request failed with status code")) {
       message = "系统接口" + message.substr(message.length - 3) + "异常";
     }
     Message({
@@ -131,9 +136,15 @@ service.interceptors.response.use(res => {
 
 // 通用下载方法
 export function download(url, params, filename) {
-  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+  downloadLoadingInstance = Loading.service({
+    text: "正在下载数据，请稍候",
+    spinner: "el-icon-loading",
+    background: "rgba(0, 0, 0, 0.7)",
+  })
   return service.post(url, params, {
-    transformRequest: [(params) => { return tansParams(params) }],
+    transformRequest: [(params) => {
+      return tansParams(params)
+    }],
     headers: {'Content-Type': 'application/x-www-form-urlencoded'},
     responseType: 'blob'
   }).then(async (data) => {
@@ -156,3 +167,5 @@ export function download(url, params, filename) {
 }
 
 export default service
+
+export const requestWcs = serviceWcs

src/views/mes/wm/wmsInTask/index.vue

@@ -102,8 +102,8 @@
             type="text"
             icon="el-icon-edit"
             :disabled="scope.row.planInStatus === '1'"
-            @click="handleIssue(scope.row.id)"
+            @click="handleIssue(scope.row)"
-          >执行
+          >下发
           </el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
@@ -169,7 +169,7 @@ import {
   delWmsInTask,
   addWmsInTask,
   updateWmsInTask,
-  issueBatchWmsInTask
+  issueBatchWmsInTask, issueWmsInTaskToWcs
 } from "@/api/mes/wm/wmsInTask";
 import {listTYPE} from "@/api/md/TYPE";
 import {listWmsInPlanDetailsEntity} from "@/api/mes/wm/wmsInPlanDetailsEntity";
@@ -272,12 +272,40 @@ export default {
       }
       return id
     },
-    // 执行任务
+    // 下发任务至 WCS
-    handleIssue(id) {
+    handleIssue(task) {
-      issueBatchWmsInTask([id.toString()]).then(response => {
+      let warehouseTypeCode = ""
-        this.$modal.msgSuccess("执行成功");
+      // 刀片入库 则入 立体库
-        this.getList();
+      if (task.planTypeId === "8") {
-      });
+        warehouseTypeCode = "LTK"
+      }
+      const param = {
+        // 计划ID
+        planId: task.planInId,
+        // 任务ID
+        taskId: task.id,
+        // 库位 信息
+        cellCode: task.cellCode,
+        // 库房类型编码
+        warehouseTypeCode,
+        // 物料信息
+        materialId: task.materialId,
+        materialCode: task.materialCode,
+        materialName: task.materialName,
+        materialCount: task.actualInQuantity,
+        rfid: "",
+        // 出库OR入库
+        type: "RK",
+      }
+      console.log(task)
+      issueWmsInTaskToWcs(param).then(res => {
+        console.log(res)
+        this.$modal.msgSuccess("下发成功");
+      })
+      // issueBatchWmsInTask([task.id.toString()]).then(response => {
+      //   this.$modal.msgSuccess("执行成功");
+      //   this.getList();
+      // });
     },
     // 取消按钮
     cancel() {