添加AGV

.env.production

@@ -6,9 +6,9 @@ ENV = 'production'
 # 如果接口是 http 形式， wss 需要改为 ws
 #VUE_APP_WS_API = 'wss://eladmin.vip'
 
-VUE_APP_BASE_API  = 'http://47.103.100.52:8000'
+VUE_APP_BASE_API  = 'http://101.37.151.105:8077'
-VUE_APP_WS_API = 'ws://47.103.100.52:8000'
+VUE_APP_WS_API = 'ws://101.37.151.105:8077'
-VUE_APP_REPORT_API = 'http://47.103.100.52:8055'
+VUE_APP_REPORT_API = 'http://101.37.151.105:8085'
 
 #VUE_APP_BASE_API  = 'http://139.196.165.224:8000'
 #VUE_APP_WS_API = 'ws://139.196.165.224:8000'

src/api/agvTask.js

@@ -1,13 +1,5 @@
 import request from '@/utils/request'
 
-export function queryAgvStatus(params) {
-  return request({
-    url: 'api/queryAgvStatus',
-    method: 'get',
-    params
-  })
-}
-
 export function add(data) {
   return request({
     url: 'api/agvTask',
@@ -32,20 +24,4 @@ export function edit(data) {
   })
 }
 
-export function missionStateCallback(data) {
+export default { add, edit, del }
-  return request({
-    url: '/interfaces/api/amr/missionStateCallback',
-    method: 'post',
-    data
-  })
-}
-
-export function agvTaskCallback(data) {
-  return request({
-    url: '/api/agvTask/agvTaskCallback',
-    method: 'post',
-    data
-  })
-}
-
-export default { add, edit, del,missionStateCallback,agvTaskCallback }

src/api/inventory.js

@@ -40,4 +40,12 @@ export function downloadXb(data) {
   })
 }
 
-export default { add, edit, del,knywInventory,downloadXb}
+export function queryStockShangJia(status) {
+  return request({
+    url: 'api/inventory/queryStockShangJia',
+    method: 'get',
+    params: {status}
+  })
+}
+
+export default {add, edit, del, knywInventory, downloadXb,queryStockShangJia}

src/views/business-agvTask/agvTask/index.vue

