任务发起 选择库位按照放货取货 启用/正常/空闲等状态

.env.local

@@ -4,9 +4,9 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='http://192.168.0.74:48080'
+VITE_BASE_URL='http://192.168.0.74:48080'
 # VITE_BASE_URL='http://192.168.0.153:48080'
-VITE_BASE_URL='http://192.168.0.45:48080'           
+# VITE_BASE_URL='http://192.168.0.45:48080'           
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

src/api/map/map.ts

@@ -201,3 +201,43 @@ export const getMapIsStop = async (params) => {
     params
   })
 }
+
+//创建区域变更点绑定
+export const bindingPositionChangePoint = async (data) => {
+  return await request.post({
+    url: `/system/position-change-point-binding/create`,
+    data
+  })
+}
+
+//根据点位id，查询此点位已经绑定的转换点信息
+export const getPositionChangePoint = async (params) => {
+  return await request.get({
+    url: `/system/position-change-point-binding/get`,
+    params
+  })
+}
+
+//更新区域变更点绑定
+export const updatePositionChangePoint = async (data) => {
+  return await request.put({
+    url: `/system/position-change-point-binding/update`,
+    data
+  })
+}
+
+//根据排序查询点位信息
+export const getPositionChangePointBySortNum = async (data) => {
+  return await request.get({
+    url: `/system/position-change-point-binding/getItemBySortNum`,
+    data
+  })
+}
+
+//删除区域变更点绑定
+export const deletePositionChangePoint = async (data) => {
+  return await request.delete({
+    url: `/system/position-change-point-binding/delete`,
+    data
+  })
+}

src/views/mapPage/components/locationSelectionDialog.vue

@@ -138,10 +138,12 @@ const props = defineProps({
 })
 
 const locationTypeNumber = ref(1)
-const open = (locationTypeNum) => {
+const locationTypeStr = ref() //release放货  take取货
+const open = (locationTypeNum, locationTyp) => {
   dialogFormVisible.value = true
   currentItem.value = null
   locationTypeNumber.value = locationTypeNum
+  locationTypeStr.value = locationTyp
   imgBgObj.positionMapId = props.positionMapId
   getMapList()
 }
@@ -323,13 +325,25 @@ const choosePoint = (item) => {
 const chooseLocationPoint = (item) => {
   if (item.locationEnable === 0) {
     message.warning('该库位已被禁用')
-  } else if (item.locationLock === 0) {
+    return
-    message.warning('该库位已被锁定')
-  } else if (item.locationUseStatus === 1) {
-    message.warning('该库位已被占用')
-  } else {
-    currentItem.value = item
   }
+
+  if (item.locationLock === 0) {
+    message.warning('该库位已被锁定')
+    return
+  }
+
+  // locationUseStatus  1占用 0空闲
+  if (item.locationUseStatus === 1 && locationTypeStr.value === 'release') {
+    message.warning('该库位已被占用')
+    return
+  }
+
+  if (item.locationUseStatus === 0 && locationTypeStr.value === 'take') {
+    message.warning('该库位没有货物')
+    return
+  }
+  currentItem.value = item
 }
 
 const submitAddForm = () => {

src/views/mapPage/realTimeMap/components/createTaskDialog.vue

@@ -308,7 +308,7 @@ const chooseLocation = (type) => {
     //放货
     locationTypeNumber.value = formData.value.taskDetailList[0].releaseType
   }
-  locationSelectionDialogRef.value.open(locationTypeNumber.value)
+  locationSelectionDialogRef.value.open(locationTypeNumber.value, type)
 }
 //成功选择库位
 const locationSelectionDialogSuccess = (item) => {

src/views/mapPage/taskManagement/createTask.vue

@@ -1277,7 +1277,7 @@ const chooseLocation = (type, item, index) => {
     //放货
     locationTypeNumber.value = item.releaseType
   }
-  locationSelectionDialogRef.value.open(locationTypeNumber.value)
+  locationSelectionDialogRef.value.open(locationTypeNumber.value, type)
 }
 //成功选择库位
 const locationSelectionDialogSuccess = (item) => {