工厂端仓库

src/api/warehouse.ts

@@ -4,11 +4,37 @@ export interface factoryWarehouseInfo{
   pageSize:number
   pageSize:number
   currentPage:number
   currentPage:number
   total?:number
   total?:number
+  warehouseId?: string;
+  locationName?: string;
+  remark?: string;
+}
+
+export interface WarehouseInventory {
+  pageSize: number;
+  currentPage: number;
+  total?: number;
+  warehouseId: string;
+  skuName: string;
+  warehouseSku: string;
+  occupyInventory: string;
+  freezeInventory: string;
+  inventory: string;
+  upperLimit: string;
+  usableInventoryStart: string;
+  usableInventoryEnd: string;
+  occupyInventoryEnd: string;
+  occupyInventoryStart: string;
+  floorLimit: string;
 }
 }
 export interface UpdateDefaulted{
 export interface UpdateDefaulted{
   id?: number;
   id?: number;
   defaulted: number;
   defaulted: number;
 }
 }
+
+export interface UpdateStatus{
+  id?: number;
+  status: number | undefined;
+}
 export interface warehouseInfo{
 export interface warehouseInfo{
   id?: number;
   id?: number;
   name: string;
   name: string;
@@ -19,6 +45,26 @@ export interface warehouseInfo{
   factoryCode?: string;
   factoryCode?: string;
   remarks: string
   remarks: string
 }
 }
+
+export interface positionInfo{
+  id?: number;
+  warehouseId: string;
+  locationName: string;
+  pickingOrder: string;
+  locationCode: string;
+  warehouseName?: string ;
+  status?: number;
+  remark: string
+}
+export interface positionFormInfo{
+  id?: number;
+  warehouseId: string;
+  locationName: string;
+  pickingOrder: string;
+  locationCode: string;
+  warehouseName: string ;
+  remark: string
+}
 interface WarehouseWarningData {
 interface WarehouseWarningData {
   id: number;
   id: number;
   factoryId: number;
   factoryId: number;
@@ -41,12 +87,26 @@ interface WarehouseWarningData {
   createTime: string;
   createTime: string;
   updateTime: string;
   updateTime: string;
 }
 }
+export function getFactoryLocation(data: factoryWarehouseInfo) {
+  return axios.post<never, BasePaginationData<positionInfo>>(
+    'factoryWarehouseLocation/list_page',
+    data,
+  )
+}
+
 export function getFactoryWarehouseInfo(data: factoryWarehouseInfo) {
 export function getFactoryWarehouseInfo(data: factoryWarehouseInfo) {
   return axios.post<never, BasePaginationData<warehouseInfo>>(
   return axios.post<never, BasePaginationData<warehouseInfo>>(
     'factoryWarehouseInfo/list_page',
     'factoryWarehouseInfo/list_page',
     data,
     data,
   )
   )
 }
 }
+
+export function getWarehouseInventoryInfo(data: WarehouseInventory) {
+  return axios.post<never, BasePaginationData<warehouseInfo>>(
+    'factoryWarehouseInventory/list_page',
+    data,
+  )
+}
 export function createWarehouseApi(data:warehouseInfo) {
 export function createWarehouseApi(data:warehouseInfo) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     '/factoryWarehouseInfo/add',
     '/factoryWarehouseInfo/add',
@@ -54,18 +114,38 @@ export function createWarehouseApi(data:warehouseInfo) {
   )
   )
 }
 }
 
 
+export function createPositionApi(data:positionInfo) {
+  return axios.post<never, BaseRespData<never>>(
+    '/factoryWarehouseLocation/add',
+    data
+  )
+}
+
+export function warehouseInfoGetAll() {
+  return axios.get<never, BaseRespData<warehouseInfo[]>>(
+    '/factoryWarehouseInfo/getAll'
+  )
+}
+
 export function createWarehouseInventoryApi(data:WarehouseWarningData) {
 export function createWarehouseInventoryApi(data:WarehouseWarningData) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     '/factoryWarehouseInventory/add',
     '/factoryWarehouseInventory/add',
     data
     data
   )
   )
 }
 }
-export function updateWarehouseApi(data:warehouseInfo | UpdateDefaulted) {
+export function updateWarehouseApi(data:positionInfo | UpdateDefaulted) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     '/factoryWarehouseInfo/update',
     '/factoryWarehouseInfo/update',
     data
     data
   )
   )
 }
 }
