diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue
index d70f0fc..aa25622 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtBjdbd/index.vue
@@ -1,92 +1,104 @@
 <template>
-	<div class="NCC-common-layout">
+	<div class="NCC-common-layout wt-bjdbd-list">
 		<div class="NCC-common-layout-center">
 			<el-row class="NCC-common-search-box" :gutter="16">
 				<el-form @submit.native.prevent>
 					<el-col :span="6">
 						<el-form-item label="单据编号">
-							<el-input v-model="query.id" placeholder="单据编号" clearable />	
+							<el-input v-model="query.id" placeholder="单据编号" clearable />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="单据日期">
-							<el-date-picker v-model="query.djrq" type="daterange" value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
-							</el-date-picker>
+							<el-date-picker v-model="query.djrq" type="daterange" value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="出库仓库">
-							<el-select v-model="query.cjck" placeholder="出库仓库" clearable >
-								<el-option v-for="(item, index) in cjckOptions" :key="index" :label="item.F_mdmc" :value="item.F_Id"  />
+							<el-select v-model="query.cjck" placeholder="出库仓库" clearable filterable>
+								<el-option v-for="(item, index) in cjckOptions" :key="index" :label="item.F_mdmc" :value="item.F_Id" />
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<template v-if="showAll">
 					<el-col :span="6">
-						<el-form-item label="经手人">
-							<userSelect v-model="query.jsr" placeholder="请选择经手人" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="优惠金额">
-							<el-input v-model="query.ysje" placeholder="优惠金额" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="收款账户">
-							<el-select v-model="query.skzh" placeholder="收款账户" clearable >
-								<el-option v-for="(item, index) in skzhOptions" :key="index" :label="item.fullName" :value="item.id"  />
+						<el-form-item label="入库仓库">
+							<el-select v-model="query.rkck" placeholder="入库仓库" clearable filterable>
+								<el-option v-for="(item, index) in rkckOptions" :key="index" :label="item.F_mdmc" :value="item.F_Id" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="收款金额">
-							<el-input v-model="query.skje" placeholder="收款金额" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="制单人">
-							<userSelect v-model="query.zdr" placeholder="请选择制单人" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="审核人">
-							<userSelect v-model="query.shr" placeholder="请选择审核人" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="过账人">
-							<userSelect v-model="query.gzr" placeholder="请选择过账人" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="备注">
-							<el-input v-model="query.bz" placeholder="备注" />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="单据类型">
-							<el-input v-model="query.djlx" placeholder="单据类型" clearable />	
-						</el-form-item>
-					</el-col>
-
-                    <el-col :span="6">
-						<el-form-item label="单据来源">
-							<el-select v-model="query.ly" placeholder="单据来源" clearable >
-								  <el-option label="门店" value="门店"></el-option>
-                                  <el-option label="抖音抓单" value="抖音抓单"></el-option>
+						<el-form-item label="单据状态">
+							<el-select v-model="query.djzt" placeholder="全部" clearable>
+								<el-option label="草稿" value="草稿" />
+								<el-option label="待审核" value="待审核" />
+								<el-option label="已审核" value="已审核" />
 							</el-select>
 						</el-form-item>
 					</el-col>
-
-                    
+					<template v-if="showAll">
+						<el-col :span="6">
+							<el-form-item label="经手人">
+								<userSelect v-model="query.jsr" placeholder="请选择经手人" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="制单人">
+								<userSelect v-model="query.zdr" placeholder="请选择制单人" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="备注">
+								<el-input v-model="query.bz" placeholder="备注" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="优惠金额">
+								<el-input v-model="query.ysje" placeholder="优惠金额" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="收款账户">
+								<el-select v-model="query.skzh" placeholder="收款账户" clearable>
+									<el-option v-for="(item, index) in skzhOptions" :key="index" :label="item.fullName" :value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="收款金额">
+								<el-input v-model="query.skje" placeholder="收款金额" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="审核人">
+								<userSelect v-model="query.shr" placeholder="请选择审核人" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="过账人">
+								<userSelect v-model="query.gzr" placeholder="请选择过账人" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="单据类型">
+								<el-input v-model="query.djlx" placeholder="单据类型" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="单据来源">
+								<el-select v-model="query.ly" placeholder="单据来源" clearable>
+									<el-option label="门店" value="门店" />
+									<el-option label="抖音抓单" value="抖音抓单" />
+								</el-select>
+							</el-form-item>
+						</el-col>
 					</template>
 					<el-col :span="6">
 						<el-form-item>
 							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
 							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
-							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" v-if="!showAll" @click="showAll = true">展开</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" v-else @click="showAll = false">收起</el-button>
 						</el-form-item>
 					</el-col>
 				</el-form>
@@ -105,275 +117,341 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
-					<el-table-column prop="id" label="单据编号" align="left" width="160">
+				<NCC-table v-loading="listLoading" :data="list" has-c class="bjd-table" @selection-change="handleSelectionChange">
+					<el-table-column prop="id" label="单据编号" align="left" width="168" show-overflow-tooltip>
 						<template slot-scope="scope">
-							<i class="el-icon-document" style="color:#409EFF;margin-right:4px" />
-							{{ scope.row.id || '无' }}
+							<span class="cell-nowrap">
+								<i class="el-icon-document" style="color:#409EFF;margin-right:4px" />
+								{{ cellText(scope.row.id) }}
+							</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="djrq" label="单据日期" align="left"  :formatter="ncc.tableDateFormat" />
-					<el-table-column label="出库仓库" prop="cjck" align="left" min-width="100" show-overflow-tooltip>
-							<template slot-scope="scope">
-								<i class="el-icon-office-building" style="color:#909399;margin-right:4px" />
-								{{ scope.row.cjck | dynamicText(cjckOptions) }}
-							</template>
+					<el-table-column prop="djrq" label="单据日期" align="left" width="118" :formatter="ncc.tableDateFormat" show-overflow-tooltip>
+						<template slot="header">
+							<span><i class="el-icon-date" style="color:#409EFF;margin-right:4px" />单据日期</span>
+						</template>
 					</el-table-column>
-					<el-table-column prop="bjsx" label="变价系数%" align="right" width="100">
+					<el-table-column label="出库仓库" prop="cjck" align="left" min-width="108" show-overflow-tooltip>
 						<template slot-scope="scope">
-							<i class="el-icon-sort" style="color:#E6A23C;margin-right:4px" />
-							{{ scope.row.bjsx != null && scope.row.bjsx !== '' ? scope.row.bjsx + '%' : '无' }}
+							<span class="cell-nowrap">
+								<i class="el-icon-upload2" style="color:#909399;margin-right:4px" />
+								{{ displayWarehouse(scope.row.cjck, 'cjck') }}
+							</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="cbje" label="变价成本合计" align="right" width="120">
+					<el-table-column label="入库仓库" prop="rkck" align="left" min-width="108" show-overflow-tooltip>
 						<template slot-scope="scope">
-							<i class="el-icon-coin" style="color:#67C23A;margin-right:4px" />
-							{{ scope.row.cbje != null && scope.row.cbje !== '' ? scope.row.cbje : '无' }}
+							<span class="cell-nowrap">
+								<i class="el-icon-download" style="color:#67C23A;margin-right:4px" />
+								{{ displayWarehouse(scope.row.rkck, 'rkck') }}
+							</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="jsr" label="经手人" align="left" />
-					<el-table-column prop="ysje" label="优惠金额" align="left" />
-					<el-table-column label="收款账户" prop="skzh" align="left">
-							<template slot-scope="scope">{{ scope.row.skzh | dynamicText(skzhOptions) }}</template>
+					<el-table-column prop="bjsx" label="变价系数%" align="right" width="108" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-sort" style="color:#E6A23C;margin-right:4px" />
+								{{ formatBjsx(scope.row.bjsx) }}
+							</span>
+						</template>
 					</el-table-column>
