盲收支持P单号

src/utils/request.ts

@@ -52,6 +52,9 @@ service.interceptors.response.use(
       if(res.code===305 && response.config.url=='api/entryOrder/app/blind/checkBarcodeIgnoreCase'){
         return res
       }
+      if(res.message=='找不到此盲收任务'){
+        return res
+      }
       showNotify({
         message: res.message || '系统异常，请联系技术支持！',
         duration: 5000,
@@ -67,7 +70,7 @@ service.interceptors.response.use(
       showFailToast({ duration: 5000, message: '请求超时，请稍后重试！', wordBreak: 'break-word' });
     }else if(error.code === 'ERR_NETWORK'){
       showFailToast({duration:5000,message:'网络开小车了, 请稍后重试！',wordBreak:'break-word'})
-    }else {
+    } else {
       showNotify({
         message: error.message,
         duration: 8000,

src/views/inbound/blindCollection/mode/index.vue

@@ -131,28 +131,32 @@ const _getBlindTask=()=>{
   }
   taskModel.value={}
   let url=getBlindTask,data={taskNo:taskNo.value},type=0
-  if(taskNo.value.startsWith("BC")) {
-    url=getMovingTask
-    data={code:taskNo.value}
-    type=1
-  }
   showLoading()
   url(data).then(res=>{
     scanSuccess()
     taskModel.value=res.data
     //盲收任务
-    if(type===0){
-      if(res.data && res.data.type){
+      if(res.message=='找不到此盲收任务'){
+        if(taskNo.value.startsWith("P")) {
+          taskModel.value={
+            typeCode:undefined,
+            code:taskNo.value,
+            warehouseCode:undefined,
+            ownerCode:undefined
+          }
+          showToast({duration:5000,message:'该任务未绑定模式,请选择模式!'})
+          return
+        }else {
+          taskModel.value={}
+          showToast({duration:5000,message:'找不到此盲收任务'})
+          return
+        }
+      }else if(res.data && res.data.type){
         link(res.data.code,res.data.typeCode)
         closeLoading()
       }else {
         showToast({duration:5000,message:'该任务未绑定模式,请选择模式!'})
       }
-    }else {
-      //般仓任务
-      if(res.data){
-      }
-    }
   })
     .catch((err)=>{
       closeLoading()
@@ -166,7 +170,7 @@ const modeMap={
 }
 //设置盲收任务类型
 const onSelect=(type)=>{
-  const {typeCode,code,warehouseCode,ownerCode}=taskModel.value
+
   if(taskNo.value===''){
     showToast({duration:5000,message:'请先扫描盲收任务号'})
     return
@@ -175,6 +179,7 @@ const onSelect=(type)=>{
     showToast({duration:5000,message:'未检测到任务，请检查任务号是否正确！'})
     return
   }
+  const {typeCode,code,warehouseCode,ownerCode}=taskModel.value
   if(typeCode){
     link(code,typeCode)
     return
@@ -193,8 +198,13 @@ const onSelect=(type)=>{
       }
       showLoading()
       setBlindTaskMode(params).then(res=>{
+        if(res.message=='找不到此盲收任务'){
+          showToast({duration:5000,message:'找不到此盲收任务'})
+          return
+        }
         link(code,type)
-      }).finally(()=>{
+        closeLoading()
+      }).catch(err=>{
         closeLoading()
       })
     })

src/views/outbound/picking/list/index.vue

@@ -413,14 +413,12 @@ const _handlerScan=(code)=> {
         let barcode = Object.keys(listMap).find(key => {
           return key.includes(`${upperCode},`) || key.includes(`${code}-null`);
         });
-      console.log(barcode,"barcode")
         let activeBarcode=listMap[barcode]
         if (!activeBarcode) {
           activeBarcode = modelLocative.list.find(item => {
             return barcodeToUpperCase(item.barcode) === upperCode || item.barcodeAs === upperCode;
           });
         }
-        console.log(activeBarcode,"activeBarcode")
         if(activeBarcode.operationTime){
           showConfirmDialog({
             title: '温馨提示',