Ver código fonte

立库-增加立库快上

zhaohuanhuan 3 meses atrás
pai
commit
d5788f10a7

+ 6 - 1
src/hooks/basic/menu.js

@@ -113,7 +113,12 @@ export default function() {
               title: '库位合并',
               icon: 'newspaper-o',
               path: 'robot-merge',
-            }
+            },
+            {
+              title: '立库快上',
+              icon: 'newspaper-o',
+              path:   'hik-putaway-allocation?type=asrs',
+            },
           ],
         },
         {

+ 8 - 5
src/views/haikang/putaway/dispatch/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <van-nav-bar
-      title="海康上架-调度" left-arrow fixed placeholder @click-left="goBack">
+      :title="mode?'立库快上':'海康快上'" left-arrow fixed placeholder @click-left="goBack">
       <template #left>
         <van-icon name="arrow-left" size="25" />
         <div style="color: #fff">返回</div>
@@ -116,10 +116,12 @@ import { androidFocus, getHeader, goBack, playVoiceBin, scanError, scanSuccess }
 import InputBarcode from '@/views/outbound/picking/components/InputBarcode.vue'
 import { closeListener, openListener, scanInit } from '@/utils/keydownListener'
 import { useStore } from '@/store/modules/user'
-import { finishTask, getRecommendedLocation, getWaitPutawayList, setBindAllocateWall } from '@/api/haikang'
+import { finishTask, getRecommendedLocation, setBindAllocateWall } from '@/api/haikang'
 import { barcodeToUpperCase } from '@/utils/dataType'
 import { closeLoading, showLoading } from '@/utils/loading'
 import { getWaitPutawayListNew } from '@/api/putaway'
+import {useRoute} from "vue-router";
+
 try {
   getHeader()
   androidFocus()
@@ -133,6 +135,8 @@ onMounted(() => {
 })
 const store = useStore()
 const warehouse = store.warehouse
+const route = useRoute()
+const mode=ref(route.query.type)
 //收货容器号
 const containerNo = ref('')
 //分拨墙号
@@ -276,7 +280,7 @@ const matchingBarcodeItem = (data, barcode) => {
 // 获取库存数据
 const _getRecommendedLocation = async (lotNum, owner) => {
   try {
-    const params = { warehouse, lotNum, owner,zoneGroup:'WH01-01' }
+    const params = { warehouse, lotNum, owner,zoneGroup:mode.value?'WH01-3':'WH01-01' }
     const res = await getRecommendedLocation(params)
     locationList.value = res.data
     //  'EA'数据
@@ -304,7 +308,6 @@ const _getRecommendedLocation = async (lotNum, owner) => {
 }
 // 设置库位
 const locationActive = ref([])
-const wallBinCounts = ref(new Map())
 const setLocation = (item) => {
     locationActive.value = item
     const data = {
@@ -317,6 +320,7 @@ const setLocation = (item) => {
       sku: barcodeActive.value.sku,
       location: locationActive.value[0].location,
       lotNum: barcodeActive.value.lotNumber,
+      type:mode.value?'ASRS':'HIK'
     }
     showLoading()
     setBindAllocateWall(data).then(res => {
@@ -366,7 +370,6 @@ const onClickRight = () => {
   showConfirmDialog({
     title: '温馨提示',
     message:'您正在进行释放分拨墙是否继续?',
-    keyboardEnabled:false
   }).then(() => {
     showLoading()
     const params={warehouse,container:containerNo.value}