-					<el-table-column prop="skje" label="收款金额" align="left" />
-					<el-table-column prop="zdr" label="制单人" align="left" />
-					<el-table-column prop="shr" label="审核人" align="left" />
-					<el-table-column prop="gzr" label="过账人" align="left" />
-					<el-table-column prop="bz" label="备注" align="left" />
-					<el-table-column prop="djlx" label="单据类型" align="left" />
-					<el-table-column prop="djzt" label="单据状态" align="left" width="100">
+					<el-table-column prop="cbje" label="变价成本合计" align="right" width="128" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-coin" style="color:#67C23A;margin-right:4px" />
+								{{ formatMoney(scope.row.cbje) }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="djzt" label="单据状态" align="center" width="100" show-overflow-tooltip>
 						<template slot-scope="scope">
 							<el-tag v-if="scope.row.djzt === '草稿'" type="info" size="mini">草稿</el-tag>
 							<el-tag v-else-if="scope.row.djzt === '待审核'" type="warning" size="mini">待审核</el-tag>
 							<el-tag v-else-if="scope.row.djzt === '已审核'" type="success" size="mini">已审核</el-tag>
-							<el-tag v-else type="warning" size="mini">{{ scope.row.djzt || '无' }}</el-tag>
+							<el-tag v-else type="warning" size="mini">{{ cellText(scope.row.djzt) }}</el-tag>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作" fixed="right" width="100">
-							<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
-							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+					<el-table-column prop="jsr" label="经手人" align="left" min-width="88" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-user" style="color:#409EFF;margin-right:4px" />
+								{{ cellText(scope.row.jsr) }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="zdr" label="制单人" align="left" min-width="88" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-s-custom" style="color:#909399;margin-right:4px" />
+								{{ cellText(scope.row.zdr) }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="bz" label="备注" align="left" min-width="100" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-edit-outline" style="color:#C0C4CC;margin-right:4px" />
+								{{ cellText(scope.row.bz) }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" width="148">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id, true)">查看</el-button>
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除</el-button>
 						</template>
 					</el-table-column>
 				</NCC-table>
-                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
-            </div>
-        </div>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+			</div>
+		</div>
 		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
 		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 	</div>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import NCCForm from './Form'
-    import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
-	export default {
-        components: { NCCForm, ExportBox },
-        data() {
-            return {
-                showAll: false,
-				query: {
-                    id:undefined,
-                    djrq:undefined,
-                    cjck:undefined,
-                    jsr:undefined,
-                    ysje:undefined,
-                    skzh:undefined,
-                    skje:undefined,
-                    zdr:undefined,
-                    shr:undefined,
-                    gzr:undefined,
-                    bz:undefined,
-                    djlx:'变价调拨单',
-                    ly:undefined
-				},
-                list: [],
-                listLoading: true,
-                multipleSelection: [], total: 0,
-                listQuery: {
-                    currentPage: 1,
-                    pageSize: 20,
-					sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-				columnList: [
-                    { prop: 'id', label: '单据编号' },
-                    { prop: 'djrq', label: '单据日期' },
-                    { prop: 'cjck', label: '出库仓库' },
-                    { prop: 'bjsx', label: '变价系数%' },
-                    { prop: 'cbje', label: '变价成本合计' },
-                    { prop: 'jsr', label: '经手人' },
-                    { prop: 'ysje', label: '优惠金额' },
-                    { prop: 'skzh', label: '收款账户' },
-                    { prop: 'skje', label: '收款金额' },
-                    { prop: 'zdr', label: '制单人' },
-                    { prop: 'shr', label: '审核人' },
-                    { prop: 'gzr', label: '过账人' },
-                    { prop: 'bz', label: '备注' },
-                    { prop: 'djlx', label: '单据类型' },
-                    { prop: 'djzt', label: '单据状态' },
-				],
-				cjckOptions : [],
-				rkckOptions : [],
-				skzhOptions : [],
+import request from '@/utils/request'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import NCCForm from './Form'
+import ExportBox from './ExportBox'
+import { previewDataInterface } from '@/api/systemData/dataInterface'
+
+export default {
+	components: { NCCForm, ExportBox },
+	data() {
+		return {
+			showAll: false,
+			query: {
+				id: undefined,
+				djrq: undefined,
+				cjck: undefined,
+				rkck: undefined,
+				djzt: undefined,
+				jsr: undefined,
+				ysje: undefined,
+				skzh: undefined,
+				skje: undefined,
+				zdr: undefined,
+				shr: undefined,
+				gzr: undefined,
+				bz: undefined,
+				djlx: '变价调拨单',
+				ly: undefined
+			},
+			list: [],
+			listLoading: true,
+			multipleSelection: [],
+			total: 0,
+			listQuery: {
+				currentPage: 1,
+				pageSize: 20,
+				sort: 'desc',
+				sidx: ''
+			},
+			formVisible: false,
+			exportBoxVisible: false,
+			columnList: [
+				{ prop: 'id', label: '单据编号' },
+				{ prop: 'djrq', label: '单据日期' },
+				{ prop: 'cjck', label: '出库仓库' },
+				{ prop: 'rkck', label: '入库仓库' },
+				{ prop: 'bjsx', label: '变价系数%' },
+				{ prop: 'cbje', label: '变价成本合计' },
+				{ prop: 'djzt', label: '单据状态' },
+				{ prop: 'jsr', label: '经手人' },
+				{ prop: 'zdr', label: '制单人' },
+				{ prop: 'bz', label: '备注' },
+				{ prop: 'ysje', label: '优惠金额' },
+				{ prop: 'skzh', label: '收款账户' },
+				{ prop: 'skje', label: '收款金额' },
+				{ prop: 'shr', label: '审核人' },
+				{ prop: 'gzr', label: '过账人' },
+				{ prop: 'djlx', label: '单据类型' }
+			],
+			cjckOptions: [],
+			rkckOptions: [],
+			skzhOptions: []
+		}
+	},
+	computed: {},
+	created() {
+		this.initData()
+		this.getcjckOptions()
+		this.getrkckOptions()
+		this.getskzhOptions()
+	},
+	methods: {
+		cellText(v) {
+			if (v === null || v === undefined || v === '') return '无'
+			return v
+		},
+		formatMoney(v) {
+			if (v === null || v === undefined || v === '') return '无'
+			const n = Number(v)
+			return isNaN(n) ? '无' : n.toFixed(2)
+		},
+		formatBjsx(v) {
+			if (v === null || v === undefined || v === '') return '无'
+			const n = Number(v)
+			return isNaN(n) ? '无' : `${n}%`
+		},
+		/** 列表接口已返回门店/仓名称时直接展示；否则用选项映射 */
+		displayWarehouse(val, type) {
+			const raw = this.cellText(val)
+			if (raw === '无') return '无'
+			const opts = type === 'rkck' ? this.rkckOptions : this.cjckOptions
+			const hit = (opts || []).find(o => o.F_Id === val)
+			return hit ? hit.F_mdmc : raw
+		},
+		getcjckOptions() {
+			previewDataInterface('681758216954053893').then(res => {
+				this.cjckOptions = res.data
+			})
+		},
+		getrkckOptions() {
+			previewDataInterface('681758216954053893').then(res => {
+				this.rkckOptions = res.data
+			})
+		},
+		getskzhOptions() {
+			getDictionaryDataSelector('681761709836207365').then(res => {
+				this.skzhOptions = res.data.list
+			})
+		},
+		initData() {
+			this.listLoading = true
+			const _query = {
+				...this.listQuery,
+				...this.query
+			}
+			const query = {}
+			for (const key in _query) {
+				if (Array.isArray(_query[key])) {
+					query[key] = _query[key].join()
+				} else {
+					query[key] = _query[key]
+				}
+			}
+			query.djlx = '变价调拨单'
+			request({
+				url: `/api/Extend/WtXsckd`,
+				method: 'GET',
+				data: query
+			}).then(res => {
+				this.list = res.data.list
+				this.total = res.data.pagination.total
+				this.listLoading = false
+			})
+		},
+		handleDel(id) {
+			this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+				type: 'warning'
+			}).then(() => {
+				request({
+					url: `/api/Extend/WtXsckd/${id}`,
+					method: 'DELETE'
+				}).then(res => {
+					this.$message({
+						type: 'success',
+						message: res.msg,
+						onClose: () => {
+							this.initData()
+						}
+					})
+				})
+			}).catch(() => {})
+		},
+		handleSelectionChange(val) {
+			this.multipleSelection = val.map(item => item.id)
+		},
+		handleBatchRemoveDel() {
+			if (!this.multipleSelection.length) {
+				this.$message({
+					type: 'error',
+					message: '请选择一条数据',
+					duration: 1500
+				})
+				return
+			}
+			const ids = this.multipleSelection
+			this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+				type: 'warning'
+			}).then(() => {
+				request({
+					url: `/api/Extend/WtXsckd/batchRemove`,
+					method: 'POST',
+					data: ids
+				}).then(res => {
+					this.$message({
+						type: 'success',
+						message: res.msg,
+						onClose: () => {
+							this.initData()
+						}
+					})
+				})
+			}).catch(() => {})
+		},
+		addOrUpdateHandle(id, isDetail) {
+			this.formVisible = true
+			this.$nextTick(() => {
+				this.$refs.NCCForm.init(id, isDetail)
+			})
+		},
+		exportData() {
+			this.exportBoxVisible = true
+			this.$nextTick(() => {
+				this.$refs.ExportBox.init(this.columnList)
+			})
+		},
+		download(data) {
+			const query = { ...data, ...this.listQuery, ...this.query }
+			request({
+				url: `/api/Extend/WtXsckd/Actions/Export`,
+				method: 'GET',
+				data: query
+			}).then(res => {
+				if (!res.data.url) return
+				window.location.href = this.define.comUrl + res.data.url
+				this.$refs.ExportBox.visible = false
+				this.exportBoxVisible = false
+			})
+		},
+		search() {
+			this.listQuery = {
+				currentPage: 1,
+				pageSize: 20,
+				sort: 'desc',
+				sidx: ''
 			}
-        },
-		computed: {},
-		created() {
 			this.initData()
-			this.getcjckOptions();
-			this.getrkckOptions();
-			this.getskzhOptions();
 		},
-		methods: {
-			getcjckOptions(){
-				previewDataInterface('681758216954053893').then(res => {
-					this.cjckOptions = res.data
-				});
-			},
-			getrkckOptions(){
-				previewDataInterface('681758216954053893').then(res => {
-					this.rkckOptions = res.data
-				});
-			},
-			getskzhOptions(){
-				getDictionaryDataSelector('681761709836207365').then(res => {
-					this.skzhOptions = res.data.list
-				});
-			},
-			initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query
-                };
-                let query = {}
-                for (let key in _query) {
-                    if (Array.isArray(_query[key])) {
-                        query[key] = _query[key].join()
-                    } else {
-                        query[key] = _query[key]
-                    }
-                }
-                query.djlx='变价调拨单';
-                
-                request({
-                    url: `/api/Extend/WtXsckd`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    this.list = res.data.list
-                    this.total = res.data.pagination.total
-                    this.listLoading = false
-                })
-            },
-			handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/WtXsckd/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-			handleSelectionChange(val) {
-                const res = val.map(item => item.id)
-                this.multipleSelection = res
-            },
-            handleBatchRemoveDel() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        type: 'error',
-                        message: '请选择一条数据',
-                        duration: 1500,
-                    })
-                    return
-                }
-                const ids = this.multipleSelection
-                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/WtXsckd/batchRemove`,
-                        method: 'POST',
-                        data: ids ,
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => { })
-            },
-			addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.NCCForm.init(id, isDetail)
-                })
-            },
-			exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = { ...data, ...this.listQuery, ...this.query }
-                request({
-                    url: `/api/Extend/WtXsckd/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    window.location.href = this.define.comUrl + res.data.url
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-			search() {
-                this.listQuery = {
-                    currentPage: 1,
-                    pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.query.djlx = '变价调拨单'
-                this.listQuery = {
-                    currentPage: 1,
-                    pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            }
+		refresh(isrRefresh) {
+			this.formVisible = false
+			if (isrRefresh) this.reset()
+		},
+		reset() {
+			for (const key in this.query) {
+				this.query[key] = undefined
+			}
+			this.query.djlx = '变价调拨单'
+			this.listQuery = {
+				currentPage: 1,
+				pageSize: 20,
+				sort: 'desc',
+				sidx: ''
+			}
+			this.initData()
 		}
-    }
-</script>
\ No newline at end of file
+	}
+}
+</script>
+<style scoped>
+.wt-bjdbd-list .bjd-table >>> .el-table .cell {
+	white-space: nowrap;
+}
+.cell-nowrap {
+	white-space: nowrap;
+}
+</style>
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue
index 31e790a..9d040a2 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/Form.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="80%">
 		<el-row :gutter="15" class="" >
 				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
@@ -32,6 +32,11 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :span="12">
+						<el-form-item label="成本合计">
+							<el-input :value="tjCbjeDisplay" placeholder="保存后由系统按调出成本汇总" readonly :style='{"width":"100%"}' />
+						</el-form-item>
+					</el-col>
 					<el-col :span="12" v-if="false">
 						<el-form-item label="往来单位" prop="kh">
 							<el-select v-model="dataForm.kh" placeholder="请选择" clearable  :style='{"width":"100%"}' filterable >
@@ -117,26 +122,32 @@
 										</div>
 									</template>
 								</el-table-column>
-								<el-table-column prop="sl" label="调拨数量">
+								<el-table-column prop="dj" label="成本单价" width="120">
 									<template slot-scope="scope">
 										<el-input
-											v-model="scope.row.sl"
-											placeholder="请输入"
+											v-model="scope.row.dj"
+											placeholder="参考成本，过账以服务端为准"
 											clearable
+											:readonly="!!isDetail"
 											@input="handleAmountChange(scope.row)"
 										></el-input>
 									</template>
 								</el-table-column>
-								<el-table-column prop="dj" label="成本单价" v-if="false">
+								<el-table-column prop="sl" label="调拨数量">
 									<template slot-scope="scope">
 										<el-input
-											v-model="scope.row.dj"
+											v-model="scope.row.sl"
 											placeholder="请输入"
 											clearable
 											@input="handleAmountChange(scope.row)"
 										></el-input>
 									</template>
 								</el-table-column>
+								<el-table-column prop="cbje" label="成本金额" width="100" show-overflow-tooltip>
+									<template slot-scope="scope">
+										<span>{{ formatMxTjdCbje(scope.row) }}</span>
+									</template>
+								</el-table-column>
 								<el-table-column prop="je" label="调拨金额" v-if="false">
 									<template slot-scope="scope">
 										<el-input v-model="scope.row.je" placeholder="请输入" clearable readonly></el-input>
@@ -278,6 +289,7 @@
 					djrq:undefined,
 					cjck:undefined,
 					rkck:undefined,
+					cbje: undefined,
 					jsr:undefined,
 					kh:undefined,
 					gys:undefined,
@@ -317,7 +329,21 @@
 			totalJe() {
 				return (this.dataForm.wtXsckdMxList || []).reduce((sum, row) => sum + (parseFloat(row.je) || 0), 0)
 			},
-
+			/** 主表成本合计：已过账用服务端 cbje；未过账用明细数量×成本单价预览 */
+			tjCbjeDisplay() {
+				const head = this.dataForm.cbje
+				if (head != null && head !== '') {
+					const n = Number(head)
+					return isNaN(n) ? '' : n.toFixed(2)
+				}
+				let sum = 0
+				;(this.dataForm.wtXsckdMxList || []).forEach(row => {
+					const sl = parseInt(row.sl, 10) || 0
+					const dj = parseFloat(row.dj) || 0
+					if (sl > 0 && dj > 0) sum += sl * dj
+				})
+				return sum > 0 ? sum.toFixed(2) : ''
+			},
 		},
         watch: {
             // 监听主表仓库字段变化，确保编辑模式下也能触发联动
@@ -996,6 +1022,7 @@
 					kucun:undefined, // 库存数量
 					sl:undefined,
 					dj:undefined,
+					cbje: undefined,
 					je:undefined,
 					selectedSerialNumbers: [], // 添加序列号数组
 					loadingStock: false, // 库存加载状态
@@ -1051,6 +1078,7 @@
 					if (currentRow.dj) {
 						currentRow.je = (parseFloat(currentRow.sl) * parseFloat(currentRow.dj)).toFixed(2)
 					}
+					this.recalcRowCostPreview(currentRow)
 					// 更新总收款金额
 					this.calculateTotalAmount();
 					
@@ -1061,6 +1089,7 @@
 				const sl = parseFloat(row.sl) || 0;
 				const dj = parseFloat(row.dj) || 0;
 				row.je = (sl * dj).toFixed(2);
+				this.recalcRowCostPreview(row)
 				// 自动计算总收款金额
 				this.calculateTotalAmount();
 				// 检查数量与序列号数量是否一致
@@ -1068,9 +1097,9 @@
 					const serialNumberCount = row.selectedSerialNumbers.length;
 					if (sl !== serialNumberCount) {
 						this.$message.error(`商品"${row.spmc}"的销售数量(${sl})与已选择的序列号数量(${serialNumberCount})不一致，请先调整序列号数量！`);
-						// 恢复为序列号数量
 						row.sl = serialNumberCount.toString();
 						row.je = (serialNumberCount * dj).toFixed(2);
+						this.recalcRowCostPreview(row)
 					}
 				}
 			},
