载具类型接口增加仓库Id参数

出库调拨接口增加仓库Id参数

src/components/StockIn.vue

@@ -261,7 +261,7 @@ const getList = (page, pageSize) => {
 };
 
 const getCarrierTypeList = () => {
-  const url = '/api/CarrierTypeResource/queryAllType';
+  const url = `/api/CarrierTypeResource/queryAllType?warehouseId=${warehouseId.value}`;
   ajaxApiGet(url).then(
     success => {
       const { errorCode, errorMessage, datas, total } = success;

src/components/StockInScan.vue

@@ -157,8 +157,8 @@ const handleWebSocketMessage = event => {
     }
 
     // 使用code调用getInfo方法
-    if (data.code) {
-      getInfo(data.code);
+    if (data.barcode) {
+      getInfo(data.barcode);
     }
   } catch (error) {
     console.error('解析WebSocket消息失败:', error);
@@ -302,7 +302,7 @@ const submitStockIn = () => {
 };
 
 const getCarrierTypeList = () => {
-  const url = '/api/CarrierTypeResource/queryAllType';
+  const url = `/api/CarrierTypeResource/queryAllType?warehouseId=${warehouseId.value}`;
   ajaxApiGet(url).then(
     success => {
       const { errorCode, errorMessage, datas, total } = success;

src/components/StockOut.vue

@@ -20,6 +20,7 @@
             <van-field v-model="item.inventoryName" name="inventoryName" label="物料名称:" readonly />
             <van-field v-model="item.inventoryType" name="inventoryType" label="规格型号:" readonly />
             <van-field v-model="item.quantity" name="quantity" label="库存:" readonly />
+            <van-field v-model="item.batchNo" name="batchNo" label="批号:" readonly type="textarea" rows="1" autosize />
             <van-field v-model="item.positionName" name="positionName" label="货位:" readonly />
           </van-form>
         </div>
@@ -112,13 +113,14 @@ const formData = ref({
   positionNo: '',
   positionName: '',
   outAll: true,
+  warehouseId: '',
 });
 
 const warehouseId = ref('');
 const title  = ref('');
 const warehouseName = ref('');
 
-onMounted(() => { 
+onMounted(() => {
   warehouseId.value = route.query.warehouseId || '';
   warehouseName.value = route.query.warehouseName || '';
   title.value = route.query.warehouseName ? '出库 - ' + route.query.warehouseName : '出库';
@@ -166,6 +168,7 @@ const stockOut = item => {
   formData.value.positionName = item.positionName;
   formData.value.positionNo = item.positionNo;
   isShowStockOut.value = true;
+  formData.value.warehouseId = warehouseId.value;
 };
 
 // 出库确认
@@ -243,7 +246,7 @@ const getList = (page, pageSize) => {
         } else {
           const error = { status: 200, responseText: errorMessage };
           reject(error);
-        } 
+        }
       },
       error => {
         reject(error);

src/components/StockOutScan.vue

@@ -144,8 +144,8 @@ const handleWebSocketMessage = event => {
     const positionId = stockData.value.positionId || '';
 
     // 使用code调用getInfo方法
-    if (data.code) {
-      getInfo(data.code, data.batchNumber, positionId);
+    if (data.barcode) {
+      getInfo(data.barcode, data.batchNumber, positionId);
     }
   } catch (error) {
     console.error('解析WebSocket消息失败:', error);

src/components/StockTransfer.vue

@@ -20,6 +20,7 @@
             <van-field v-model="item.inventoryName" name="inventoryName" label="物料名称:" readonly />
             <van-field v-model="item.inventoryType" name="inventoryType" label="规格型号:" readonly />
             <van-field v-model="item.quantity" name="quantity" label="库存:" readonly />
+            <van-field v-model="item.batchNo" name="batchNo" label="批号:" readonly type="textarea" rows="1" autosize />
             <van-field v-model="item.positionName" name="positionName" label="货位:" readonly />
           </van-form>
         </div>
@@ -102,6 +103,7 @@ const formData = ref({
   positionAfterId: '',
   positionAfterNo: '',
   positionAfterName: '',
+  warehouseId: '',
 });
 
 const warehouseId = ref(null);
@@ -149,6 +151,7 @@ const transfer = item => {
   formData.value.positionBeforeName = item.positionName;
   formData.value.positionBeforeNo = item.positionNo;
   isShowStockTransfer.value = true;
+  formData.value.warehouseId = warehouseId.value;
 };
 
 // 调拨确认

src/components/StockTransferScan.vue

@@ -136,8 +136,8 @@ const handleWebSocketMessage = event => {
     const positionBeforeId = stockData.value.positionBeforeId || '';
 
     // 使用code调用getInfo方法
-    if (data.code) {
-      getInfo(data.code, data.batchNumber, positionBeforeId);
+    if (data.barcode) {
+      getInfo(data.barcode, data.batchNumber, positionBeforeId);
     }
   } catch (error) {
     console.error('解析WebSocket消息失败:', error);