产品id绑定改为code绑定

This commit is contained in:
luojiaquan
2026-09-22 11:20:51 +08:00
parent e0df965d89
commit 91e9a0c9b7
8 changed files with 91 additions and 64 deletions
@@ -107,9 +107,9 @@ public class BmsCustomer extends BaseEntity
@Excel(name = "信用额度", readConverterExp = "元=") @Excel(name = "信用额度", readConverterExp = "元=")
private BigDecimal creditEd; private BigDecimal creditEd;
/** 绑定产品ID(多个产品ID用逗号分隔,支持批量操作) */ /** 绑定产品代码(多个产品代码用逗号分隔;旧库导入产品ID不稳定,统一用代码对接) */
@Excel(name = "绑定产品ID", readConverterExp = "多=个产品ID用逗号分隔,支持批量操作") @Excel(name = "绑定产品代码")
private String productIds; private String productCodes;
/** 附件列表(子表 bms_customer_attachment) */ /** 附件列表(子表 bms_customer_attachment) */
private List<BmsCustomerAttachment> attachmentList; private List<BmsCustomerAttachment> attachmentList;
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="weightThreshold" column="weight_threshold" /> <result property="weightThreshold" column="weight_threshold" />
<result property="throwRatio" column="throw_ratio" /> <result property="throwRatio" column="throw_ratio" />
<result property="creditEd" column="credit_ed" /> <result property="creditEd" column="credit_ed" />
<result property="productIds" column="product_ids" /> <result property="productCodes" column="product_codes" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
(select coalesce(sum(ca.total_credit+ca.extra_credit-ca.used_credit), 0) from customer_account ca (select coalesce(sum(ca.total_credit+ca.extra_credit-ca.used_credit), 0) from customer_account ca
where ca.customer_id = c.customer_id and ca.del_flag = '0') as credit_ed, where ca.customer_id = c.customer_id and ca.del_flag = '0') as credit_ed,
c.product_ids, c.remark, c.product_codes, c.remark,
c.create_by, c.create_time, c.update_by, c.update_time, c.del_flag c.create_by, c.create_time, c.update_by, c.update_time, c.del_flag
from bms_customer c from bms_customer c
<!-- 数据权限:销售(仅本人 c.sales_user_id)/销售经理(本部门 su.dept_id); <!-- 数据权限:销售(仅本人 c.sales_user_id)/销售经理(本部门 su.dept_id);
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="weightThreshold != null "> and c.weight_threshold = #{weightThreshold}</if> <if test="weightThreshold != null "> and c.weight_threshold = #{weightThreshold}</if>
<if test="throwRatio != null "> and c.throw_ratio = #{throwRatio}</if> <if test="throwRatio != null "> and c.throw_ratio = #{throwRatio}</if>
<if test="creditEd != null "> and c.credit_ed = #{creditEd}</if> <if test="creditEd != null "> and c.credit_ed = #{creditEd}</if>
<if test="productIds != null and productIds != ''"> and c.product_ids = #{productIds}</if> <if test="productCodes != null and productCodes != ''"> and c.product_codes = #{productCodes}</if>
<!-- 数据权限过滤(@DataScope 生成:仅本人= c.sales_user_id=当前用户;本部门= su.dept_id=当前用户部门) --> <!-- 数据权限过滤(@DataScope 生成:仅本人= c.sales_user_id=当前用户;本部门= su.dept_id=当前用户部门) -->
${params.dataScope} ${params.dataScope}
</where> </where>
@@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="weightThreshold != null">weight_threshold,</if> <if test="weightThreshold != null">weight_threshold,</if>
<if test="throwRatio != null">throw_ratio,</if> <if test="throwRatio != null">throw_ratio,</if>
<if test="creditEd != null">credit_ed,</if> <if test="creditEd != null">credit_ed,</if>
<if test="productIds != null">product_ids,</if> <if test="productCodes != null">product_codes,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="weightThreshold != null">#{weightThreshold},</if> <if test="weightThreshold != null">#{weightThreshold},</if>
<if test="throwRatio != null">#{throwRatio},</if> <if test="throwRatio != null">#{throwRatio},</if>
<if test="creditEd != null">#{creditEd},</if> <if test="creditEd != null">#{creditEd},</if>
<if test="productIds != null">#{productIds},</if> <if test="productCodes != null">#{productCodes},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@@ -315,7 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="foreignCurrencyBalance != null">foreign_currency_balance = #{foreignCurrencyBalance},</if> <if test="foreignCurrencyBalance != null">foreign_currency_balance = #{foreignCurrencyBalance},</if>
<if test="weightThreshold != null">weight_threshold = #{weightThreshold},</if> <if test="weightThreshold != null">weight_threshold = #{weightThreshold},</if>
<if test="throwRatio != null">throw_ratio = #{throwRatio},</if> <if test="throwRatio != null">throw_ratio = #{throwRatio},</if>
<if test="productIds != null">product_ids = #{productIds},</if> <if test="productCodes != null">product_codes = #{productCodes},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
+1 -1
View File
@@ -29,7 +29,7 @@ CREATE TABLE `bms_customer` (
`weight_threshold` decimal(15,2) DEFAULT 0.00 COMMENT '重量阈值(kg)', `weight_threshold` decimal(15,2) DEFAULT 0.00 COMMENT '重量阈值(kg)',
`throw_ratio` decimal(15,2) DEFAULT 0.00 COMMENT '抛比(%)', `throw_ratio` decimal(15,2) DEFAULT 0.00 COMMENT '抛比(%)',
`credit_ed` decimal(15,2) DEFAULT 0.00 COMMENT '信用额度(元)', `credit_ed` decimal(15,2) DEFAULT 0.00 COMMENT '信用额度(元)',
`product_ids` varchar(1000) DEFAULT NULL COMMENT '绑定产品ID(多个产品ID用逗号分隔,支持批量操作)', `product_codes` varchar(1000) DEFAULT NULL COMMENT '绑定产品代码(多个产品代码用逗号分隔,对接旧库产品编码)',
-- ========== 附件字段(新增) ========== -- ========== 附件字段(新增) ==========
`logo_oss_id` bigint(20) DEFAULT NULL COMMENT '客户Logo(图片,关联sys_oss.oss_id)', `logo_oss_id` bigint(20) DEFAULT NULL COMMENT '客户Logo(图片,关联sys_oss.oss_id)',
@@ -0,0 +1,23 @@
-- =====================================================================
-- 客户绑定产品:存储口径由「产品ID逗号串」改为「产品代码逗号串」
-- 背景:后续产品数据从旧数据库迁移导入,新旧库产品ID不一致,
-- 产品代码(product_code)在两库间稳定,故客户绑定关系改用代码。
-- 日期:2026-09-22
-- =====================================================================
-- 1. 列改名(保留原数据,CHANGE 仅改列名/注释)
ALTER TABLE bms_customer
CHANGE COLUMN product_ids product_codes varchar(1000) DEFAULT NULL
COMMENT '绑定产品代码(多个产品代码用逗号分隔,对接旧库产品编码)';
-- 2. 旧值(产品ID逗号串)按 bms_product 映射为产品代码逗号串
-- FIND_IN_SET 逐个匹配逗号串中的ID,GROUP_CONCAT 重新拼为代码串;
-- 匹配不到产品的ID会被置为NULL(脏数据,可在客户编辑页重新绑定)
UPDATE bms_customer c
SET c.product_codes = (
SELECT GROUP_CONCAT(p.product_code)
FROM bms_product p
WHERE FIND_IN_SET(p.product_id, c.product_codes)
)
WHERE c.product_codes IS NOT NULL
AND c.product_codes <> '';
@@ -1,11 +1,11 @@
<template> <template>
<div class="product-select"> <div class="product-select">
<el-button type="primary" plain icon="Connection" @click="openDialog"> <el-button type="primary" plain icon="Connection" @click="openDialog">
{{ selectedIds.length ? '重新选择产品' : '选择产品' }} {{ selectedCodes.length ? '重新选择产品' : '选择产品' }}
</el-button> </el-button>
<span class="ps-summary"> <span class="ps-summary">
已绑定 <b>{{ selectedIds.length }}</b> 个产品 已绑定 <b>{{ selectedCodes.length }}</b> 个产品
<el-button v-if="selectedIds.length" link type="danger" @click="clearSelection">清空</el-button> <el-button v-if="selectedCodes.length" link type="danger" @click="clearSelection">清空</el-button>
</span> </span>
<el-dialog <el-dialog
@@ -46,7 +46,7 @@
ref="tableRef" ref="tableRef"
v-loading="loading" v-loading="loading"
:data="filteredList" :data="filteredList"
row-key="productId" row-key="productCode"
height="380" height="380"
border border
@select="handleSelect" @select="handleSelect"
@@ -74,7 +74,7 @@
<template #footer> <template #footer>
<div class="ps-footer"> <div class="ps-footer">
<span>已选 <b>{{ draftIds.size }}</b> 个产品</span> <span>已选 <b>{{ draftCodes.size }}</b> 个产品</span>
<div> <div>
<el-button @click="dialogVisible = false">取消</el-button> <el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="confirmSelection">确定</el-button> <el-button type="primary" @click="confirmSelection">确定</el-button>
@@ -90,7 +90,7 @@ import { ref, reactive, computed, watch, nextTick } from 'vue'
import { useProducts } from './useProducts' import { useProducts } from './useProducts'
const props = defineProps({ const props = defineProps({
/** v-model 绑定值:逗号分隔的产品ID串,如 "3,6" */ /** v-model 绑定值:逗号分隔的产品代码串,如 "WSP011,WSP037" */
modelValue: { type: [String, Number], default: '' } modelValue: { type: [String, Number], default: '' }
}) })
const emit = defineEmits(['update:modelValue', 'change']) const emit = defineEmits(['update:modelValue', 'change'])
@@ -100,7 +100,7 @@ const { productList, ensureProducts } = useProducts()
const dialogVisible = ref(false) const dialogVisible = ref(false)
const loading = ref(false) const loading = ref(false)
const tableRef = ref(null) const tableRef = ref(null)
const draftIds = reactive(new Set()) const draftCodes = reactive(new Set())
const queryParams = reactive({ const queryParams = reactive({
productCode: '', productCode: '',
productName: '', productName: '',
@@ -109,7 +109,7 @@ const queryParams = reactive({
status: '' status: ''
}) })
const selectedIds = computed(() => const selectedCodes = computed(() =>
String(props.modelValue || '').split(',').map(s => s.trim()).filter(Boolean) String(props.modelValue || '').split(',').map(s => s.trim()).filter(Boolean)
) )
@@ -133,21 +133,21 @@ function openDialog() {
function handleOpen() { function handleOpen() {
loading.value = true loading.value = true
draftIds.clear() draftCodes.clear()
selectedIds.value.forEach(id => draftIds.add(id)) selectedCodes.value.forEach(code => draftCodes.add(code))
resetQuery(false) resetQuery(false)
// 拉取最新产品后,按 draftIds 全量同步一次勾选(覆盖上次弹窗遗留状态) // 拉取最新产品后,按 draftCodes 全量同步一次勾选(覆盖上次弹窗遗留状态)
ensureProducts(true).finally(() => { ensureProducts(true).finally(() => {
loading.value = false loading.value = false
nextTick(syncSelection) nextTick(syncSelection)
}) })
} }
/** 按 draftIds 同步当前渲染行的勾选状态(draftIds 为唯一数据源,筛选切换不丢选择) */ /** 按 draftCodes 同步当前渲染行的勾选状态(draftCodes 为唯一数据源,筛选切换不丢选择) */
function syncSelection() { function syncSelection() {
if (!tableRef.value) return if (!tableRef.value) return
filteredList.value.forEach(row => { filteredList.value.forEach(row => {
tableRef.value.toggleRowSelection(row, draftIds.has(String(row.productId))) tableRef.value.toggleRowSelection(row, draftCodes.has(String(row.productCode)))
}) })
} }
@@ -158,17 +158,17 @@ watch(filteredList, () => {
}, { flush: 'post' }) }, { flush: 'post' })
function handleSelect(selection, row) { function handleSelect(selection, row) {
const id = String(row.productId) const code = String(row.productCode)
if (draftIds.has(id)) draftIds.delete(id) if (draftCodes.has(code)) draftCodes.delete(code)
else draftIds.add(id) else draftCodes.add(code)
} }
function handleSelectAll(selection) { function handleSelectAll(selection) {
// selection 为当前过滤后页面被选中的行;长度>0 表示全选,否则取消全选 // selection 为当前过滤后页面被选中的行;长度>0 表示全选,否则取消全选
if (selection.length) { if (selection.length) {
filteredList.value.forEach(row => draftIds.add(String(row.productId))) filteredList.value.forEach(row => draftCodes.add(String(row.productCode)))
} else { } else {
filteredList.value.forEach(row => draftIds.delete(String(row.productId))) filteredList.value.forEach(row => draftCodes.delete(String(row.productCode)))
} }
} }
@@ -186,10 +186,10 @@ function resetQuery(reload = true) {
} }
function confirmSelection() { function confirmSelection() {
const ids = Array.from(draftIds) const codes = Array.from(draftCodes)
const value = ids.join(',') const value = codes.join(',')
emit('update:modelValue', value) emit('update:modelValue', value)
emit('change', ids) emit('change', codes)
dialogVisible.value = false dialogVisible.value = false
} }
@@ -4,23 +4,26 @@ import { listProduct } from '@/api/price/product'
/** /**
* 产品列表模块级共享缓存:全应用只拉取一次 * 产品列表模块级共享缓存:全应用只拉取一次
* 用于客户绑定产品的选择与已绑产品名称/明细回显 * 用于客户绑定产品的选择与已绑产品名称/明细回显
*
* 口径说明:客户绑定关系统一存「产品代码 productCode」逗号串,
* 不存产品ID——后续产品从旧库迁移导入时新旧库ID不一致,产品代码两库稳定。
*/ */
const productList = ref([]) const productList = ref([])
let loadingPromise = null let loadingPromise = null
/** 逗号分隔 id 串 -> 字符串 id 数组 */ /** 逗号分隔 code 串 -> 字符串 code 数组 */
export function parseProductIds(value) { export function parseProductCodes(value) {
if (Array.isArray(value)) return value.map(v => String(v)).filter(Boolean) if (Array.isArray(value)) return value.map(v => String(v)).filter(Boolean)
if (value === null || value === undefined) return [] if (value === null || value === undefined) return []
return String(value).split(',').map(s => s.trim()).filter(Boolean) return String(value).split(',').map(s => s.trim()).filter(Boolean)
} }
/** id 数组 -> 逗号分隔串(去重,保持原顺序) */ /** code 数组 -> 逗号分隔串(去重,保持原顺序) */
export function joinProductIds(ids) { export function joinProductCodes(codes) {
const seen = new Set() const seen = new Set()
const out = [] const out = []
;(ids || []).forEach(id => { ;(codes || []).forEach(code => {
const key = String(id) const key = String(code)
if (key && !seen.has(key)) { if (key && !seen.has(key)) {
seen.add(key) seen.add(key)
out.push(key) out.push(key)
@@ -45,16 +48,17 @@ export function useProducts() {
return loadingPromise return loadingPromise
} }
/** 按产品ID查产品对象 */ /** 按产品代码查产品对象 */
function findProduct(productId) { function findProduct(productCode) {
if (productId === null || productId === undefined || productId === '') return null if (productCode === null || productCode === undefined || productCode === '') return null
return productList.value.find(p => String(p.productId) === String(productId)) || null const code = String(productCode).trim()
return productList.value.find(p => String(p.productCode) === code) || null
} }
/** 产品展示名:代码 + 名称 */ /** 产品展示名:代码 + 名称;查不到的产品回显原代码(旧库数据/已删除产品不致空白) */
function getProductLabel(productId) { function getProductLabel(productCode) {
const p = findProduct(productId) const p = findProduct(productCode)
if (!p) return String(productId) if (!p) return String(productCode)
return p.productCode + ' ' + p.productName return p.productCode + ' ' + p.productName
} }
@@ -168,8 +168,8 @@
<!-- ============ 绑定产品 ============ --> <!-- ============ 绑定产品 ============ -->
<el-tab-pane label="绑定产品" name="product"> <el-tab-pane label="绑定产品" name="product">
<div class="pane-toolbar"> <div class="pane-toolbar">
<product-select v-model="form.productIds" /> <product-select v-model="form.productCodes" />
<span class="pane-tip">绑定结果以产品ID逗号串存入客户主表 product_ids,仅用于产品对接映射</span> <span class="pane-tip">绑定结果以产品代码逗号串存入客户主表 product_codes,产品代码在新旧库间稳定,用于产品对接映射</span>
</div> </div>
<el-table :data="boundProducts" border size="small" class="bound-table"> <el-table :data="boundProducts" border size="small" class="bound-table">
<el-table-column label="序号" type="index" width="55" align="center" /> <el-table-column label="序号" type="index" width="55" align="center" />
@@ -192,7 +192,7 @@
<el-table-column label="生效日期" prop="effectiveDate" width="110" align="center" /> <el-table-column label="生效日期" prop="effectiveDate" width="110" align="center" />
<el-table-column label="操作" width="90" align="center"> <el-table-column label="操作" width="90" align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-button link type="danger" size="small" @click="removeProduct(row.productId)">移除</el-button> <el-button link type="danger" size="small" @click="removeProduct(row.productCode)">移除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<template #empty> <template #empty>
@@ -725,7 +725,7 @@ import {
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import axios from 'axios' import axios from 'axios'
import { saveAs } from 'file-saver' import { saveAs } from 'file-saver'
import { useProducts, parseProductIds } from '@/components/ProductSelect/useProducts' import { useProducts, parseProductCodes } from '@/components/ProductSelect/useProducts'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const route = useRoute() const route = useRoute()
@@ -773,7 +773,7 @@ function buildEmptyForm() {
weightThreshold: null, weightThreshold: null,
throwRatio: null, throwRatio: null,
creditEd: 0, creditEd: 0,
productIds: null, productCodes: null,
attachmentList: [], attachmentList: [],
companyList: [], companyList: [],
contactList: [], contactList: [],
@@ -788,14 +788,14 @@ const productStatusMap = { 0: '待生效', 1: '已生效', 2: '已失效' }
const productStatusTagType = { 0: 'info', 1: 'success', 2: 'danger' } const productStatusTagType = { 0: 'info', 1: 'success', 2: 'danger' }
const boundProducts = computed(() => const boundProducts = computed(() =>
parseProductIds(form.value.productIds) parseProductCodes(form.value.productCodes)
.map(id => findProduct(id)) .map(code => findProduct(code))
.filter(Boolean) .filter(Boolean)
) )
function removeProduct(productId) { function removeProduct(productCode) {
const ids = parseProductIds(form.value.productIds).filter(id => id !== String(productId)) const codes = parseProductCodes(form.value.productCodes).filter(code => code !== String(productCode))
form.value.productIds = ids.join(',') form.value.productCodes = codes.join(',')
} }
/* ---------------- 套餐绑定(prc_customer_price_set,一客户一套餐) ---------------- */ /* ---------------- 套餐绑定(prc_customer_price_set,一客户一套餐) ---------------- */
@@ -167,10 +167,10 @@
<span v-else>{{ scope.row.creditEd }}</span> <span v-else>{{ scope.row.creditEd }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="isColVisible('productIds')" label="绑定产品" align="center" prop="productIds" min-width="180"> <el-table-column v-if="isColVisible('productCodes')" label="绑定产品" align="center" prop="productCodes" min-width="180">
<template #default="scope"> <template #default="scope">
<span v-if="productNames(scope.row.productIds)" :title="productNames(scope.row.productIds)"> <span v-if="productNames(scope.row.productCodes)" :title="productNames(scope.row.productCodes)">
{{ productNames(scope.row.productIds) }} {{ productNames(scope.row.productCodes) }}
</span> </span>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
@@ -198,7 +198,7 @@
<script setup name="Customer"> <script setup name="Customer">
import { listCustomer, delCustomer } from "@/api/customersuppliermanagement/customerinfo/customer.js" import { listCustomer, delCustomer } from "@/api/customersuppliermanagement/customerinfo/customer.js"
import { useProducts, parseProductIds } from '@/components/ProductSelect/useProducts' import { useProducts, parseProductCodes } from '@/components/ProductSelect/useProducts'
import { useColumnSettings } from '@/utils/columnSettings' import { useColumnSettings } from '@/utils/columnSettings'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
@@ -222,7 +222,7 @@ const columnDefs = [
{ key: 'weightThreshold', label: '重量阈值' }, { key: 'weightThreshold', label: '重量阈值' },
{ key: 'throwRatio', label: '抛比' }, { key: 'throwRatio', label: '抛比' },
{ key: 'creditEd', label: '信用额度' }, { key: 'creditEd', label: '信用额度' },
{ key: 'productIds', label: '绑定产品' }, { key: 'productCodes', label: '绑定产品' },
{ key: 'remark', label: '备注说明' } { key: 'remark', label: '备注说明' }
] ]
const { colVisible, isColVisible, toggleColumn, resetColumns } = useColumnSettings('customer-info-list', columnDefs) const { colVisible, isColVisible, toggleColumn, resetColumns } = useColumnSettings('customer-info-list', columnDefs)
@@ -237,10 +237,10 @@ const total = ref(0)
const { sys_normal_disable, settlement_type, customer_type } = useDict("sys_normal_disable", "settlement_type", "customer_type") const { sys_normal_disable, settlement_type, customer_type } = useDict("sys_normal_disable", "settlement_type", "customer_type")
/** 绑定产品ID串 -> 产品名称展示(产品代码+名称;查不到的产品回显原ID) */ /** 绑定产品代码串 -> 产品名称展示(产品代码+名称;查不到的产品回显原代码) */
const { ensureProducts, getProductLabel } = useProducts() const { ensureProducts, getProductLabel } = useProducts()
function productNames(productIds) { function productNames(productCodes) {
return parseProductIds(productIds).map(id => getProductLabel(id)).join(',') return parseProductCodes(productCodes).map(code => getProductLabel(code)).join(',')
} }
ensureProducts() ensureProducts()
@@ -275,7 +275,7 @@ const data = reactive({
weightThreshold: undefined, weightThreshold: undefined,
throwRatio: undefined, throwRatio: undefined,
creditEd: undefined, creditEd: undefined,
productIds: undefined, productCodes: undefined,
} }
}) })