@@ -0,0 +1,427 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle" type="flex">
+        <!-- 搜索 -->
+        <div>
+          <label class="el-form-item-label">创建日期</label>
+          <date-range-picker v-model="query.createTime" style="width: 250px;" class="filter-item"/>
+
+          <label class="el-form-item-label">容器编码</label>
+          <el-input
+            v-model="query.stockCode"
+            clearable
+            placeholder="请输入容器编码"
+            style="width: 170px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"/>
+          <label class="el-form-item-label">起点位置</label>
+          <el-input v-model="query.startSlotCode" clearable placeholder="起点位置" style="width: 170px;"
+                    class="filter-item" @keyup.enter.native="crud.toQuery"/>
+          <label class="el-form-item-label">终点位置</label>
+          <el-input v-model="query.endSlotCode" clearable placeholder="终点位置" style="width: 170px;"
+                    class="filter-item" @keyup.enter.native="crud.toQuery"/>
+
+        </div>
+
+
+        <div>
+
+          <label class="el-form-item-label">任务类型</label>
+          <el-select v-model="query.type" clearable placeholder="请选择" style="width: 170px;" class="filter-item"
+                     @keyup.enter.native="crud.toQuery">
+            <el-option
+              v-for="taskType in dict.task_type"
+              :key="taskType.id"
+              :label="taskType.label"
+              :value="taskType.value"
+            />
+          </el-select>
+
+          <rrOperation :crud="crud"/>
+          <!--        重置-->
+          <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
+          </el-button>
+        </div>
+
+
+      </div>
+      <div class="statusButton" style="border-bottom: solid lightgray 1px;">
+        <el-radio-group v-model="radio3" @change="clickChange" size="small">
+          <el-radio-button label="全部"> 全部</el-radio-button>
+          <el-radio-button label="待执行">待执行</el-radio-button>
+          <el-radio-button label="执行中">执行中</el-radio-button>
+          <el-radio-button label="顶升">顶升</el-radio-button>
+          <el-radio-button label="已完成">已完成</el-radio-button>
+          <el-radio-button label="任务取消">任务取消</el-radio-button>
+        </el-radio-group>
+
+
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" :tableKey="this.$options.name"/>
+      <!--   顶升  -->
+      <el-dialog title="顶升" :visible.sync="agvTaskCallbackStatus" width="400px">
+        <el-form ref="form1" :model="form1" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="容器号" prop="boxCode">
+            <el-input v-model="form1.boxCode" style="width: 200px;"/>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="agvTaskCallbackStatus = false">取 消</el-button>
+          <el-button type="primary" @click="agvTaskCallbackMethod()">确 定</el-button>
+        </span>
+      </el-dialog>
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+                 :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="容器编码" prop="stockCode">
+            <el-input v-model="form.stockCode" style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="容器类型" prop="stockTypeCode">
+            <el-input v-model="form.stockTypeCode" style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="起点位置" prop="startSlotCode">
+            <el-input v-model="form.startSlotCode" style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="终点位置" prop="endSlotCode">
+            <el-input v-model="form.endSlotCode" style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="容器当前位置" prop="slotCode">
+            <el-input v-model="form.slotCode" style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="任务状态" prop="status">
+            <el-select v-model="form.status" filterable placeholder="请选择">
+              <el-option
+                v-for="item in dict.task_status"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="任务类型">
+            <el-input v-model="form.type" style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="工作类型" prop="jobType">
+            <el-input v-model="form.jobType" style="width: 370px;"/>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="small"
+        height="54vh"
+        style="width: 100%;"
+        :default-sort="{prop: 'id', order: 'descending'}"
+        @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="id" label="任务序号 "/>
+        <el-table-column prop="stockCode" width="170" label="容器码"/>
+        <el-table-column prop="startSlotCode" label="起点位置" width="130"/>
+        <el-table-column prop="endSlotCode" label="终点位置" width="130" sortable :formatter="formatter"/>
+        <el-table-column prop="status" label="任务状态">
+          <template slot-scope="scope">
+            {{ dict.label.task_status[scope.row.status] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="type" label="任务类型">
+          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="jobPriority" label="优先级" width="60"/>
+        <el-table-column prop="jobsage" label="返回报文" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column prop="createTime" label="创建时间" width="140"/>
+        <el-table-column prop="startTime" label="开始时间" width="140"/>
+        <el-table-column prop="endTime" label="完成时间" width="140"/>
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="260">
+          <template slot-scope="scope">
+            <el-button type="warning" :disabled="scope.row.status!='ATCALL' && scope.row.status!='OPEN' "
+                       align="center" size="mini"
+                       @click="popUpBox(scope.row)">
+              顶升
+            </el-button>
+            <el-button type="success"
+                       :disabled="scope.row.status!='ATCALL' && scope.row.status!='UP_CONTAINER' && scope.row.status!='OPEN' "
+                       align="center"
+                       size="mini"
+                       @click="toAgvTaskFinish(scope.row)">
+              完成
+            </el-button>
+            <el-button type="danger"
+                       :disabled="scope.row.status!='ATCALL' && scope.row.status!='UP_CONTAINER' && scope.row.status!='OPEN' "
+                       align="center"
+                       size="mini"
+                       @click="toAgvTaskCANCELED(scope.row)">
+              取消
+            </el-button>
+            <el-button type="primary"
+                       :disabled="scope.row.status!='CANCEL'  "
+                       align="center"
+                       size="mini"
+                       @click="toAgvTaskResend(scope.row)">
+              重送
+            </el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
+      <!--分页组件-->
+      <div style="float: right;">
+        <pagination/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import crudAgvTask, {missionStateCallback} from '@/api/agvTask'
+import CRUD, {presenter, header, form, crud} from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from "@/components/DateRangePicker/index.vue";
+
+const defaultForm = {
+  id: null,
+  stockCode: null,
+  stockTypeCode: null,
+  startSlotCode: null,
+  endSlotCode: null,
+  slotCode: null,
+  status: null,
+  type: null,
+  jobId: null,
+  jobType: null,
+  jobPriority: null,
+  jobPriorityType: null,
+  jobForce: null,
+  jobForceAsc: null,
+  jobMessage: null,
+  jobMessageTime: null,
+  createTime: null,
+  startTime: null,
+  endTime: null
+}
+export default {
+  name: 'AgvTask',
+  components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['base_staus', 'task_status', 'task_type'],
+  cruds() {
+    return CRUD({
+      title: 'agvTask',
+      url: 'api/agvTask',
+      query: {
+        status: 'ATCALL'
+      },
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: {...crudAgvTask},
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: false,
+        download: true
+      }
+    })
+  },
+  data() {
+    return {
+      radio3: '执行中',
+      permission: {
+        add: ['admin', 'agvTask:add'],
+        edit: ['admin', 'agvTask:edit'],
+        del: ['admin', 'agvTask:del']
+      },
+      MissionStateCallback: {
+        missionCode: '',
+        containerCode: '',
+        missionStatus: ''
+      },
+      rules: {
+        stockCode: [
+          {required: true, message: '容器码不能为空', trigger: 'blur'}
+        ],
+        stockTypeCode: [
+          {required: true, message: '容器类型不能为空', trigger: 'blur'}
+        ],
+        startSlotCode: [
+          {required: true, message: '起点位置不能为空', trigger: 'blur'}
+        ],
+        endSlotCode: [
+          {required: true, message: '终点位置不能为空', trigger: 'blur'}
+        ],
+        slotCode: [
+          {required: true, message: '容器当前位置不能为空', trigger: 'blur'}
+        ],
+        status: [
+          {required: true, message: '任务状态不能为空', trigger: 'blur'}
+        ],
+        jobType: [
+          {required: true, message: '工作类型不能为空', trigger: 'blur'}
+        ],
+        boxCode: [
+          {required: true, message: '容器号不能为空', trigger: 'blur'}
+        ]
+      },
+      queryTypeOptions: [
+        {key: 'dstStockCode', display_name: '终点位置'},
+        {key: 'srcLocCode', display_name: '起点位置'},
+        {key: 'stockCode', display_name: '容器码'},
+        {key: 'stockTypeCode', display_name: '容器类型'},
+        {key: 'startSlotCode', display_name: '起点位置'},
+        {key: 'endSlotCode', display_name: '终点位置'},
+        {key: 'slotCode', display_name: '容器当前位置'},
+        {key: 'status', display_name: '任务状态'},
+        {key: 'type', display_name: '任务类型'},
+        {key: 'jobId', display_name: '下游任务号'},
+        {key: 'jobMessage', display_name: '返回报文'}
+      ],
+      // boxCode
+      agvTaskCallbackStatus: false,
+      form1: {boxCode: null, missionCode: null}
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    formatter(row, column) {
+      return row.endSlotCode;
+    },
+    toAgvTaskFinish(data) {
+      if (data.status != 'UP_CONTAINER') {
+        return this.crud.notify("容器未顶升，需顶升之后在做操作!", CRUD.NOTIFICATION_TYPE.ERROR);
+      }
+      this.MissionStateCallback.missionCode = data.id
+      this.MissionStateCallback.containerCode = data.stockCode
+      if (data.type == 'ASN' || data.type == 'FB_RETURN') {
+        this.MissionStateCallback.missionStatus = 'FORK_DOWN'
+      } else {
+        this.MissionStateCallback.missionStatus = 'COMPLETED'
+      }
+      crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
+        if (res.status == 200) {
+          this.crud.notify("任务完成!", CRUD.NOTIFICATION_TYPE.SUCCESS);
+          this.crud.toQuery()
+        } else {
+          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+        }
+      }).catch(() => {
+      })
+    },
+    toAgvTaskCANCELED(data) {
+      this.MissionStateCallback.missionCode = data.id
+      this.MissionStateCallback.containerCode = data.stockCode
+      this.MissionStateCallback.missionStatus = 'CANCELED'
+      crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
+        if (res.status == 200) {
+          this.crud.notify("取消成功!", CRUD.NOTIFICATION_TYPE.SUCCESS);
+          this.crud.toQuery()
+        } else {
+          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+        }
+      }).catch(() => {
+      })
+    },
+    toAgvTaskResend(data) {
+      this.$confirm('此操作将重新发送任务, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (data.type == 'ASN') {
+          return this.crud.notify('原材料入库任务不允许重新发送!', CRUD.NOTIFICATION_TYPE.ERROR);
+        }
+        this.MissionStateCallback.missionCode = data.id
+        this.MissionStateCallback.missionStatus = 'RESEND'
+        crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
+          if (res.status == 200) {
+            this.crud.notify("发送成功!", CRUD.NOTIFICATION_TYPE.SUCCESS);
+            this.crud.toQuery()
+          } else {
+            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+          }
+        })
+
+      }).catch(() => {
+        this.crud.notify('已取消当前操作!', CRUD.NOTIFICATION_TYPE.WARNING);
+      });
+    },
+    agvTaskCallbackMethod() {//顶升
+      this.$refs['form1'].validate((valid) => {
+        if (valid) {
+          //UP_CONTAINER
+          let date_ = {missionCode: null, containerCode: null, missionStatus: null};
+          date_.missionCode = this.form1.missionCode;
+          date_.containerCode = this.form1.boxCode;
+          date_.missionStatus = "UP_CONTAINER";
+          missionStateCallback(date_).then(res => {
+            this.agvTaskCallbackStatus = false;
+            this.crud.notify("顶升成功!", CRUD.NOTIFICATION_TYPE.SUCCESS);
+            this.crud.toQuery()
+            this.form1 = {boxCode: null, missionCode: null};
+          }).catch(e => {
+            this.crud.notify("顶升失败!", CRUD.NOTIFICATION_TYPE.ERROR);
+          })
+        } else {
+          return false;
+        }
+      });
+    },
+    popUpBox(data) {//弹出顶升盒子
+      this.form1.missionCode = data.id;
+      this.form1.boxCode = data.stockCode;
+      this.agvTaskCallbackStatus = true;
+    },
+    resetQuery() {
+      this.radio3 = '执行中';
+      this.query.status = 'ATCALL'
+      this.crud.toQuery();
+
+    },
+    clickChange(lab) {
+      if (lab === "全部") {
+        this.query.status = ''
+        this.crud.toQuery();
+      } else if (lab === "待执行") {
+        this.query.status = 'OPEN'
+        this.crud.toQuery();
+      } else if (lab === "执行中") {
+        this.query.status = 'ATCALL'
+        this.crud.toQuery();
+      } else if (lab === "顶升") {
+        this.query.status = 'UP_CONTAINER'
+        this.crud.toQuery();
+      } else if (lab === "已完成") {
+        this.query.status = 'FINISH'
+        this.crud.toQuery();
+      } else if (lab === "任务取消") {
+        this.query.status = 'CANCEL'
+        this.crud.toQuery();
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/business-asn/asn/index.vue

@@ -37,6 +37,17 @@
         >
           新增
         </el-button>
+
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="stockShangJiaDialogVisible=true"
+        >
+          容器上架
+        </el-button>
         <el-button
           v-if="false"
           slot="left"
@@ -144,6 +155,40 @@
         </div>
       </el-dialog>
 
+      <!--      容器上架-->
+      <el-dialog
+        title="容器上架"
+        :visible.sync="stockShangJiaDialogVisible"
+        width="30%"
+        :before-close="stockShangJiaClose">
+        <el-form :model="stockShangjiaForm" ref="stockShangjiaForm" label-width="100px"
+                 class="demo-ruleForm">
+          <el-form-item label="容器" prop="stock">
+            <el-select v-model="stockShangjiaForm.stock"
+                       value-key="id"
+                       placeholder="请选择容器"
+                       clearable
+                       filterable
+                       style="width: 100%"
+                       @change="getStock"
+                       @focus="queryStockShangjia"
+            >
+              <el-option
+                v-for="stocks in stockOptions"
+                :key="stocks.id"
+                :label="stocks.code"
+                :value="stocks"
+              />
+            </el-select>
+
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+    <el-button @click="stockShangJiaCel">取 消</el-button>
+    <el-button type="primary" @click="stockShangJiaCof">确 定</el-button>
+  </span>
+      </el-dialog>
+
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
                  :title="crud.status.title" width="400px" :height="crud.tableHeight" border
@@ -270,6 +315,7 @@ import {queryItemAll} from '@/api/item'
 import {formatDate} from '@/utils/commonUtils'
 import {xbjsOut} from "@/api/pickOut";
 import viewAsnDetail from "@/views/business-asn/asn/viewAsnDetail.vue"
+import crudInv from "@/api/inventory"
 
 const defaultForm = {
   id: null,
@@ -416,7 +462,14 @@ export default {
       viewZl: true,
       viewCy: true,
       viewZj: true,
-      asnIdList: []
+      asnIdList: [],
+      stockOptions: [],
+      stockShangJiaDialogVisible: false,
+      stockOptionsMap: new Map(),
+      stockShangjiaForm: {
+        id: null,
+        stock: {}
+      }
 
     }
   },
@@ -462,6 +515,9 @@ export default {
     inserAsnOnOffM() {
       this.$refs.viewAsnDetail.dialogInsertAsn = true
       //this.$router.push({path:'/business-asn/viewAsnDetail'})
+    },
+    stockShangJiaOffM() {
+
     },
     //获取当前时间
     getNewDate() {
@@ -630,6 +686,46 @@ export default {
           this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
         }
       })
+    },
+    queryStockShangjia() {
+      crudInv.queryStockShangJia('待入库').then(res => {
+        this.stockOptions = res.map(item => item.stock);
+        // 清空 Map
+        this.stockOptionsMap.clear();
+        // 处理数据并存入 Map
+        res.forEach(item => {
+          this.stockOptionsMap.set(item.id, item.stock);
+        });
+
+      })
+
+    },
+    getStock(stockOption) {
+      const invId = this.getKeyByValue(stockOption);
+      this.stockShangjiaForm.id = invId
+    },
+    getKeyByValue(value) {
+      for (const [key, val] of this.stockOptionsMap.entries()) {
+        if (val === value) {
+          return key;
+        }
+      }
+      return null;
+    },
+    stockShangJiaCof(){
+  
+    },
+    stockShangJiaClose(done) {
+      this.stockShangjiaForm = {};
+      // 清空 Map
+      this.stockOptionsMap.clear();
+      done();
+    },
+    stockShangJiaCel() {
+      this.stockShangjiaForm = {};
+      // 清空 Map
+      this.stockOptionsMap.clear();
+      this.stockShangJiaDialogVisible = false;
     }
   }
 }