@@ -1079,12 +1108,12 @@
 			handleMainWarehouseChange(value) {
 				// 同步更新所有明细行的出库仓库
 				this.syncDetailWarehouses();
-				// 更新所有明细行的库存
+				// 更新所有明细行的库存与成本参考价
 				this.dataForm.wtXsckdMxList.forEach(row => {
 					if (row.spbh) {
-						this.getStockQuantity(row);
+						this.getStockQuantity(row)
 					}
-				});
+				})
 			},
 			
 			// 处理主表入库仓库变化
@@ -1202,6 +1231,67 @@
 					row.loadingStock = false;
 					console.log('=== 库存查询完成 ===');
 				}
+				if (row.spbh && row.ckck) {
+					await this.applyOutboundCostPrice(row, true)
+				}
+			},
+
+			/** 明细成本金额：已过账用服务端 cbje；未过账用数量×成本单价 */
+			formatMxTjdCbje(row) {
+				if (!row) return '无'
+				if (row.cbje != null && row.cbje !== '') {
+					const n = Number(row.cbje)
+					return isNaN(n) ? '无' : n.toFixed(2)
+				}
+				const sl = parseInt(row.sl, 10)
+				const dj = parseFloat(row.dj)
+				if (sl > 0 && !isNaN(dj) && dj > 0) {
+					return (sl * dj).toFixed(2)
+				}
+				return '无'
+			},
+
+			recalcRowCostPreview(row) {
+				if (!row) return
+				const sl = parseInt(row.sl, 10) || 0
+				const dj = parseFloat(row.dj) || 0
+				if (sl > 0 && dj > 0) {
+					this.$set(row, 'cbje', Number((sl * dj).toFixed(2)))
+				} else {
+					this.$set(row, 'cbje', '')
+				}
+			},
+
+			/**
+			 * 从 wt_sp_cost 拉取调出方成本单价并回填 dj（与过账取价一致）
+			 * @param {boolean} silent 无成本记录时不弹警告
+			 */
+			async applyOutboundCostPrice(row, silent = false) {
+				if (!row || !row.spbh || !row.ckck) return
+				try {
+					const spbh = encodeURIComponent(String(row.spbh))
+					const ck = encodeURIComponent(String(row.ckck))
+					const res = await request({
+						url: `/api/Extend/WtXsckd/GetOutboundCostPrice?spbh=${spbh}&ckOrMdId=${ck}`,
+						method: 'get'
+					})
+					const payload = res.data
+					if (payload && payload.success && payload.data != null) {
+						const p = Number(payload.data)
+						if (!isNaN(p) && p > 0) {
+							this.$set(row, 'dj', p.toFixed(4))
+							this.recalcRowCostPreview(row)
+							const sl = parseFloat(row.sl) || 0
+							const dj = parseFloat(row.dj) || 0
+							row.je = (sl * dj).toFixed(2)
+							this.calculateTotalAmount()
+						}
+					} else if (!silent && payload && payload.msg) {
+						this.$message.warning(payload.msg)
+					}
+				} catch (e) {
+					if (!silent) console.error(e)
+				}
 			},
 			
 			// 计算总金额