+
+export function updatePositionApi(data:positionInfo | UpdateStatus) {
+  return axios.post<never, BaseRespData<never>>(
+    '/factoryWarehouseLocation/update',
+    data
+  )
+}
 export function updateWarehouseInventoryApi(data:WarehouseWarningData) {
 export function updateWarehouseInventoryApi(data:WarehouseWarningData) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     '/factoryWarehouseInventory/update',
     '/factoryWarehouseInventory/update',
@@ -80,6 +160,14 @@ export function deleteWarehouseApi(ids:string) {
     },
     },
   )
   )
 }
 }
+export function deleteLocationApi(ids:string) {
+  return axios.get<never, BaseRespData<never>>(
+    '/factoryWarehouseLocation/delete',
+    {
+      params:{ids}
+    },
+  )
+}
 export function deleteWarehouseInventory(ids:string) {
 export function deleteWarehouseInventory(ids:string) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
     '/factoryWarehouseInventory/delete',
     '/factoryWarehouseInventory/delete',

src/router/index.ts

@@ -23,6 +23,7 @@ import PodOrderList from '@/views/order/pod/index.vue'
 import PodDeliveryNoteList from '@/views/order/pod/deliveryOrderList.vue'
 import PodDeliveryNoteList from '@/views/order/pod/deliveryOrderList.vue'
 import WarehouseManage from '@/views/warehouse/manage.vue'
 import WarehouseManage from '@/views/warehouse/manage.vue'
 import WarehouseWarning from '@/views/warehouse/warning.vue'
 import WarehouseWarning from '@/views/warehouse/warning.vue'
+import WarehousePosition from '@/views/warehouse/position.vue'
 const router = createRouter({
 const router = createRouter({
   history: createWebHistory(),
   history: createWebHistory(),
   routes: [
   routes: [
@@ -117,6 +118,12 @@ const router = createRouter({
             title: '仓库预警',
             title: '仓库预警',
           },
           },
           component: WarehouseWarning,
           component: WarehouseWarning,
+        },{
+          path: '/warehouse/position',
+          meta: {
+            title: '库位管理',
+          },
+          component: WarehousePosition,
         },
         },
       ],
       ],
     },
     },

src/router/menu.ts

@@ -27,7 +27,7 @@ const menu: MenuItem[] = [
           label: '仓库管理',
           label: '仓库管理',
         },
         },
         {
         {
-          index: '/order/list',
+          index: '/warehouse/position',
           id: 122,
           id: 122,
           label: '库位管理',
           label: '库位管理',
         },
         },

src/views/order/pod/index.vue

@@ -231,7 +231,7 @@
           v-if="['TO_BE_CONFIRMED', 'IN_PRODUCTION'].includes(status)"
           v-if="['TO_BE_CONFIRMED', 'IN_PRODUCTION'].includes(status)"
           class="item"
           class="item"
         >
         >
-          <ElButton type="warning" is-dark @click="synchronousPlan">
+          <ElButton :loading="syncLoading" type="warning" is-dark @click="synchronousPlan">
             同步素材图</ElButton
             同步素材图</ElButton
           >
           >
         </span>
         </span>
@@ -1731,6 +1731,7 @@ const openAll = (row: CardOrderData) => {
 // 表格和卡片的选中值：有两种约束
 // 表格和卡片的选中值：有两种约束
 const selection = ref<(CardOrderData | PodProductList)[]>([])
 const selection = ref<(CardOrderData | PodProductList)[]>([])
 const tableData = ref<OrderData[]>([])
 const tableData = ref<OrderData[]>([])
+const syncLoading = ref<boolean>(false)
 const handleSelectionChange = (s: CardOrderData[]) => {
 const handleSelectionChange = (s: CardOrderData[]) => {
   selection.value = s
   selection.value = s
 }
 }
@@ -1813,6 +1814,7 @@ const synchronousPlan = async () => {
       offset: window.innerHeight / 2,
       offset: window.innerHeight / 2,
     })
     })
   }
   }
+  syncLoading.value = true
   try {
   try {
     await showConfirm('是否同步素材图？', {
     await showConfirm('是否同步素材图？', {
       confirmButtonText: '确认',
       confirmButtonText: '确认',
@@ -1826,9 +1828,11 @@ const synchronousPlan = async () => {
     const res = await syncSubOrderDesignImages(selection.value.map(item=>item.id))
     const res = await syncSubOrderDesignImages(selection.value.map(item=>item.id))
     await loadDiffList()
     await loadDiffList()
     await loadTabData()
     await loadTabData()
+    syncLoading.value = false
     ElMessage.success(res.message)
     ElMessage.success(res.message)
   } catch (e) {
   } catch (e) {
     // showError(e)
     // showError(e)
+    syncLoading.value = false
   }
   }
 }
 }
 // 下载稿件
 // 下载稿件