merge dev into test: 同步库存展示兜底逻辑

src/views/pick/pickApply/components/selfBuildPick.vue

@@ -123,7 +123,9 @@
 
           <el-table-column label="计量库存数量" prop="measureQuantity">
             <template slot-scope="{ row, $index }">
-              {{ row.measureQuantity }} {{ row.measuringUnit }}
+              <!--  物品维度后端回填的是 measureQuantity（物品聚合库存），
+               批次维度回填的是 stockCountBase（批次库存），两者兜底展示 -->
+              {{ row.stockCountBase ?? row.measureQuantity }} {{ row.measuringUnit }}
             </template>
           </el-table-column>