@@ -1463,11 +1553,13 @@
 						sums[index] = '合计';
 						return;
 					}
-					if (['kucun', 'sl', 'je'].includes(column.property)) {
+					if (['kucun', 'sl', 'je', 'dj', 'cbje'].includes(column.property)) {
 						sums[index] = data.reduce((total, row) => {
 							const value = parseFloat(row[column.property]);
 							return total + (isNaN(value) ? 0 : value);
 						}, 0);
+						if (['dj', 'cbje'].includes(column.property) && sums[index] !== '')
+							sums[index] = Number(sums[index]).toFixed(2)
 					} else {
 						sums[index] = '';
 					}
@@ -1479,40 +1571,28 @@
 				const label = (option.label || '').toLowerCase();
 				return label.includes(query.toLowerCase());
 			},
-			handleProductChange(row) {
+			async handleProductChange(row) {
 				// 选中商品后可自动回填商品名称等信息
 				const product = this.spbhOptions.find(item => item.F_Id === row.spbh);
 				if (product) {
 					row.spmc = product.F_Spmc || '';
-					// 选中商品后，立即加载商品信息（如序列号类型）
+					this.$set(row, 'spxlhLoaded', false);
 					this.getProductInfo(row.spbh).then(productInfo => {
-						// 触发当前行的响应式刷新
 						this.$set(row, 'spxlhLoaded', true);
 						this.$forceUpdate();
 						if (!(productInfo && productInfo.spxlhType)) {
 							this.$message.warning('无法获取序列号类型信息');
 						}
-					});
-					
-					// 检查出库仓库并获取库存
-					console.log('商品选择变化 - 商品ID:', row.spbh, '出库仓库:', row.ckck, '主表出库仓库:', this.dataForm.cjck);
-					
-					// 如果明细行没有出库仓库，使用主表的出库仓库
+					})
+
 					if (!row.ckck && this.dataForm.cjck) {
-						row.ckck = this.dataForm.cjck;
-						console.log('使用主表出库仓库:', row.ckck);
+						row.ckck = this.dataForm.cjck
 					}
-					
-					// 如果主表也没有出库仓库，提示用户先选择
 					if (!row.ckck) {
-						console.log('出库仓库未设置，无法获取库存');
-						this.$message.warning('请先选择出库仓库');
-						return;
+						this.$message.warning('请先选择出库仓库')
+						return
 					}
-					
-					// 如果已选择出库仓库，自动获取库存
-					console.log('开始获取库存...');
-					this.getStockQuantity(row);
+					await this.getStockQuantity(row)
 				}
 			},
 			handleProductQuery(val, scope) {
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue
index b9f1fa2..f26303b 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtTjdbd/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
 			<el-row class="NCC-common-search-box" :gutter="16">
@@ -105,11 +105,43 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
-					<el-table-column prop="id" label="单据编号" align="left" />
-					<el-table-column prop="djrq" label="单据日期" align="left"  :formatter="ncc.tableDateFormat" />
-					<el-table-column label="出库仓库" prop="cjck" align="left">
-							<template slot-scope="scope">{{ scope.row.cjck | dynamicText(cjckOptions) }}</template>
+                <NCC-table v-loading="listLoading" :data="list" has-c class="tjd-table" @selection-change="handleSelectionChange">
+					<el-table-column prop="id" label="单据编号" align="left" min-width="168" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-document" style="color:#409EFF;margin-right:4px" />
+								{{ cellText(scope.row.id) }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="djrq" label="单据日期" align="left" width="118" :formatter="ncc.tableDateFormat" show-overflow-tooltip>
+						<template slot="header">
+							<span><i class="el-icon-date" style="color:#409EFF;margin-right:4px" />单据日期</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="出库仓库" prop="cjck" align="left" min-width="108" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-upload2" style="color:#909399;margin-right:4px" />
+								{{ scope.row.cjck | dynamicText(cjckOptions) }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="入库仓库" prop="rkck" align="left" min-width="108" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-download" style="color:#67C23A;margin-right:4px" />
+								{{ scope.row.rkck | dynamicText(rkckOptions) }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="cbje" label="成本合计" align="right" width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">
+								<i class="el-icon-coin" style="color:#E6A23C;margin-right:4px" />
+								{{ formatTjdListCbje(scope.row.cbje) }}
+							</span>
+						</template>
 					</el-table-column>
 					<el-table-column prop="jsr" label="经手人" align="left" />
 					<el-table-column prop="ysje" label="优惠金额" align="left" />
@@ -122,7 +154,14 @@
 					<el-table-column prop="gzr" label="过账人" align="left" />
 					<el-table-column prop="bz" label="备注" align="left" />
 					<el-table-column prop="djlx" label="单据类型" align="left" />
-					<el-table-column prop="djzt" label="单据状态" align="left" />
+					<el-table-column prop="djzt" label="单据状态" align="center" width="100" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.djzt === '草稿'" type="info" size="mini">草稿</el-tag>
+							<el-tag v-else-if="scope.row.djzt === '待审核'" type="warning" size="mini">待审核</el-tag>
+							<el-tag v-else-if="scope.row.djzt === '已审核'" type="success" size="mini">已审核</el-tag>
+							<el-tag v-else type="warning" size="mini">{{ cellText(scope.row.djzt) }}</el-tag>
+						</template>
+					</el-table-column>
 					<el-table-column label="操作" fixed="right" width="100">
 							<template slot-scope="scope">
 							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
@@ -178,6 +217,8 @@
                     { prop: 'id', label: '单据编号' },
                     { prop: 'djrq', label: '单据日期' },
                     { prop: 'cjck', label: '出库仓库' },
+                    { prop: 'rkck', label: '入库仓库' },
+                    { prop: 'cbje', label: '成本合计' },
                     { prop: 'jsr', label: '经手人' },
                     { prop: 'ysje', label: '优惠金额' },
                     { prop: 'skzh', label: '收款账户' },
@@ -201,6 +242,15 @@
 			this.getskzhOptions();
 		},
 		methods: {
+			cellText(v) {
+				if (v === null || v === undefined || v === '') return '无'
+				return v
+			},
+			formatTjdListCbje(v) {
+				if (v === null || v === undefined || v === '') return '无'
+				const n = Number(v)
+				return isNaN(n) ? '无' : n.toFixed(2)
+			},
 			getcjckOptions(){
 				previewDataInterface('681758216954053893').then(res => {
 					this.cjckOptions = res.data
@@ -335,6 +385,7 @@
                 for (let key in this.query) {
                     this.query[key] = undefined
                 }
+                this.query.djlx = '同价调拨单'
                 this.listQuery = {
                     currentPage: 1,
                     pageSize: 20,
@@ -345,4 +396,9 @@
             }
 		}
     }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.cell-nowrap {
+	white-space: nowrap;
+}
+</style>
\ No newline at end of file
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListOutput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListOutput.cs
index 24ad780..ee66d11 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListOutput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListOutput.cs
@@ -23,6 +23,11 @@ namespace NCC.Extend.Entitys.Dto.WtXsckd
         public string cjck { get; set; }
         
         /// <summary>
+        /// 入库仓库/门店（变价调拨单等）
+        /// </summary>
+        public string rkck { get; set; }
+        
+        /// <summary>
         /// 经手人
         /// </summary>
         public string jsr { get; set; }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs
index 7ade7e5..c3a0e1e 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdListQueryInput.cs
@@ -1,4 +1,4 @@
-using NCC.Common.Filter;
+using NCC.Common.Filter;
 using System.Collections.Generic;
 
 namespace NCC.Extend.Entitys.Dto.WtXsckd
@@ -35,6 +35,11 @@ namespace NCC.Extend.Entitys.Dto.WtXsckd
         public string cjck { get; set; }
         
         /// <summary>
+        /// 入库仓库/门店
+        /// </summary>
+        public string rkck { get; set; }
+        
+        /// <summary>
         /// 经手人
         /// </summary>
         public string jsr { get; set; }
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
index 005a6c4..5aa0457 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
@@ -168,14 +168,15 @@ namespace NCC.Extend.WtXsckd
         /// <summary>
         /// 获取销售出库单
         /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
+        /// <param name="id">单据编号</param>
+        /// <returns>详情数据；单据不存在或已删除时返回 COM1005</returns>
         [HttpGet("{id}")]
         public async Task<dynamic> GetInfo(string id)
         {
             EnsureBjsxColumn();
             EnsureBjhcbColumn();
             var entity = await _db.Queryable<WtXsckdEntity>().FirstAsync(p => p.Id == id);
+            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
             var output = entity.Adapt<WtXsckdInfoOutput>();
             output.cjckId = entity.Cjck;
             
@@ -289,6 +290,7 @@ namespace NCC.Extend.WtXsckd
                     (xsckd, hy) => xsckd.Djrq <= new DateTime(endDjrq.ToDate().Year, endDjrq.ToDate().Month, endDjrq.ToDate().Day, 23,
                         59, 59))
                 .WhereIF(!string.IsNullOrEmpty(input.cjck), (xsckd, hy) => xsckd.Cjck.Equals(input.cjck))
+                .WhereIF(!string.IsNullOrEmpty(input.rkck), (xsckd, hy) => xsckd.Rkck.Equals(input.rkck))
                 .WhereIF(!string.IsNullOrEmpty(input.jsr), (xsckd, hy) => xsckd.Jsr.Equals(input.jsr))
                 .WhereIF(!string.IsNullOrEmpty(input.ysje), (xsckd, hy) => xsckd.Ysje.Equals(input.ysje))
                 .WhereIF(!string.IsNullOrEmpty(input.skzh), (xsckd, hy) => xsckd.Skzh.Equals(input.skzh))
@@ -308,8 +310,9 @@ namespace NCC.Extend.WtXsckd
                 {
                     id = xsckd.Id,
                     djrq = xsckd.Djrq,
-                    // cjck=xsckd.Cjck,
-                    cjck = SqlFunc.Subqueryable<WtCkEntity>().Where(u => u.Id == xsckd.Cjck).Select(u => u.Mdmc),
+                    // 先存原始 ID，查询后统一解析为门店/仓库名称（与详情页一致）
+                    cjck = xsckd.Cjck,
+                    rkck = xsckd.Rkck,
                     //   jsr=xsckd.Jsr,
                     jsr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == xsckd.Jsr).Select(u => u.RealName),
                     ydje = xsckd.Ydje,
@@ -335,10 +338,58 @@ namespace NCC.Extend.WtXsckd
                     djlx = xsckd.Djlx,
                     djzt = xsckd.Djzt
                 }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
+            var pageRows = data.list?.ToList() ?? new List<WtXsckdListOutput>();
+            await EnrichWtXsckdListWarehouseDisplayAsync(pageRows);
             return PageResult<WtXsckdListOutput>.SqlSugarPageResult(data);
         }
 
         /// <summary>
+        /// 列表出库/入库字段：将主表存的门店ID或仓库ID解析为展示名称（wt_md / wt_ck）
+        /// </summary>
+        private async Task EnrichWtXsckdListWarehouseDisplayAsync(List<WtXsckdListOutput> items)
+        {
+            if (items == null || items.Count == 0) return;
+            var ids = items.Select(x => x.id).Where(id => !string.IsNullOrEmpty(id)).Distinct().ToList();
+            if (ids.Count == 0) return;
+
+            var heads = await _db.Queryable<WtXsckdEntity>()
+                .Where(x => ids.Contains(x.Id))
+                .Select(x => new { x.Id, x.Cjck, x.Rkck })
+                .ToListAsync();
+            var headDict = heads.ToDictionary(h => h.Id, h => h);
+
+            var allKeys = heads
+                .SelectMany(h => new[] { h.Cjck, h.Rkck })
+                .Where(k => !string.IsNullOrWhiteSpace(k))
+                .Distinct()
+                .ToList();
+            if (allKeys.Count == 0) return;
+
+            var nameMap = new Dictionary<string, string>(StringComparer.Ordinal);
+            var ckRows = await _db.Queryable<WtCkEntity>().In(c => c.Id, allKeys).Select(c => new { c.Id, c.Mdmc }).ToListAsync();
+            foreach (var r in ckRows)
+            {
+                if (!string.IsNullOrEmpty(r.Id) && !string.IsNullOrEmpty(r.Mdmc))
+                    nameMap[r.Id] = r.Mdmc;
+            }
+            var mdRows = await _db.Queryable<WtMdEntity>().In(m => m.Id, allKeys).Select(m => new { m.Id, m.Mdmc }).ToListAsync();
+            foreach (var r in mdRows)
+            {
+                if (!string.IsNullOrEmpty(r.Id) && !string.IsNullOrEmpty(r.Mdmc))
+                    nameMap[r.Id] = r.Mdmc;
+            }
+
+            foreach (var row in items)
+            {
+                if (!headDict.TryGetValue(row.id, out var h)) continue;
+                if (!string.IsNullOrEmpty(h.Cjck) && nameMap.TryGetValue(h.Cjck, out var cjName))
+                    row.cjck = cjName;
+                if (!string.IsNullOrEmpty(h.Rkck) && nameMap.TryGetValue(h.Rkck, out var rkName))
+                    row.rkck = rkName;
+            }
+        }
+
+        /// <summary>
         /// 新建销售出库单
         /// </summary>
         /// <param name="input">参数</param>
@@ -868,43 +919,64 @@ namespace NCC.Extend.WtXsckd
         [NonAction]
         public async Task<dynamic> GetNoPagingList([FromQuery] WtXsckdListQueryInput input)
         {
+            EnsureYdjeColumn();
+            EnsureCbjeColumn();
+            EnsureBjsxColumn();
             var sidx = input.sidx == null ? "id" : input.sidx;
             List<string> queryDjrq = input.djrq != null ? input.djrq.Split(',').ToObeject<List<string>>() : null;
             DateTime? startDjrq = queryDjrq != null ? Ext.GetDateTime(queryDjrq.First()) : null;
             DateTime? endDjrq = queryDjrq != null ? Ext.GetDateTime(queryDjrq.Last()) : null;
-            var data = await _db.Queryable<WtXsckdEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(queryDjrq != null, p => p.Djrq >= new DateTime(startDjrq.ToDate().Year, startDjrq.ToDate().Month, startDjrq.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryDjrq != null, p => p.Djrq <= new DateTime(endDjrq.ToDate().Year, endDjrq.ToDate().Month, endDjrq.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.cjck), p => p.Cjck.Equals(input.cjck))
-                .WhereIF(!string.IsNullOrEmpty(input.jsr), p => p.Jsr.Equals(input.jsr))
-                .WhereIF(!string.IsNullOrEmpty(input.ysje), p => p.Ysje.Equals(input.ysje))
-                .WhereIF(!string.IsNullOrEmpty(input.skzh), p => p.Skzh.Equals(input.skzh))
-                .WhereIF(!string.IsNullOrEmpty(input.skje), p => p.Skje.Equals(input.skje))
-                .WhereIF(!string.IsNullOrEmpty(input.zdr), p => p.Zdr.Equals(input.zdr))
-                .WhereIF(!string.IsNullOrEmpty(input.shr), p => p.Shr.Equals(input.shr))
-                .WhereIF(!string.IsNullOrEmpty(input.gzr), p => p.Gzr.Equals(input.gzr))
-                .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
-                .WhereIF(!string.IsNullOrEmpty(input.djlx), p => p.Djlx.Contains(input.djlx))
-                .WhereIF(!string.IsNullOrEmpty(input.djzt), p => p.Djzt.Contains(input.djzt)) // 新增：支持按单据状态查询
-                .Select(it=> new WtXsckdListOutput
-                {
-                    id = it.Id,
-                    djrq=it.Djrq,
-                    cjck=it.Cjck,
-                    jsr=it.Jsr,
-                    ydje = it.Ydje,
-                    ysje=it.Ysje,
-                    skzh=it.Skzh,
-                    skje=it.Skje,
-                    zdr=it.Zdr,
-                    shr=it.Shr,
-                    gzr=it.Gzr,
-                    bz=it.Bz,
-                    djlx=it.Djlx,
-                    djzt=it.Djzt // 新增：返回单据状态
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
+            var data = await _db.Queryable<WtXsckdEntity, WtHyEntity>((xsckd, hy) => new JoinQueryInfos(JoinType.Left, xsckd.Kh == hy.Id))
+                .WhereIF(!string.IsNullOrEmpty(input.id), (xsckd, hy) => xsckd.Id.Contains(input.id))
+                .WhereIF(queryDjrq != null,
+                    (xsckd, hy) => xsckd.Djrq >= new DateTime(startDjrq.ToDate().Year, startDjrq.ToDate().Month,
+                        startDjrq.ToDate().Day, 0, 0, 0))
+                .WhereIF(queryDjrq != null,
+                    (xsckd, hy) => xsckd.Djrq <= new DateTime(endDjrq.ToDate().Year, endDjrq.ToDate().Month, endDjrq.ToDate().Day, 23,
+                        59, 59))
+                .WhereIF(!string.IsNullOrEmpty(input.cjck), (xsckd, hy) => xsckd.Cjck.Equals(input.cjck))
+                .WhereIF(!string.IsNullOrEmpty(input.rkck), (xsckd, hy) => xsckd.Rkck.Equals(input.rkck))
+                .WhereIF(!string.IsNullOrEmpty(input.jsr), (xsckd, hy) => xsckd.Jsr.Equals(input.jsr))
+                .WhereIF(!string.IsNullOrEmpty(input.ysje), (xsckd, hy) => xsckd.Ysje.Equals(input.ysje))
+                .WhereIF(!string.IsNullOrEmpty(input.skzh), (xsckd, hy) => xsckd.Skzh.Equals(input.skzh))
+                .WhereIF(!string.IsNullOrEmpty(input.skje), (xsckd, hy) => xsckd.Skje.Equals(input.skje))
+                .WhereIF(!string.IsNullOrEmpty(input.zdr), (xsckd, hy) => xsckd.Zdr.Equals(input.zdr))
+                .WhereIF(!string.IsNullOrEmpty(input.shr), (xsckd, hy) => xsckd.Shr.Equals(input.shr))
+                .WhereIF(!string.IsNullOrEmpty(input.gzr), (xsckd, hy) => xsckd.Gzr.Equals(input.gzr))
+                .WhereIF(!string.IsNullOrEmpty(input.bz), (xsckd, hy) => xsckd.Bz.Contains(input.bz))
+                .WhereIF(!string.IsNullOrEmpty(input.kh), (xsckd, hy) => xsckd.Kh.Contains(input.kh))
+                .WhereIF(!string.IsNullOrEmpty(input.hysjh), (xsckd, hy) =>
+                    (xsckd.Hysjh != null && xsckd.Hysjh.Contains(input.hysjh)) ||
+                    (hy.Sjh != null && hy.Sjh.Contains(input.hysjh)))
+                .WhereIF(!string.IsNullOrEmpty(input.djlx), (xsckd, hy) => xsckd.Djlx.Contains(input.djlx))
+                .WhereIF(!string.IsNullOrEmpty(input.ly), (xsckd, hy) => xsckd.Ly.Equals(input.ly))
+                .WhereIF(!string.IsNullOrEmpty(input.djzt), (xsckd, hy) => xsckd.Djzt.Contains(input.djzt))
+                .Select((xsckd, hy) => new WtXsckdListOutput
+                {
+                    id = xsckd.Id,
+                    djrq = xsckd.Djrq,
+                    cjck = xsckd.Cjck,
+                    rkck = xsckd.Rkck,
+                    jsr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == xsckd.Jsr).Select(u => u.RealName),
+                    ydje = xsckd.Ydje,
+                    cbje = xsckd.Cbje,
+                    bjsx = xsckd.Bjsx,
+                    ysje = xsckd.Ysje,
+                    skzh = xsckd.Skzh,
+                    skje = xsckd.Skje,
+                    skmx = xsckd.Skmx,
+                    zdr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == xsckd.Zdr).Select(u => u.RealName),
+                    shr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == xsckd.Shr).Select(u => u.RealName),
+                    gzr = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == xsckd.Gzr).Select(u => u.RealName),
+                    kh = hy.Xm,
+                    hysjh = hy.Sjh ?? xsckd.Hysjh ?? "",
+                    gys = SqlFunc.Subqueryable<WtGysEntity>().Where(u => u.Id == xsckd.Gys).Select(u => u.Gysmc),
+                    bz = xsckd.Bz,
+                    djlx = xsckd.Djlx,
+                    djzt = xsckd.Djzt
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
+            await EnrichWtXsckdListWarehouseDisplayAsync(data);
+            return data;
         }
 
         /// <summary>
@@ -990,7 +1062,7 @@ namespace NCC.Extend.WtXsckd
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"单据编号\",\"field\":\"id\"},{\"value\":\"单据日期\",\"field\":\"djrq\"},{\"value\":\"出库仓库\",\"field\":\"cjck\"},{\"value\":\"变价系数%\",\"field\":\"bjsx\"},{\"value\":\"成本金额\",\"field\":\"cbje\"},{\"value\":\"经手人\",\"field\":\"jsr\"},{\"value\":\"优惠金额\",\"field\":\"ysje\"},{\"value\":\"收款账户\",\"field\":\"skzh\"},{\"value\":\"收款金额\",\"field\":\"skje\"},{\"value\":\"制单人\",\"field\":\"zdr\"},{\"value\":\"审核人\",\"field\":\"shr\"},{\"value\":\"过账人\",\"field\":\"gzr\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"单据类型\",\"field\":\"djlx\"},{\"value\":\"单据状态\",\"field\":\"djzt\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"单据编号\",\"field\":\"id\"},{\"value\":\"单据日期\",\"field\":\"djrq\"},{\"value\":\"出库仓库\",\"field\":\"cjck\"},{\"value\":\"入库仓库\",\"field\":\"rkck\"},{\"value\":\"变价系数%\",\"field\":\"bjsx\"},{\"value\":\"成本金额\",\"field\":\"cbje\"},{\"value\":\"经手人\",\"field\":\"jsr\"},{\"value\":\"优惠金额\",\"field\":\"ysje\"},{\"value\":\"收款账户\",\"field\":\"skzh\"},{\"value\":\"收款金额\",\"field\":\"skje\"},{\"value\":\"制单人\",\"field\":\"zdr\"},{\"value\":\"审核人\",\"field\":\"shr\"},{\"value\":\"过账人\",\"field\":\"gzr\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"单据类型\",\"field\":\"djlx\"},{\"value\":\"单据状态\",\"field\":\"djzt\"},]".ToList<ParamsModel>();           
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "销售出库单.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -1084,6 +1156,13 @@ namespace NCC.Extend.WtXsckd
                 {
                     await RollbackVariablePriceTransferCost(oldHeader, oldMxList);
                 }
+
+                if (oldHeader.Djlx == "同价调拨单"
+                    && !string.Equals(oldHeader.Djzt, "草稿", StringComparison.Ordinal)
+                    && oldMxList.Count > 0)
+                {
+                    await RollbackSamePriceTransferCost(oldHeader, oldMxList);
+                }
                 
                 //更新销售出库单记录
                 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
@@ -1397,7 +1476,7 @@ ORDER BY t.`商品编号`";
         }
 
         /// <summary>
-        /// 按商品与出库门店/仓库查询加权成本单价（与销售出库、变价调拨过账取价逻辑一致，供前端录入参考）
+        /// 按商品与出库门店/仓库查询加权成本单价（与销售出库、变价/同价调拨过账取价逻辑一致，供前端录入参考）
         /// </summary>
         /// <param name="spbh">商品主键 F_Id</param>
         /// <param name="ckOrMdId">明细 ckck 或主表 cjck（可为门店ID或仓库ID）</param>
@@ -2978,14 +3057,15 @@ ORDER BY t.`商品编号`;";
         }
         
         /// <summary>
-        /// 销售/预售/变价调拨单重算并回写主表成本金额（变价调拨为明细变价后成本金额合计）
+        /// 销售/预售/变价调拨单/同价调拨单重算并回写主表成本金额（调拨单为明细成本金额合计）
         /// </summary>
-        /// <param name="skipForBjdDraft">变价调拨草稿时不回写主表 cbje（明细未过账）</param>
+        /// <param name="skipForBjdDraft">变价/同价调拨草稿时不回写主表 cbje（明细未过账）</param>
         private async Task RecalculateMainCbje(string djbh, string djlx, bool skipForBjdDraft = false)
         {
             if (string.IsNullOrEmpty(djbh)) return;
             if (djlx == "变价调拨单" && skipForBjdDraft) return;
-            if (djlx != "销售出库单" && djlx != "预售出库单" && djlx != "变价调拨单") return;
+            if (djlx == "同价调拨单" && skipForBjdDraft) return;
+            if (djlx != "销售出库单" && djlx != "预售出库单" && djlx != "变价调拨单" && djlx != "同价调拨单") return;
 
             decimal cbje = 0;
             var result = await _db.Ado.SqlQueryAsync<decimal?>(
@@ -3062,6 +3142,7 @@ ORDER BY t.`商品编号`;";
         /// 销售/预售出库 → 快照成本到明细 + 减少数量
         /// 销售退货 → 恢复数量（成本不变）
         /// 变价调拨单 → 调出仓按原成本加权减少，调入仓按变价后单价加权增加（草稿/ isDraft 不过账）
+        /// 同价调拨单 → 调出/调入同一成本单价移仓（草稿/ isDraft 不过账）
         /// </summary>
         private async Task UpdateSpCostOnCreate(string djlx, WtXsckdEntity entity, List<WtXsckdMxEntity> mxList, bool isDraft = false)
         {
@@ -3084,6 +3165,23 @@ ORDER BY t.`商品编号`;";
                 }
                 return;
             }
+
+            if (djlx == "同价调拨单")
+            {
+                EnsureBjhcbColumn();
+                if (isDraft || string.Equals(entity.Djzt, "草稿", StringComparison.Ordinal))
+                    return;
+                try
+                {
+                    await ApplySamePriceTransferCost(entity, mxList);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"同价调拨成本过账失败: {ex.Message}");
+                    throw;
+                }
+                return;
+            }
             
             try
             {
@@ -3420,6 +3518,14 @@ ORDER BY t.`商品编号`;";
                 if (mxList.Count > 0)
                     await RollbackVariablePriceTransferCost(entity, mxList);
             }
+            else if (djlx == "同价调拨单")
+            {
+                if (string.Equals(entity.Djzt, "草稿", StringComparison.Ordinal)) return;
+                EnsureBjhcbColumn();
+                var mxList = await _db.Queryable<WtXsckdMxEntity>().Where(d => d.Djbh == id).ToListAsync();
+                if (mxList.Count > 0)
+                    await RollbackSamePriceTransferCost(entity, mxList);
+            }
         }
 
         /// <summary>
@@ -3649,6 +3755,89 @@ ORDER BY t.`商品编号`;";
                 await SpCostWeightedAddAsync(detail.Spbh, outCk, qty, originalUnit);
             }
         }
