diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index aa2da191..96ec8526 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -1013,6 +1013,7 @@ export default {
       if (this.showWaybill) {
         const { shipmentTime, ...query } = {
           ...this.queryParams,
+          selectType: this.querys.materialType === '原料' ? 'raw_material' : 'product',
           startTime: this.queryParams.shipmentTime?.[0],
           endTime: this.queryParams.shipmentTime?.[1],
         }
diff --git a/klp-ui/src/views/wms/move/batch.vue b/klp-ui/src/views/wms/move/batch.vue
index 656568d1..c53ec443 100644
--- a/klp-ui/src/views/wms/move/batch.vue
+++ b/klp-ui/src/views/wms/move/batch.vue
@@ -77,7 +77,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="调拨单号" align="center" prop="transferNo" />
       <el-table-column label="调拨单名称" align="center" prop="transferName" />
-      <el-table-column label="调拨状态" align="center" prop="transferStatus" />
+      <!-- <el-table-column label="调拨状态" align="center" prop="transferStatus" /> -->
       <el-table-column label="调拨时间" align="center" prop="transferTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.transferTime, '{y}-{m}-{d}') }}</span>
@@ -206,9 +206,9 @@ export default {
         transferTime: [
           { required: true, message: "实际调拨时间不能为空", trigger: "blur" }
         ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
-        ],
+        // remark: [
+        //   { required: true, message: "备注不能为空", trigger: "blur" }
+        // ],
       },
       // 详情弹窗loading
       detailLoading: false,
@@ -305,6 +305,25 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      // 生成当前时间
+      const currentDate = new Date();
+      // 生成调拨单号：TR + 年月日时分秒
+      const transferNo = 'TR' + currentDate.getFullYear() + 
+        String(currentDate.getMonth() + 1).padStart(2, '0') + 
+        String(currentDate.getDate()).padStart(2, '0') + 
+        String(currentDate.getHours()).padStart(2, '0') + 
+        String(currentDate.getMinutes()).padStart(2, '0') + 
+        String(currentDate.getSeconds()).padStart(2, '0');
+      // 生成调拨时间：YYYY-MM-DD HH:mm:ss
+      const transferTime = currentDate.getFullYear() + '-' + 
+        String(currentDate.getMonth() + 1).padStart(2, '0') + '-' + 
+        String(currentDate.getDate()).padStart(2, '0') + ' ' + 
+        String(currentDate.getHours()).padStart(2, '0') + ':' + 
+        String(currentDate.getMinutes()).padStart(2, '0') + ':' + 
+        String(currentDate.getSeconds()).padStart(2, '0');
+      // 填充表单
+      this.form.transferNo = transferNo;
+      this.form.transferTime = transferTime;
       this.open = true;
       this.title = "添加调拨单主";
     },
diff --git a/klp-ui/src/views/wms/stock/group.vue b/klp-ui/src/views/wms/stock/group.vue
index 76da2059..cb2440bf 100644
--- a/klp-ui/src/views/wms/stock/group.vue
+++ b/klp-ui/src/views/wms/stock/group.vue
@@ -61,8 +61,8 @@
       </vxe-toolbar>
 
       <div style="height: calc(100vh - 260px);">
-        <vxe-table ref="xTree" :loading="loading" :data="list" size="mini" :tree-config="tableTreeConfig"
-          max-height="100%" @row-click="handleTableRowClick" :export-config="{}">
+        <vxe-table ref="xTree" :loading="loading" :data="list" size="mini" :tree-config="effectiveTreeConfig"
+          max-height="100%" @row-click="handleTableRowClick" :export-config="{}" :scroll-y="{ enabled: true }">
           <vxe-table-column field="itemType" title="物料类型" align="center" :formatter="formatterItemType" tree-node sortable :filters="[{label: '产品', value: 'product'}, {label: '原料', value: 'raw_material'}]" :filter-method="filterItemTypeMethod">
             <template v-slot="{ row }">
               <span v-if="row.itemType">{{ formatterItemType(row.itemType) }}</span>
@@ -226,6 +226,11 @@ export default {
       };
       
       return filterData([...this.stockList]);
+    },
+    // 控制是否启用树形数据配置
+    effectiveTreeConfig() {
+      // 当没有分组条件时，不启用树形数据
+      return this.groupForm.groupingCriteria && this.groupForm.groupingCriteria.length > 0 ? this.tableTreeConfig : undefined;
     }
   },
   created() {