Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts

@@ -470,12 +470,12 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
         searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
         searchCondition:[
-        //   {
+          {
-        //   key: 'locationCode',
+          key: 'warehouseCode',
-        //   value: 'fromLocationCode',
+          value: 'fromWarehouseCode',
-        //   message: '请填写从库位代码！',
+          message: '请填写从仓库代码！',
-        //   isMainValue: true
+          isMainValue: true
-        // },
+        },
         {
           key: 'inventoryStatus',
           value: 'OK',
@@ -492,12 +492,12 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
       searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
       searchCondition:[
-      //   {
+        {
-      //   key: 'locationCode',
+        key: 'warehouseCode',
-      //   value: 'fromLocationCode',
+        value: 'fromWarehouseCode',
-      //   message: '请填写从库位代码！',
+        message: '请填写从仓库代码！',
-      //   isMainValue: true
+        isMainValue: true
-      // },
+      },
       {
         key: 'inventoryStatus',
         value: 'OK',