|
|
@@ -64,7 +64,7 @@
|
|
|
label="实拣数" placeholder="请输实拣数量"
|
|
|
>
|
|
|
<template #button>
|
|
|
- <van-button v-if="item.productionDate!=null" size="mini" type="primary" plain @click="jump(item)" :loading="jumpLoading" loading-text="加载中...">跳过</van-button>
|
|
|
+ <van-button v-if="item.operationTime==null" size="mini" type="primary" plain @click="jump(item)" :loading="jumpLoading" loading-text="加载中...">跳过</van-button>
|
|
|
</template>
|
|
|
</van-field>
|
|
|
<div class="wave">
|
|
|
@@ -96,7 +96,7 @@
|
|
|
<container-no-input ref="containerNoInputRef" @setContainer="setContainer" :selectTask="selectTask" />
|
|
|
<!-- 拣货任务号-->
|
|
|
<picking-no-input ref="pickingNoInputRef" @loadData="loadData" />
|
|
|
- <van-floating-bubble v-if="locationList.length>0" gap="50" axis="xy" magnetic="x" @click="onContainerNo(containerNo===''?2:scanType)">容器</van-floating-bubble>
|
|
|
+ <van-floating-bubble v-if="locationList.length>0" :gap="50" axis="xy" magnetic="x" @click="onContainerNo(containerNo===''?2:scanType)">容器</van-floating-bubble>
|
|
|
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -210,7 +210,11 @@ const loadData = async (pickingCode) => {
|
|
|
}
|
|
|
const setContainer=(code,type)=>{
|
|
|
containerNo.value=code
|
|
|
- onScan(type)
|
|
|
+ if(type==4){
|
|
|
+ onScan(3)
|
|
|
+ }else {
|
|
|
+ onScan(type)
|
|
|
+ }
|
|
|
}
|
|
|
const getPickingCode= async()=>{
|
|
|
const { pickingCode } = await fetchPickingData(warehouse)
|
|
|
@@ -351,14 +355,17 @@ const validate = (data) => {
|
|
|
return false;
|
|
|
}
|
|
|
if (data.count < 0) {
|
|
|
+ messageTips.value='拣货数量无效'
|
|
|
showToast('拣货数量无效');
|
|
|
return false;
|
|
|
}
|
|
|
if (data.count > data.expectedQuantity) {
|
|
|
showToast('拣货数量不能大于所需数量');
|
|
|
+ messageTips.value='拣货数量不能大于所需数量'
|
|
|
return false;
|
|
|
}
|
|
|
if (isLot(selectTask.value, [data])) {
|
|
|
+ messageTips.value='当前容器下已有其他批次产品,请更换容器号'
|
|
|
showToast('当前容器下已有其他批次产品,请更换容器号');
|
|
|
return false;
|
|
|
}
|