Merge remote-tracking branch 'origin/master'

src/api/picking/index.ts

@@ -8,11 +8,13 @@ import { getPickingDetailType, getPickingFirstType, getPickingTaskType, getPicki
  */
 export function getPickingTask(params:getPickingTaskType) {
   return request({
-    url: 'api/wms/picking/available-panel/owner-warehouse',
-    method: 'get',
-    params
+    url: 'api/wms/order/picking/getOutboundPickingList',
+    method: 'post',
+    params,
+    data:[]
   })
 }
+
 /**
  * 获取拣货任务详情（特殊、加急、活动）
  * @param data

src/views/outbound/check/activity/index.vue

@@ -539,6 +539,9 @@ const setBarcode = (code) => {
         isQualityCheck.value = dataList.value.some(item => item.qualityCheck === true);
       }else {
         dataList.value=[]
+        if(Object.keys(orderMap.value.cancelGroup).length>0){
+          packingRequests(0,0)
+        }
       }
       matchBarcodeList.value=[]
       scanBarcode.value=''