上架

src/api/agvTask.js

@@ -24,4 +24,13 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function missionStateCallback(data) {
+  return request({
+    url: 'interfaces/api/amr/missionStateCallback',
+    method: 'post',
+    data
+  })
+}
+
+
+export default { add, edit, del ,missionStateCallback}

src/api/inventory.js

@@ -39,13 +39,4 @@ export function downloadXb(data) {
     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/api/task.js

@@ -43,6 +43,22 @@ export function queryTaskData(params) {
   })
 }
 
+export function queryByPutAwayTask(status) {
+  return request({
+    url: 'api/task/queryByPutAwayTask',
+    method: 'get',
+    params: {status}
+  })
+}
+
+export function stockShangJia(data) {
+  return request({
+    url: 'api/task/stockShangJia',
+    method: 'post',
+    data
+  })
+}
 
 
-export default { add, edit, del ,getTaskInfo,queryPickTask,queryTaskData}
+
+export default { add, edit, del ,getTaskInfo,queryPickTask,queryTaskData,queryByPutAwayTask,stockShangJia}

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

@@ -312,11 +312,7 @@ export default {
       }
       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);
@@ -348,7 +344,7 @@ export default {
         type: 'warning'
       }).then(() => {
         if (data.type == 'ASN') {
-          return this.crud.notify('原材料入库任务不允许重新发送!', CRUD.NOTIFICATION_TYPE.ERROR);
+          return this.crud.notify('入库任务不允许重新发送!', CRUD.NOTIFICATION_TYPE.ERROR);
         }
         this.MissionStateCallback.missionCode = data.id
         this.MissionStateCallback.missionStatus = 'RESEND'

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

@@ -315,7 +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"
+import crudTask from "@/api/task"
 
 const defaultForm = {
   id: null,
@@ -467,7 +467,7 @@ export default {
       stockShangJiaDialogVisible: false,
       stockOptionsMap: new Map(),
       stockShangjiaForm: {
-        id: null,
+        taskId: null,
         stock: {}
       }
 
@@ -564,7 +564,6 @@ export default {
     },
     asnDetailRouter(datas) {
       this.$refs.viewAsnDetail.asnFrom = datas
-      console.log(this.asnFrom.status)
       this.$refs.viewAsnDetail.queryAsnDetail(datas.id)
       this.$refs.viewAsnDetail.dialogInsertAsn = true
       //this.$router.push({path:'/business-asn/viewAsnDetail',query: {ids:datas.id}})
@@ -688,21 +687,23 @@ export default {
       })
     },
     queryStockShangjia() {
-      crudInv.queryStockShangJia('待入库').then(res => {
+      //待上架任务
-        this.stockOptions = res.map(item => item.stock);
+      crudTask.queryByPutAwayTask('OPEN').then(res => {
-        // 清空 Map
+        // 使用一个对象来存储中间结果，减少重复计算
-        this.stockOptionsMap.clear();
+        const stockOptions = res.map(task => task.srcStock);
-        // 处理数据并存入 Map
+
-        res.forEach(item => {
+        // 直接使用map方法创建Map
-          this.stockOptionsMap.set(item.id, item.stock);
+        this.stockOptionsMap = new Map(res.map(task => [task.id, task.srcStock]));
-        });
+
+        // 更新stockOptions
+        this.stockOptions = stockOptions;
 
       })
 
     },
     getStock(stockOption) {
-      const invId = this.getKeyByValue(stockOption);
+      const taskId = this.getKeyByValue(stockOption);
-      this.stockShangjiaForm.id = invId
+      this.stockShangjiaForm.taskId = taskId
     },
     getKeyByValue(value) {
       for (const [key, val] of this.stockOptionsMap.entries()) {
@@ -713,7 +714,15 @@ export default {
       return null;
     },
     stockShangJiaCof(){
-  
+        crudTask.stockShangJia(this.stockShangjiaForm.taskId).then(res => {
+          if (res.status == 200) {
+            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
+            this.crud.toQuery();
+            this.stockShangJiaDialogVisible = false;
+          } else {
+            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
+          }
+      })
     },
     stockShangJiaClose(done) {
       this.stockShangjiaForm = {};

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

@@ -150,12 +150,12 @@
                     @selection-change="crud.selectionChangeHandler" height="35vh"
           >
             <el-table-column type="selection" width="55"/>
-            <el-table-column prop="item.code " label="品番号" width="100px">
+            <el-table-column prop="item.code " label="料号" width="100px">
               <template slot-scope="scope">
                 <div>{{ scope.row.item == null ? '' : scope.row.item.code }}</div>
               </template>
             </el-table-column>
-            <el-table-column prop="item.name" label="品番" width="100px">
+            <el-table-column prop="item.name" label="物料描述" width="100px">
               <template slot-scope="scope">
                 <div>{{ scope.row.item == null ? '' : scope.row.item.name }}</div>
               </template>
@@ -200,11 +200,19 @@
                   :disabled="scope.row.receivedQty>0"
                   style="float: left"
                   size="mini" type="primary" icon="el-icon-edit" @click="toEditAsnDetail(scope.row)"/>
-                <udOperation
+                <el-popconfirm
-                  :data="scope.row"
+                  title="是否确定删除？"
-                  :permission="permission"
+                  @confirm="deleteAsnDetail(scope.row)"
-                  :show-edit="false"
+                >
+                  <el-button
+                    class="filter-item"
+                    slot="reference"
+                    type="danger"
+                    icon="el-icon-delete"
+                    size="mini"
+                    :disabled="scope.row.receivedQty>0"
                   />
+                </el-popconfirm>
               </template>
             </el-table-column>
           </el-table>
@@ -259,6 +267,7 @@
 
     <!--表单组件-->
     <el-dialog
+      title="添加明细"
       :visible.sync="dialogInsertAsnDetail"
       center
       width="400px"
@@ -951,6 +960,16 @@ export default {
       this.form = data;
       this.dialogInsertAsnDetail = true;
     },
+    deleteAsnDetail(data){
+      crudAsnDetail.del(data.id).then(res => {
+        if(res.status==200){
+          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        }else {
+          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR)
+        }
+      })
+    },
     asnDetailZl(datas) {
       this.zlForm = datas[0];
       this.zlDialogVisible = true;

src/views/business-inv/inventory/index.vue

@@ -82,19 +82,19 @@
         <el-form ref="ywFrom" :rules="ywRules" :model="inventoryButton.inventoryYW"
                  size="small" label-width="90px"
         >
-          <el-form-item label="品番">
+          <el-form-item label="料号">
             <el-input v-model="inventoryButton.inventoryYW.inventory.itemKey.item.code" placeholder="品番"
                       :disabled="true"
                       style="width: 220px;"
             ></el-input>
           </el-form-item>
-          <el-form-item label="货品名称">
+          <el-form-item label="物料描述">
             <el-input v-model="inventoryButton.inventoryYW.inventory.itemKey.item.name" placeholder="货品名称"
                       :disabled="true"
                       style="width: 220px;"
             ></el-input>
           </el-form-item>
-          <el-form-item label="原库位">
+          <el-form-item label="库位号">
             <el-input v-model="inventoryButton.inventoryYW.inventory.point.name" placeholder="原库位" :disabled="true"
                       style="width: 220px;"
             ></el-input>
@@ -133,10 +133,10 @@
                  :title="'库存修改'" width="520px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="110px">
-          <el-form-item label="品番">
+          <el-form-item label="料号">
             <el-input v-model="form.itemKey.item.code" style="width: 300px;" placeholder="品番" :disabled="true"/>
           </el-form-item>
-          <el-form-item label="货品名" prop="name">
+          <el-form-item label="物料描述" prop="name">
             <el-input v-model="form.itemKey.item.name" style="width: 300px;" placeholder="货品名" clearable/>
           </el-form-item>
           <el-form-item label="调整后的数量" prop="quantity">
@@ -171,6 +171,7 @@
         <el-table-column prop="point.code" label="库位号"  align="center"/>
         <el-table-column prop="itemKey.item.code" label="料号"/>
         <el-table-column prop="itemKey.item.name" label="物料描述"/>
+        <el-table-column prop="status" label="状态"/>
         <el-table-column prop="quantity" label="数量"/>
         <el-table-column prop="queuedQty" label="占用数"/>
         <el-table-column prop="itemKey.propC1" label="批次号"/>