+
+        /// <summary>
+        /// 同价调拨单过账：调出按快照成本扣减，调入按相同单价增加，并回写明细 cbdj/bjhcb/cbje（同价时 bjhcb 与 cbdj 一致）
+        /// </summary>
+        private async Task ApplySamePriceTransferCost(WtXsckdEntity entity, List<WtXsckdMxEntity> mxList)
+        {
+            if (string.Equals((entity.Cjck ?? "").Trim(), (entity.Rkck ?? "").Trim(), StringComparison.Ordinal))
+                throw new Exception("同价调拨单出库仓与入库仓不能相同");
+
+            foreach (var detail in mxList)
+            {
+                if (string.IsNullOrEmpty(detail.Spbh)) continue;
+                if (!int.TryParse(detail.Sl, out int qty) || qty <= 0) continue;
+
+                var outRef = !string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck : entity.Cjck;
+                var inRef = !string.IsNullOrEmpty(detail.Rkck) ? detail.Rkck : entity.Rkck;
+                if (string.IsNullOrEmpty(outRef) || string.IsNullOrEmpty(inRef))
+                    throw new Exception($"商品 {detail.Spmc ?? detail.Spbh} 未指定完整的出库/入库仓库");
+
+                var outIds = await ResolveWarehouseIdListAsync(outRef);
+                string outCk;
+                decimal originalUnit;
+                try
+                {
+                    var picked = await PickOutboundCostRowForTransferAsync(detail.Spbh, outIds, qty);
+                    outCk = picked.ck;
+                    originalUnit = picked.unitCost;
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception(ex.Message.Replace("变价调拨", "同价调拨"));
+                }
+
+                var inIds = await ResolveWarehouseIdListAsync(inRef);
+                if (inIds == null || inIds.Count == 0)
+                    throw new Exception($"商品 {detail.Spbh} 未解析到入库仓库");
+                var inCk = inIds[0];
+
+                await SpCostWeightedRemoveAsync(detail.Spbh, outCk, qty, originalUnit);
+                await SpCostWeightedAddAsync(detail.Spbh, inCk, qty, originalUnit);
+
+                await _db.Ado.ExecuteCommandAsync(
+                    "UPDATE wt_xsckd_mx SET cbdj = @cbdj, bjhcb = @bjhcb, cbje = @cbje WHERE F_Id = @id",
+                    new
+                    {
+                        cbdj = originalUnit,
+                        bjhcb = originalUnit,
+                        cbje = Math.Round(originalUnit * qty, 2),
+                        id = detail.Id
+                    });
+            }
+        }
+
+        /// <summary>
+        /// 同价调拨单成本回滚：调入按过账单价扣回，调出按相同单价加回（删除/编辑前调用）
+        /// </summary>
+        private async Task RollbackSamePriceTransferCost(WtXsckdEntity entity, List<WtXsckdMxEntity> mxList)
+        {
+            foreach (var detail in mxList)
+            {
+                if (string.IsNullOrEmpty(detail.Spbh)) continue;
+                if (!int.TryParse(detail.Sl, out int qty) || qty <= 0) continue;
+
+                var outRef = !string.IsNullOrEmpty(detail.Ckck) ? detail.Ckck : entity.Cjck;
+                var inRef = !string.IsNullOrEmpty(detail.Rkck) ? detail.Rkck : entity.Rkck;
+                if (string.IsNullOrEmpty(outRef) || string.IsNullOrEmpty(inRef)) continue;
+
+                decimal unit = detail.Cbdj ?? detail.Dj;
+                if (unit <= 0 && detail.Bjhcb.HasValue && detail.Bjhcb.Value > 0)
+                    unit = detail.Bjhcb.Value;
+                if (unit <= 0) continue;
+
+                var inIds = await ResolveWarehouseIdListAsync(inRef);
+                var outIds = await ResolveWarehouseIdListAsync(outRef);
+                if (inIds == null || inIds.Count == 0 || outIds == null || outIds.Count == 0) continue;
+                var inCk = inIds[0];
+
+                await SpCostWeightedRemoveAsync(detail.Spbh, inCk, qty, unit);
+
+                var outCk = await PickOutboundCkForRollbackAddAsync(detail.Spbh, outIds, unit, qty);
+                await SpCostWeightedAddAsync(detail.Spbh, outCk, qty, unit);
+            }
+        }
         
         #endregion
     }