Merge branch 'dev'

src/views/order/podUs/PodMakeOrder.vue

@@ -357,8 +357,17 @@ watch(visible, async (value: boolean) => {
   if (value) {
   if (value) {
     podOrderDetailsData.value = {}
     podOrderDetailsData.value = {}
     currentCode = ''
     currentCode = ''
-    warehouseId.value = props.warehouseList[0].id
-    _warehouseId.value = props.warehouseList[0].id
+    // warehouseId.value = props.warehouseList[0].id
+    // _warehouseId.value = props.warehouseList[0].id
+    const locaclWarehouseId = localStorage.getItem('locaclWarehouseId')
+    // 设置仓库ID，优先使用本地存储的值，否则使用列表中的第一个仓库
+    warehouseId.value = locaclWarehouseId
+      ? JSON.parse(locaclWarehouseId)
+      : props.warehouseList[0].id
+
+    _warehouseId.value = locaclWarehouseId
+      ? JSON.parse(locaclWarehouseId)
+      : props.warehouseList[0].id
 
 
     if (userStore.user?.factory.id) {
     if (userStore.user?.factory.id) {
       try {
       try {
@@ -382,9 +391,9 @@ watch(visible, async (value: boolean) => {
     initOrderDetailBox()
     initOrderDetailBox()
     initPrintDevice()
     initPrintDevice()
     const locaclPrinter = localStorage.getItem('sheetPrinter')
     const locaclPrinter = localStorage.getItem('sheetPrinter')
-    const locaclWarehouseId = localStorage.getItem('locaclWarehouseId')
+    // const locaclWarehouseId = localStorage.getItem('locaclWarehouseId')
     if (locaclPrinter) sheetPrinter.value = JSON.parse(locaclPrinter)
     if (locaclPrinter) sheetPrinter.value = JSON.parse(locaclPrinter)
-    if (locaclWarehouseId) warehouseId.value = JSON.parse(locaclWarehouseId)
+    // if (locaclWarehouseId) warehouseId.value = JSON.parse(locaclWarehouseId)
   } else {
   } else {
     if (userStore.user?.factory.id) {
     if (userStore.user?.factory.id) {
       socket.send({
       socket.send({