宝时快上-库位验证增加参数

src/api/basic/index.ts

@@ -59,7 +59,8 @@ export function existsLocationTypeMaxQty(data: {
   warehouse: string
   owner: string
   sku: string
-  location: string
+  location: string,
+  locationUse: string
 }) {
   return request({
     url: '/api/basic/location/resource/existsLocationTypeMaxQty',

src/views/inbound/putaway/task/index.vue

@@ -225,12 +225,14 @@ const validateCustomPutawayLocation = async (locationCode) => {
   if (isScannedLocationInRecommendedList(locationCode)) return true
   const batchItem = barcodeActiveList.value[0]
   if (!batchItem) return false
+  if(!searchLocation.value) return false
   try {
     const res = await existsLocationTypeMaxQty({
       warehouse,
       owner: batchItem.owner,
       sku: batchItem.sku,
       location: locationCode,
+      locationUse:locationType.value
     })
     if (res?.data === true) {
       showNotify({ type: 'warning', duration: 3000, message: '请按系统推荐库位上架' })
@@ -303,7 +305,7 @@ const syncLastChangeLocationTypeFromList = () => {
 const resolveChangeLocationType = (larger) => {
   const fromList = pickLocationTypeFromList(larger)
   if (fromList) return fromList
-  if (larger && lastChangeLocationType.value) return lastChangeLocationType.value
+  if (lastChangeLocationType.value) return lastChangeLocationType.value
   return ''
 }
 //换一换使用的库位类型(换大的或换小的)
@@ -776,6 +778,9 @@ const changeLocationPickerRef = ref(null)
 const getChangeLocationDisabledState = () => {
   const noLargerType = !pickLocationTypeFromList(true)
   const noSmallerType = !pickLocationTypeFromList(false)
+  if (noLargerType && noSmallerType && !lastChangeLocationType.value) {
+    return { disableLarger: true, disableSmaller: true }
+  }
   return {
     disableLarger: noLargerType && lastChangeLocationDirection.value === true,
     disableSmaller: noSmallerType && lastChangeLocationDirection.value === false,