From 1b1b934d87c509eb5e15aec78564e51397f51aef Mon Sep 17 00:00:00 2001
From: liuminghui <468701464@qq.com>
Date: Mon, 2 Nov 2026 10:41:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20261102_supplier_menu_path.sql               | 10 ++++++++++
 bms-front/src/router/index.js                     | 15 ++++++++++++++-
 .../supplierinfo/supplieredit/index.vue           |  4 +++-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 bms-back/sql/customer+supplier/20261102_supplier_menu_path.sql

diff --git a/bms-back/sql/customer+supplier/20261102_supplier_menu_path.sql b/bms-back/sql/customer+supplier/20261102_supplier_menu_path.sql
new file mode 100644
index 00000000..0cd46f92
--- /dev/null
+++ b/bms-back/sql/customer+supplier/20261102_supplier_menu_path.sql
@@ -0,0 +1,10 @@
+-- 供应商管理是一级目录，path 被写成了 "1"，列表实际地址变成 /1/supplierinfo。
+-- 编辑页取消若写死 /customersuppliermanagement/supplierinfo，路由未注册，会落到 404。
+-- 把目录地址改成 supplier，列表即为 /supplier/supplierinfo。可重复执行。
+UPDATE sys_menu
+SET path = 'supplier',
+    update_by = 'admin',
+    update_time = NOW()
+WHERE menu_id = 2497
+  AND menu_type = 'M'
+  AND path = '1';
diff --git a/bms-front/src/router/index.js b/bms-front/src/router/index.js
index 5f48a047..e6d2e910 100644
--- a/bms-front/src/router/index.js
+++ b/bms-front/src/router/index.js
@@ -197,7 +197,11 @@ export const dynamicRoutes = [
         path: 'index',
         component: () => import('@/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue'),
         name: 'SupplierEdit',
-        meta: { title: '供应商编辑', activeMenu: '/customersuppliermanagement/supplierinfo' }
+        // 高亮地址跟菜单走。供应商目录 path 曾被写成 "1"，列表实际是 /1/supplierinfo，写死客户管理目录会对不上。
+        beforeEnter(to) {
+          to.meta.activeMenu = supplierListPath()
+        },
+        meta: { title: '供应商编辑', activeMenu: '/supplier/supplierinfo' }
       }
     ]
   },
@@ -264,4 +268,13 @@ const router = createRouter({
   },
 })
 
+/**
+ * 供应商列表的真实地址由菜单注册，不写死目录。
+ * 当前库里「供应商管理」目录 path 若仍是 1，这里会得到 /1/supplierinfo。
+ */
+export function supplierListPath() {
+  const hit = router.getRoutes().find(r => /\/supplierinfo$/.test(r.path))
+  return hit ? hit.path : '/supplier/supplierinfo'
+}
+
 export default router
diff --git a/bms-front/src/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue b/bms-front/src/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue
index 016ad13b..a4486076 100644
--- a/bms-front/src/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue
+++ b/bms-front/src/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue
@@ -622,6 +622,7 @@ import { getToken } from '@/utils/auth'
 import axios from 'axios'
 import { saveAs } from 'file-saver'
 import { useChannels, parseChannelCodes } from '@/components/ChannelSelect/useChannels'
+import { supplierListPath } from '@/router'
 
 const { proxy } = getCurrentInstance()
 const route = useRoute()
@@ -1063,7 +1064,8 @@ function submitForm() {
 }
 
 function goBack() {
-  router.push({ path: '/customersuppliermanagement/supplierinfo' })
+  // 关闭编辑页并回到已注册的供应商列表。菜单目录 path 是 1 时列表为 /1/supplierinfo，不能回到客户管理那条不存在的地址。
+  proxy.$tab.closeOpenPage({ path: supplierListPath() })
 }
 
 /* ============ 初始化 ============ */

From e93f0c02335a427fef1831a0ed3270d0a37a06ff Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Mon, 2 Nov 2026 11:52:08 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=BC=96=E8=BE=91=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=8C=85=E6=8B=AC=E6=9B=B4=E6=96=B0=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90=E5=90=8D=E7=A7=B0=E5=92=8C=E5=A4=87=E6=B3=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AE=A2=E6=88=B7=E7=AD=9B=E9=80=89=E5=92=8C?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=AE=A2=E6=88=B7=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/price/PriceSetController.java  |  10 ++
 .../com/bms/price/domain/PrcPriceSet.java     |   4 +
 .../bms/price/mapper/PrcPriceSetMapper.java   |   3 +
 .../price/service/IPrcPriceSetService.java    |   3 +
 .../service/impl/PrcPriceSetServiceImpl.java  |  24 ++++
 .../mapper/price/PrcPriceSetMapper.xml        |  38 +++++--
 bms-front/src/api/price/set.js                |   9 ++
 .../set/components/create/StepBasicInfo.vue   |   3 +-
 bms-front/src/views/price/set/priceSet.vue    | 103 +++++++++++++++---
 9 files changed, 170 insertions(+), 27 deletions(-)

diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java
index 9bad75c1..dab60160 100644
--- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java
+++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java
@@ -102,6 +102,16 @@ public class PriceSetController extends BaseController
         return toAjax(priceSetService.updatePrcPriceSet(set));
     }
 
+    /** Update package name and note only. */
+    @PreAuthorize("@ss.hasPermi('price:set:edit')")
+    @Log(title = "价格套餐基本信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/basic")
+    public AjaxResult editBasic(@RequestBody PrcPriceSet set)
+    {
+        set.setUpdateBy(getUsername());
+        return toAjax(priceSetService.updateBasicInfo(set));
+    }
+
     @PreAuthorize("@ss.hasPermi('price:set:remove')")
     @Log(title = "价格套餐", businessType = BusinessType.DELETE)
     @DeleteMapping("/{priceSetIds}")
diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSet.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSet.java
index 8f260747..32ec60c5 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSet.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPriceSet.java
@@ -34,8 +34,12 @@ public class PrcPriceSet extends BaseEntity
 
     private Integer productCount;
     private Integer customerCount;
+    /** List display: bound customer code/name summary (not a DB column). */
+    private String boundCustomers;
     private Boolean expired;
     private String keyword;
+    /** Query only: filter packages by bound customer id. */
+    private Long customerId;
     private String submitFlag;
     /** current version on create/edit save */
     private PrcPriceSetVersion version;
diff --git a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetMapper.java
index 86f20570..5174b0f7 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetMapper.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPriceSetMapper.java
@@ -21,6 +21,9 @@ public interface PrcPriceSetMapper
 
     public int updatePrcPriceSet(PrcPriceSet set);
 
+    /** Update name / note only (does not touch set_type / discount / status). */
+    public int updateBasicInfo(PrcPriceSet set);
+
     public int updatePrcPriceSetStatus(PrcPriceSet set);
 
     public int deletePrcPriceSetByIds(Long[] priceSetIds);
diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPriceSetService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPriceSetService.java
index 4b10014c..e2d9dd2f 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPriceSetService.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPriceSetService.java
@@ -26,6 +26,9 @@ public interface IPrcPriceSetService
 
     public int updatePrcPriceSet(PrcPriceSet set);
 
+    /** Update package name and note only; allowed for effect / draft / stopped. */
+    public int updateBasicInfo(PrcPriceSet set);
+
     public int deletePrcPriceSetByIds(Long[] priceSetIds);
 
     public int submit(Long priceSetId, String updateBy);
diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java
index 2562f3ca..1c060e66 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java
@@ -258,6 +258,30 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
         return setMapper.updatePrcPriceSet(set);
     }
 
+    @Override
+    public int updateBasicInfo(PrcPriceSet set)
+    {
+        if (set == null || set.getPriceSetId() == null)
+        {
+            throw new ServiceException(MessageUtils.message("price.set.notExists"));
+        }
+        PrcPriceSet db = requireSet(set.getPriceSetId());
+        if (STATUS_AUDIT.equals(db.getStatus()))
+        {
+            throw new ServiceException(MessageUtils.message("price.set.edit.audit"));
+        }
+        if (StringUtils.isEmpty(set.getPriceSetName()))
+        {
+            throw new ServiceException(MessageUtils.message("price.set.name.empty"));
+        }
+        set.setPriceSetName(set.getPriceSetName().trim());
+        if (setMapper.countByName(set) > 0)
+        {
+            throw new ServiceException(MessageUtils.message("price.set.name.exists"));
+        }
+        return setMapper.updateBasicInfo(set);
+    }
+
     @Override
     @Transactional
     public int deletePrcPriceSetByIds(Long[] priceSetIds)
diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml
index 39decd38..ba21255b 100644
--- a/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml
+++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml
@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"      column="update_time"        />
         <result property="productCount"    column="product_count"     />
         <result property="customerCount"   column="customer_count"    />
+        <result property="boundCustomers"  column="bound_customers"   />
     </resultMap>
 
     <sql id="selectPrcPriceSetVo">
@@ -33,7 +34,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                   inner join prc_price_set_version v on v.psv_id = p.psv_id
                  where v.price_set_id = s.price_set_id
                    and ifnull(p.is_del, '0') = '0') as product_count,
-               (select count(1) from prc_customer_price_set c where c.price_set_id = s.price_set_id) as customer_count
+               (select count(1) from prc_customer_price_set c where c.price_set_id = s.price_set_id) as customer_count,
+               (select group_concat(
+                           concat(ifnull(c.customer_code, ''),
+                                  case when ifnull(c.customer_name, '') = '' then '' else concat(' ', c.customer_name) end)
+                           order by c.bind_priority asc, c.customer_priceset_id asc
+                           separator '、')
+                  from prc_customer_price_set c
+                 where c.price_set_id = s.price_set_id) as bound_customers
         from prc_price_set s
     </sql>
 
@@ -47,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                s.set_type, s.default_discount, s.default_type, s.calculate_sign,
                s.status, s.tms_id,
                s.created_by, s.create_time, s.updated_by, s.update_time,
-               null as product_count, null as customer_count
+               null as product_count, null as customer_count, null as bound_customers
         from prc_price_set s
         where s.price_set_id = #{priceSetId}
     </select>
@@ -71,14 +79,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND (
                     s.price_set_code like concat('%', #{keyword}, '%')
                     OR s.price_set_name like concat('%', #{keyword}, '%')
-                    OR exists (
-                        select 1 from prc_customer_price_set c
-                        where c.price_set_id = s.price_set_id
-                          and (
-                              c.customer_name like concat('%', #{keyword}, '%')
-                              or concat(c.customer_id, '') like concat('%', #{keyword}, '%')
-                          )
-                    )
+                )
+            </if>
+            <if test="customerId != null">
+                AND exists (
+                    select 1 from prc_customer_price_set c
+                    where c.price_set_id = s.price_set_id
+                      and c.customer_id = #{customerId}
                 )
             </if>
             <!-- Data scope: customer sales / creator / explicit viewer bind.
@@ -167,6 +174,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where price_set_id = #{priceSetId}
     </update>
 
+    <update id="updateBasicInfo" parameterType="PrcPriceSet">
+        update prc_price_set
+        <set>
+            <if test="priceSetName != null and priceSetName != ''">price_set_name = #{priceSetName},</if>
+            price_set_note = #{priceSetNote},
+            <if test="updateBy != null and updateBy != ''">updated_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where price_set_id = #{priceSetId}
+    </update>
+
     <update id="updatePrcPriceSetStatus" parameterType="PrcPriceSet">
         update prc_price_set
         <set>
diff --git a/bms-front/src/api/price/set.js b/bms-front/src/api/price/set.js
index 32ca3220..db107037 100644
--- a/bms-front/src/api/price/set.js
+++ b/bms-front/src/api/price/set.js
@@ -86,6 +86,15 @@ export function updatePriceSet(data) {
   })
 }
 
+/** Update package name and note only. */
+export function updatePriceSetBasic(data) {
+  return request({
+    url: '/price/set/basic',
+    method: 'put',
+    data: data
+  })
+}
+
 export function delPriceSet(priceSetIds) {
   return request({
     url: '/price/set/' + priceSetIds,
diff --git a/bms-front/src/views/price/set/components/create/StepBasicInfo.vue b/bms-front/src/views/price/set/components/create/StepBasicInfo.vue
index 90f7230f..2c9c6280 100644
--- a/bms-front/src/views/price/set/components/create/StepBasicInfo.vue
+++ b/bms-front/src/views/price/set/components/create/StepBasicInfo.vue
@@ -4,11 +4,10 @@
     <el-form ref="formRef" :model="basic" :rules="rules" label-width="120px" class="max-form">
       <el-form-item label="套餐名称" prop="priceSetName">
         <el-input v-model="basic.priceSetName" maxlength="50" placeholder="如：金牌电商专属套餐" />
-        <div class="form-hint">显示给客户的套餐对外名称</div>
       </el-form-item>
 
       <el-form-item label="说明备注" prop="priceSetNote">
-        <el-input v-model="basic.priceSetNote" type="textarea" :rows="3" maxlength="200" placeholder="套餐业务说明，显示给客户与运营" />
+        <el-input v-model="basic.priceSetNote" type="textarea" :rows="3" maxlength="200" placeholder="请输入" />
       </el-form-item>
     </el-form>
   </el-card>
diff --git a/bms-front/src/views/price/set/priceSet.vue b/bms-front/src/views/price/set/priceSet.vue
index b5fd589f..b00793d4 100644
--- a/bms-front/src/views/price/set/priceSet.vue
+++ b/bms-front/src/views/price/set/priceSet.vue
@@ -19,6 +19,17 @@
         </el-col>
       </template>
 
+      <template #search-customerId="{ model }">
+        <customer-select
+          v-model="model.customerId"
+          option-select
+          remote-search
+          :page-size="20"
+          placeholder="客户名称 / 代码"
+          style="width: 240px"
+        />
+      </template>
+
       <template #col-setType="{ row }">
         <el-tag :type="row.setType === 'FIXED' ? 'warning' : 'primary'" size="small" effect="plain">
           {{ row.setType === 'FIXED' ? 'FIXED 固定价' : 'DISCOUNT 折扣' }}
@@ -29,6 +40,12 @@
         <el-tag :type="statusTag(row)" size="small">{{ statusLabel(row) }}</el-tag>
       </template>
 
+      <template #col-boundCustomers="{ row }">
+        <span v-if="row.boundCustomers">{{ row.boundCustomers }}</span>
+        <span v-else class="text-muted">-</span>
+        <el-tag v-if="row.customerCount > 0" size="small" type="info" effect="plain" class="cust-count">{{ row.customerCount }}</el-tag>
+      </template>
+
       <template #col-activeDetail="{ row }">
         <el-button
           link
@@ -41,6 +58,7 @@
 
       <template #col-action="{ row }">
         <el-button link type="primary" @click="handleDetail(row)" v-hasPermi="['price:set:query']">详情</el-button>
+        <el-button link type="primary" @click="openBasicEdit(row)" v-hasPermi="['price:set:edit']">修改</el-button>
         <el-button
           v-if="row.status === 'E'"
           link
@@ -58,6 +76,24 @@
       </template>
     </basic-table>
 
+    <el-dialog v-model="basicDialog.visible" :title="basicDialogTitle" width="520px" append-to-body destroy-on-close>
+      <el-form ref="basicFormRef" :model="basicForm" :rules="basicRules" label-width="96px">
+        <el-form-item label="套餐编码">
+          <el-input :model-value="basicForm.priceSetCode" disabled />
+        </el-form-item>
+        <el-form-item label="套餐名称" prop="priceSetName">
+          <el-input v-model="basicForm.priceSetName" maxlength="50" show-word-limit placeholder="请输入套餐名称" />
+        </el-form-item>
+        <el-form-item label="说明备注" prop="priceSetNote">
+          <el-input v-model="basicForm.priceSetNote" type="textarea" :rows="3" maxlength="200" show-word-limit placeholder="可选" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="basicDialog.visible = false">取消</el-button>
+        <el-button type="primary" :loading="basicDialog.saving" @click="submitBasicEdit">确定</el-button>
+      </template>
+    </el-dialog>
+
     <set-version-detail-drawer
       v-model="drawerVisible"
       :version="activeVersion"
@@ -69,9 +105,10 @@
 
 <script setup name="PriceSet">
 import {
-  listPriceSet, disablePriceSet, enablePriceSet, copyPriceSet, getPriceSet
+  listPriceSet, disablePriceSet, enablePriceSet, copyPriceSet, getPriceSet, updatePriceSetBasic
 } from '@/api/price/set'
 import SetVersionDetailDrawer from './components/detail/SetVersionDetailDrawer.vue'
+import CustomerSelect from '@/components/CustomerSelect/index.vue'
 import { setStatusLabel, setStatusTagType } from './utils/priceSet'
 
 const { proxy } = getCurrentInstance()
@@ -79,17 +116,6 @@ const tableRef = ref()
 const isFirstActivate = ref(true)
 
 const searchColumns = [
-  {
-    label: '类型',
-    prop: 'setType',
-    component: 'select',
-    options: [
-      { label: 'FIXED 固定价', value: 'FIXED' },
-      { label: 'DISCOUNT 折扣', value: 'DISCOUNT' }
-    ],
-    placeholder: '全部类型',
-    width: '160px'
-  },
   {
     label: '状态',
     prop: 'status',
@@ -102,17 +128,19 @@ const searchColumns = [
     placeholder: '全部状态',
     width: '140px'
   },
-  { label: '关键字', prop: 'keyword', component: 'input', placeholder: '套餐ID / 名称 / 客户', width: '240px' }
+  { label: '关键字', prop: 'keyword', component: 'input', placeholder: '套餐编码 / 名称', width: '200px' },
+  { label: '客户', prop: 'customerId', placeholder: '客户名称 / 代码', width: '240px' }
 ]
 
 const columns = [
   { label: '套餐编码', prop: 'priceSetCode', width: 110 },
   { label: '套餐名称', prop: 'priceSetName', minWidth: 160 },
   { label: '类型', prop: 'setType', width: 140 },
-  { label: '说明', prop: 'priceSetNote', minWidth: 160 },
+  { label: '绑定客户', prop: 'boundCustomers', minWidth: 220 },
+  { label: '说明', prop: 'priceSetNote', minWidth: 140 },
   { label: '状态', prop: 'status', width: 90 },
   { label: '生效明细', prop: 'activeDetail', width: 100 },
-  { label: '操作', prop: 'action', width: 160, showInToolbar: false }
+  { label: '操作', prop: 'action', width: 200, showInToolbar: false }
 ]
 
 function queryList(params) {
@@ -135,6 +163,49 @@ function handleDetail(row) {
   proxy.$router.push({ path: '/customer/setDetail', query: { priceSetId: row.priceSetId } })
 }
 
+
+const basicDialog = reactive({ visible: false, saving: false })
+const basicFormRef = ref()
+const basicForm = reactive({
+  priceSetId: null,
+  priceSetCode: '',
+  priceSetName: '',
+  priceSetNote: ''
+})
+const basicRules = {
+  priceSetName: [{ required: true, message: '套餐名称不能为空', trigger: 'blur' }]
+}
+const basicDialogTitle = computed(() => '修改套餐基本信息')
+
+function openBasicEdit(row) {
+  if (!row || row.priceSetId == null) return
+  basicForm.priceSetId = row.priceSetId
+  basicForm.priceSetCode = row.priceSetCode || ''
+  basicForm.priceSetName = row.priceSetName || ''
+  basicForm.priceSetNote = row.priceSetNote || ''
+  basicDialog.visible = true
+  nextTick(() => basicFormRef.value && basicFormRef.value.clearValidate())
+}
+
+function submitBasicEdit() {
+  basicFormRef.value.validate(valid => {
+    if (!valid) return
+    basicDialog.saving = true
+    updatePriceSetBasic({
+      priceSetId: basicForm.priceSetId,
+      priceSetName: basicForm.priceSetName,
+      priceSetNote: basicForm.priceSetNote
+    }).then(() => {
+      proxy.$modal.msgSuccess('保存成功')
+      basicDialog.visible = false
+      refresh()
+    }).finally(() => {
+      basicDialog.saving = false
+    })
+  })
+}
+
+
 /** 生效明细：拉详情找生效版本(status=1)弹抽屉 */
 const drawerVisible = ref(false)
 const activeVersion = ref(null)
@@ -200,6 +271,8 @@ function handleCopy(row) {
 </script>
 
 <style scoped>
+.text-muted { color: #909399; }
+.cust-count { margin-left: 6px; vertical-align: middle; }
 .hint-card {
   margin-top: 16px;
 }

From 7d3854bb4ff1eb3223ebfef481f2086b4106d5a1 Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Mon, 2 Nov 2026 16:41:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BmsProductServiceImpl.java   | 583 ++++++++++++++++-
 .../impl/BmsRedlineProductServiceImpl.java    | 606 +++++++++++++++++-
 .../set/components/create/PriceEditDrawer.vue |  18 +-
 .../set/components/create/StepDetails.vue     |   6 +-
 4 files changed, 1202 insertions(+), 11 deletions(-)

diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java
index dfc53670..b44c7018 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsProductServiceImpl.java
@@ -383,12 +383,16 @@ public class BmsProductServiceImpl implements IBmsProductService
 
         try (InputStream is = new java.io.ByteArrayInputStream(bytes); Workbook workbook = WorkbookFactory.create(is))
         {
+            assertNotSingleCountryQuoteForMultiImport(workbook);
+            if (workbookHasInlineProductColumns(workbook))
+            {
+                return importProductExcelByInline(workbook, bytes, filename, operName, taskId, forcedEff);
+            }
             Sheet catalog = workbook.getSheet(CATALOG_SHEET);
             if (catalog == null)
             {
                 throw new ServiceException(MessageUtils.message("price.product.import.sheetNotFound"));
             }
-            assertNotSingleCountryQuoteForMultiImport(workbook);
 
             List<BmsProduct> products = parseCatalog(catalog);
             if (products.isEmpty())
@@ -433,7 +437,7 @@ public class BmsProductServiceImpl implements IBmsProductService
                 try
                 {
                     int[] nums = importOneProductWithDeadlockRetry(workbook, product, operName, regionByNameCn,
-                        euRegions, zoneByCountryAndCode, unmatchedCountries, forcedEff, importPsvId);
+                        euRegions, zoneByCountryAndCode, unmatchedCountries, forcedEff, importPsvId, null);
                     successNum += nums[0];
                     skipNum += nums[1];
                     countryNum += nums[2];
@@ -684,12 +688,18 @@ public class BmsProductServiceImpl implements IBmsProductService
         }
         try (InputStream is = new java.io.ByteArrayInputStream(bytes); Workbook workbook = WorkbookFactory.create(is))
         {
+            assertNotSingleCountryQuoteForMultiImport(workbook);
+            // Detail sheets with inline product-code / product-name column: identify by those
+            // columns, not by catalog sheet-name matching (variants like RM/IP/EV share one sheet).
+            if (workbookHasInlineProductColumns(workbook))
+            {
+                return readQuoteWorkbookByInlineProductCode(workbook);
+            }
             Sheet catalog = workbook.getSheet(CATALOG_SHEET);
             if (catalog == null)
             {
                 throw new ServiceException(MessageUtils.message("price.product.import.sheetNotFound"));
             }
-            assertNotSingleCountryQuoteForMultiImport(workbook);
             List<BmsProduct> products = dedupeCatalogProducts(parseCatalog(catalog));
             if (products.isEmpty())
             {
@@ -791,6 +801,543 @@ public class BmsProductServiceImpl implements IBmsProductService
         private Map<String, List<BmsProductCountry>> byCode;
     }
 
+    /**
+     * Formal product import when price sheets carry inline product-code / product-name columns.
+     * Identifies products from detail rows (not catalog sheet-name matching).
+     */
+    private String importProductExcelByInline(Workbook workbook, byte[] bytes, String filename,
+        String operName, String taskId, Date forcedEff) throws Exception
+    {
+        QuoteWorkbook parsed = readQuoteWorkbookByInlineProductCode(workbook);
+        List<BmsProduct> products = enrichInlineProductsFromCatalog(workbook, parsed.products);
+        if (products.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.product.import.noData"));
+        }
+        reportImportProgress(taskId, 20, "parsing excel");
+        assertImportProductsEffectiveNotBeforePrev(products, forcedEff);
+
+        Map<String, BmsRegion> regionByNameCn = loadRegionByNameCn();
+        if (regionByNameCn.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.product.import.regionEmpty"));
+        }
+        List<BmsRegion> euRegions = loadEuRegions(regionByNameCn);
+        Map<String, PrcZone> zoneByCountryAndCode = loadZoneByCountryAndCode();
+
+        Long importPsvId = forcedEff == null
+            ? catalogVersionSupport.ensureDraftVersion(PriceType.PRODUCT, null, false).getPsvId()
+            : catalogVersionSupport.requirePsvId(PriceType.PRODUCT, null, forcedEff);
+        priceExcelFileService.saveImportExcel(
+            PrcPriceExcelFile.TYPE_PRODUCT, forcedEff, bytes, filename, operName, importPsvId);
+
+        int successNum = 0;
+        int skipNum = 0;
+        int countryNum = 0;
+        Set<String> unmatchedCountries = new HashSet<String>();
+        StringBuilder failureMsg = new StringBuilder();
+        int total = products.size();
+        int index = 0;
+        for (BmsProduct product : products)
+        {
+            index++;
+            if (product == null || StringUtils.isEmpty(product.getProductCode()))
+            {
+                continue;
+            }
+            String code = product.getProductCode().trim().toUpperCase(Locale.ROOT);
+            reportImportProductProgress(taskId, index, total, product.getProductCode());
+            List<BmsProductCountry> countries = parsed.byCode.get(code);
+            try
+            {
+                int[] nums = importOneProductWithDeadlockRetry(workbook, product, operName, regionByNameCn,
+                    euRegions, zoneByCountryAndCode, unmatchedCountries, forcedEff, importPsvId, countries);
+                successNum += nums[0];
+                skipNum += nums[1];
+                countryNum += nums[2];
+            }
+            catch (Exception e)
+            {
+                String tip = e.getMessage();
+                if (StringUtils.isEmpty(tip))
+                {
+                    tip = e.getClass().getSimpleName();
+                }
+                failureMsg.append("<br/>").append(product.getProductCode()).append("：").append(tip);
+            }
+        }
+        reportImportProgress(taskId, 95, "finishing");
+        if (failureMsg.length() > 0)
+        {
+            return MessageUtils.message("price.product.import.partialFail",
+                Integer.valueOf(successNum), Integer.valueOf(skipNum), failureMsg.toString());
+        }
+        String msg = MessageUtils.message("price.product.import.success", successNum, skipNum, countryNum)
+            + "<br/>" + MessageUtils.message("price.product.import.success.detail1")
+            + "<br/>" + MessageUtils.message("price.product.import.success.detail2");
+        if (!unmatchedCountries.isEmpty())
+        {
+            msg += "<br/>" + MessageUtils.message("price.product.import.success.unmatched",
+                String.join("、", unmatchedCountries));
+        }
+        return msg;
+    }
+
+    /** Prefer catalog metadata when code matches; keep detail product name for variants. */
+    private List<BmsProduct> enrichInlineProductsFromCatalog(Workbook workbook, List<BmsProduct> inlineProducts)
+    {
+        Map<String, BmsProduct> catalogByCode = new HashMap<String, BmsProduct>();
+        Sheet catalog = workbook == null ? null : workbook.getSheet(CATALOG_SHEET);
+        if (catalog != null)
+        {
+            try
+            {
+                for (BmsProduct p : dedupeCatalogProducts(parseCatalog(catalog)))
+                {
+                    if (p == null || StringUtils.isEmpty(p.getProductCode()))
+                    {
+                        continue;
+                    }
+                    catalogByCode.put(p.getProductCode().trim().toUpperCase(Locale.ROOT), p);
+                }
+            }
+            catch (Exception ignored)
+            {
+                // Catalog optional for inline import.
+            }
+        }
+        List<BmsProduct> out = new ArrayList<BmsProduct>();
+        if (inlineProducts == null)
+        {
+            return out;
+        }
+        for (BmsProduct inline : inlineProducts)
+        {
+            if (inline == null || StringUtils.isEmpty(inline.getProductCode()))
+            {
+                continue;
+            }
+            String code = inline.getProductCode().trim().toUpperCase(Locale.ROOT);
+            BmsProduct cat = catalogByCode.get(code);
+            if (cat == null)
+            {
+                out.add(inline);
+                continue;
+            }
+            BmsProduct merged = new BmsProduct();
+            merged.setProductCode(inline.getProductCode());
+            merged.setProductName(StringUtils.isNotEmpty(inline.getProductName())
+                ? inline.getProductName() : cat.getProductName());
+            merged.setServiceLevel(cat.getServiceLevel());
+            merged.setCargoAttr(cat.getCargoAttr());
+            merged.setDestRegion(cat.getDestRegion());
+            merged.setUpdateNote(cat.getUpdateNote());
+            merged.setEffectiveDate(cat.getEffectiveDate());
+            merged.setTaxMode(StringUtils.isNotEmpty(cat.getTaxMode())
+                ? cat.getTaxMode() : resolveTaxMode(merged.getProductName()));
+            out.add(merged);
+        }
+        return out;
+    }
+
+    /**
+     * True when any multi-country price sheet has an inline product-code or product-name column
+     * (产品代码 / 产品对接代码 / 产品名称).
+     */
+    private boolean workbookHasInlineProductColumns(Workbook workbook)
+    {
+        if (workbook == null)
+        {
+            return false;
+        }
+        for (int i = 0; i < workbook.getNumberOfSheets(); i++)
+        {
+            String sheetName = workbook.getSheetName(i);
+            if (shouldSkipCountryPriceSheet(sheetName))
+            {
+                continue;
+            }
+            Sheet sheet = workbook.getSheetAt(i);
+            if (sheet == null)
+            {
+                continue;
+            }
+            int[] countryHeader = findHeaderCell(sheet, "国家");
+            if (countryHeader == null)
+            {
+                continue;
+            }
+            Row head = sheet.getRow(countryHeader[0]);
+            if (head == null)
+            {
+                continue;
+            }
+            if (firstCol(head, "产品代码", "产品对接代码") >= 0
+                || findColByHeader(head, "产品名称", 0) >= 0)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Multi-country parse keyed by inline product-code column on price sheets.
+     * Does not use 产品目录 sheet matching.
+     */
+    private QuoteWorkbook readQuoteWorkbookByInlineProductCode(Workbook workbook) throws Exception
+    {
+        Map<String, String> catalogCodeByName = buildCatalogCodeByName(workbook);
+        Map<String, BmsRegion> regionByNameCn = loadRegionByNameCn();
+        List<BmsRegion> euRegions = loadEuRegions(regionByNameCn);
+        Map<String, PrcZone> zoneByCountryAndCode = loadZoneByCountryAndCode();
+        Set<String> unmatchedCountries = new HashSet<String>();
+        Map<String, List<BmsProductCountry>> out = new LinkedHashMap<String, List<BmsProductCountry>>();
+        Map<String, BmsProduct> productMeta = new LinkedHashMap<String, BmsProduct>();
+        List<String> tips = new ArrayList<String>();
+
+        for (int i = 0; i < workbook.getNumberOfSheets(); i++)
+        {
+            String sheetName = workbook.getSheetName(i);
+            if (shouldSkipCountryPriceSheet(sheetName))
+            {
+                continue;
+            }
+            Sheet sheet = workbook.getSheetAt(i);
+            if (sheet == null || findHeaderCell(sheet, "国家") == null)
+            {
+                continue;
+            }
+            Map<String, List<BmsProductCountry>> sheetByCode = parseProductSheetByInlineCode(
+                sheet, catalogCodeByName, regionByNameCn, euRegions, zoneByCountryAndCode, unmatchedCountries);
+            if (sheetByCode == null || sheetByCode.isEmpty())
+            {
+                continue;
+            }
+            for (Map.Entry<String, List<BmsProductCountry>> e : sheetByCode.entrySet())
+            {
+                if (e == null || StringUtils.isEmpty(e.getKey()) || e.getValue() == null || e.getValue().isEmpty())
+                {
+                    continue;
+                }
+                String code = e.getKey();
+                List<BmsProductCountry> rows = e.getValue();
+                List<BmsProductCountry> existing = out.get(code);
+                if (existing == null)
+                {
+                    out.put(code, new ArrayList<BmsProductCountry>(rows));
+                }
+                else
+                {
+                    existing.addAll(rows);
+                }
+                if (!productMeta.containsKey(code))
+                {
+                    BmsProduct p = new BmsProduct();
+                    p.setProductCode(code);
+                    String name = null;
+                    for (BmsProductCountry r : rows)
+                    {
+                        if (r != null && StringUtils.isNotEmpty(r.getProductName()))
+                        {
+                            name = r.getProductName();
+                            break;
+                        }
+                    }
+                    p.setProductName(StringUtils.isNotEmpty(name) ? name : code);
+                    p.setTaxMode(resolveTaxMode(p.getProductName()));
+                    productMeta.put(code, p);
+                }
+            }
+        }
+
+        for (Map.Entry<String, List<BmsProductCountry>> e : out.entrySet())
+        {
+            BmsProduct p = productMeta.get(e.getKey());
+            String tip = buildDuplicateCountryWeightTip(p, e.getValue());
+            if (StringUtils.isNotEmpty(tip))
+            {
+                tips.add(tip);
+            }
+        }
+        if (!tips.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.product.import.dupCountry",
+                String.join("<br/>", tips)));
+        }
+        if (out.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.set.import.noPriceRows"));
+        }
+        QuoteWorkbook parsed = new QuoteWorkbook();
+        parsed.products = new ArrayList<BmsProduct>(productMeta.values());
+        parsed.byCode = out;
+        return parsed;
+    }
+
+    /**
+     * Parse one multi-country price sheet grouped by inline product code / product name.
+     * Prefer product-code column; if only product-name exists, resolve code via catalog name map.
+     * Country / product-code / product-name / size / last-mile / lead-time carry forward
+     * when subsequent weight-band rows leave those cells blank.
+     */
+    private Map<String, List<BmsProductCountry>> parseProductSheetByInlineCode(Sheet sheet,
+        Map<String, String> catalogCodeByName, Map<String, BmsRegion> regionByNameCn,
+        List<BmsRegion> euRegions, Map<String, PrcZone> zoneByCountryAndCode,
+        Set<String> unmatchedCountries)
+    {
+        Map<String, List<BmsProductCountry>> out = new LinkedHashMap<String, List<BmsProductCountry>>();
+        if (sheet == null)
+        {
+            return out;
+        }
+        Date sheetEffective = parseSheetEffectiveDate(sheet);
+        int[] countryHeader = findHeaderCell(sheet, "国家");
+        if (countryHeader == null)
+        {
+            return out;
+        }
+        int headerRowIdx = countryHeader[0];
+        Row headerRow = sheet.getRow(headerRowIdx);
+        int colCountry = countryHeader[1];
+        int colProductCode = firstCol(headerRow, "产品代码", "产品对接代码");
+        int colProductName = findColByHeader(headerRow, "产品名称", 0);
+        if (colProductCode < 0 && colProductName < 0)
+        {
+            return out;
+        }
+        int colWeight = findColByHeader(headerRow, "重量", colCountry + 1);
+        int colFreight = findColByHeader(headerRow, "运费", colCountry + 1);
+        int colRegister = findColByHeader(headerRow, "挂号", colCountry + 1);
+        int colSize = findColByHeader(headerRow, "尺寸", colCountry + 1);
+        int colLastMile = findColByHeader(headerRow, "尾程", colCountry + 1);
+        int colLeadTime = findColByHeader(headerRow, "时效", colCountry + 1);
+        if (colWeight < 0 || colFreight < 0)
+        {
+            return out;
+        }
+
+        String currentCountryRaw = null;
+        String currentProductCode = null;
+        String currentProductName = null;
+        String currentSize = null;
+        String currentLastMile = null;
+        String currentLeadTime = null;
+        int lastRow = sheet.getLastRowNum();
+        for (int i = headerRowIdx + 1; i <= lastRow; i++)
+        {
+            Row row = sheet.getRow(i);
+            if (row == null)
+            {
+                continue;
+            }
+            String countryCell = cellString(row.getCell(colCountry));
+            String weightLabel = cellString(row.getCell(colWeight));
+            if ("国家".equals(countryCell)
+                || (weightLabel != null && weightLabel.contains("重量段")))
+            {
+                continue;
+            }
+            if (StringUtils.isNotEmpty(countryCell))
+            {
+                currentCountryRaw = countryCell;
+            }
+            boolean productChanged = false;
+            if (colProductCode >= 0)
+            {
+                String codeCell = normalizeImportProductCode(cellString(row.getCell(colProductCode)));
+                if (StringUtils.isNotEmpty(codeCell))
+                {
+                    String newCode = codeCell.trim().toUpperCase(Locale.ROOT);
+                    if (currentProductCode == null || !newCode.equals(currentProductCode))
+                    {
+                        productChanged = true;
+                        currentProductCode = newCode;
+                    }
+                }
+            }
+            if (colProductName >= 0)
+            {
+                String nameCell = cellString(row.getCell(colProductName));
+                if (StringUtils.isNotEmpty(nameCell) && !isSectionTitle(nameCell))
+                {
+                    String newName = nameCell.replace("\n", " ").replace("\r", " ").trim();
+                    if (currentProductName == null || !newName.equals(currentProductName))
+                    {
+                        productChanged = true;
+                        currentProductName = newName;
+                        // Name-only sheets: resolve product code from catalog by product name.
+                        if (colProductCode < 0)
+                        {
+                            String mapped = resolveCodeByProductName(currentProductName, catalogCodeByName);
+                            if (StringUtils.isNotEmpty(mapped))
+                            {
+                                currentProductCode = mapped;
+                            }
+                            else
+                            {
+                                currentProductCode = null;
+                            }
+                        }
+                    }
+                }
+            }
+            if (productChanged)
+            {
+                currentSize = null;
+                currentLastMile = null;
+                currentLeadTime = null;
+            }
+            if (colSize >= 0 && StringUtils.isNotEmpty(cellString(row.getCell(colSize))))
+            {
+                currentSize = emptyToNull(cellString(row.getCell(colSize)));
+            }
+            if (colLastMile >= 0 && StringUtils.isNotEmpty(cellString(row.getCell(colLastMile))))
+            {
+                currentLastMile = emptyToNull(cellString(row.getCell(colLastMile)));
+            }
+            if (colLeadTime >= 0 && StringUtils.isNotEmpty(cellString(row.getCell(colLeadTime))))
+            {
+                currentLeadTime = emptyToNull(cellString(row.getCell(colLeadTime)));
+            }
+            if (StringUtils.isEmpty(currentCountryRaw) || StringUtils.isEmpty(currentProductCode))
+            {
+                continue;
+            }
+            BigDecimal[] range = parseWeightRange(weightLabel);
+            if (range == null)
+            {
+                continue;
+            }
+            BigDecimal freight = cellDecimal(row.getCell(colFreight));
+            BigDecimal registration = colRegister >= 0 ? cellDecimal(row.getCell(colRegister)) : null;
+            Date eff = sheetEffective;
+
+            ZoneCodeAbbrevs.CountryZoneParts parts = ZoneCodeAbbrevs.splitCountryZone(currentCountryRaw);
+            if (parts == null || StringUtils.isEmpty(parts.countryName))
+            {
+                continue;
+            }
+            String baseCountry = parts.countryName;
+            String zoneLabel = parts.zoneLabel;
+            List<BmsProductCountry> bucket = out.get(currentProductCode);
+            if (bucket == null)
+            {
+                bucket = new ArrayList<BmsProductCountry>();
+                out.put(currentProductCode, bucket);
+            }
+
+            BmsRegion region = resolveRegion(baseCountry, regionByNameCn);
+            if (region != null)
+            {
+                BmsProductCountry c = buildCountryRow(region.getCountryNameCn(), region.getCountryCode2(),
+                    zoneLabel, zoneByCountryAndCode,
+                    range, freight, registration, currentSize, currentLastMile, currentLeadTime, eff);
+                c.setProductCode(currentProductCode);
+                c.setProductName(currentProductName);
+                bucket.add(c);
+                continue;
+            }
+            if (isEuZoneName(baseCountry) && StringUtils.isEmpty(zoneLabel))
+            {
+                if (euRegions == null || euRegions.isEmpty())
+                {
+                    throw new ServiceException(MessageUtils.message("price.product.import.euEmpty"));
+                }
+                for (BmsRegion eu : euRegions)
+                {
+                    BmsProductCountry c = buildCountryRow(eu.getCountryNameCn(), eu.getCountryCode2(),
+                        null, zoneByCountryAndCode,
+                        range, freight, registration, currentSize, currentLastMile, currentLeadTime, eff);
+                    c.setProductCode(currentProductCode);
+                    c.setProductName(currentProductName);
+                    bucket.add(c);
+                }
+                continue;
+            }
+            unmatchedCountries.add(currentCountryRaw.trim().replace("\n", " ").replace("\r", " "));
+            BmsProductCountry c = buildCountryRow(baseCountry, null, zoneLabel, zoneByCountryAndCode,
+                range, freight, registration, currentSize, currentLastMile, currentLeadTime, eff);
+            c.setProductCode(currentProductCode);
+            c.setProductName(currentProductName);
+            bucket.add(c);
+        }
+        return out;
+    }
+
+    /** Build productName -> productCode from 产品目录 (first row per name wins). */
+    private Map<String, String> buildCatalogCodeByName(Workbook workbook)
+    {
+        Map<String, String> map = new LinkedHashMap<String, String>();
+        if (workbook == null)
+        {
+            return map;
+        }
+        Sheet catalog = workbook.getSheet(CATALOG_SHEET);
+        if (catalog == null)
+        {
+            return map;
+        }
+        try
+        {
+            List<BmsProduct> products = dedupeCatalogProducts(parseCatalog(catalog));
+            for (BmsProduct p : products)
+            {
+                if (p == null || StringUtils.isEmpty(p.getProductCode()) || StringUtils.isEmpty(p.getProductName()))
+                {
+                    continue;
+                }
+                String nameKey = compactName(p.getProductName());
+                if (StringUtils.isEmpty(nameKey) || map.containsKey(nameKey))
+                {
+                    continue;
+                }
+                map.put(nameKey, p.getProductCode().trim().toUpperCase(Locale.ROOT));
+            }
+        }
+        catch (Exception ignored)
+        {
+            // Catalog optional for inline identity; ignore parse errors.
+        }
+        return map;
+    }
+
+    /** Resolve product code by product name; exact compact match, then base name before '(' / '（'. */
+    private String resolveCodeByProductName(String productName, Map<String, String> catalogCodeByName)
+    {
+        if (StringUtils.isEmpty(productName) || catalogCodeByName == null || catalogCodeByName.isEmpty())
+        {
+            return null;
+        }
+        String key = compactName(productName);
+        String hit = catalogCodeByName.get(key);
+        if (StringUtils.isNotEmpty(hit))
+        {
+            return hit;
+        }
+        String base = productName.trim();
+        int idx = base.indexOf('(');
+        int idx2 = base.indexOf('（');
+        int cut = -1;
+        if (idx >= 0)
+        {
+            cut = idx;
+        }
+        if (idx2 >= 0 && (cut < 0 || idx2 < cut))
+        {
+            cut = idx2;
+        }
+        if (cut > 0)
+        {
+            hit = catalogCodeByName.get(compactName(base.substring(0, cut)));
+            if (StringUtils.isNotEmpty(hit))
+            {
+                return hit;
+            }
+        }
+        return null;
+    }
+
     /**
      * Multi-country import expects price sheets with a "country" column.
      * Single-country dedicated-line sheets use product-name + weight blocks instead.
@@ -1293,7 +1840,8 @@ public class BmsProductServiceImpl implements IBmsProductService
      */
     private int[] importOneProductWithDeadlockRetry(Workbook workbook, BmsProduct product, String operName,
         Map<String, BmsRegion> regionByNameCn, List<BmsRegion> euRegions,
-        Map<String, PrcZone> zoneByCountryAndCode, Set<String> unmatchedCountries, Date forcedEff, Long importPsvId)
+        Map<String, PrcZone> zoneByCountryAndCode, Set<String> unmatchedCountries, Date forcedEff, Long importPsvId,
+        List<BmsProductCountry> preParsedCountries)
         throws Exception
     {
         int max = 8;
@@ -1310,8 +1858,10 @@ public class BmsProductServiceImpl implements IBmsProductService
                 {
                     product.setPsvId(importPsvId);
                 }
-                int[] nums = importOneProduct(workbook, product, operName, regionByNameCn, euRegions,
-                    zoneByCountryAndCode, unmatchedCountries, forcedEff);
+                int[] nums = preParsedCountries != null
+                    ? importOneProductFromRows(product, preParsedCountries, operName, forcedEff)
+                    : importOneProduct(workbook, product, operName, regionByNameCn, euRegions,
+                        zoneByCountryAndCode, unmatchedCountries, forcedEff);
                 transactionManager.commit(tx);
                 return nums;
             }
@@ -1461,6 +2011,27 @@ public class BmsProductServiceImpl implements IBmsProductService
             throw new ServiceException(MessageUtils.message("price.product.import.noCountry",
                 productSheet.getSheetName()));
         }
+        return importOneProductFromRows(product, countries, operName, forcedEffectiveDate);
+    }
+
+    /** Import using pre-parsed country rows (inline product-code / product-name path). */
+    private int[] importOneProductFromRows(BmsProduct product, List<BmsProductCountry> countries,
+        String operName, Date forcedEffectiveDate)
+    {
+        if (product != null)
+        {
+            if (StringUtils.isEmpty(product.getSourceSheet()))
+            {
+                product.setSourceSheet(product.getProductName());
+            }
+            product.setCreateBy(operName);
+            product.setUpdateBy(operName);
+        }
+        if (countries == null || countries.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.product.import.noCountry",
+                product == null ? "" : product.getProductCode()));
+        }
         assertNoDuplicateCountryWeightRows(product, countries);
         // UI-selected effective date wins over Excel; previous open product/country rows expire at this date
         Date newEff = forcedEffectiveDate == null && product.getEffectiveDate() == null
diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsRedlineProductServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsRedlineProductServiceImpl.java
index 06a6b800..027be1ff 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsRedlineProductServiceImpl.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/BmsRedlineProductServiceImpl.java
@@ -362,6 +362,10 @@ public class BmsRedlineProductServiceImpl implements IBmsRedlineProductService
 
         try (InputStream is = new java.io.ByteArrayInputStream(bytes); Workbook workbook = WorkbookFactory.create(is))
         {
+            if (workbookHasInlineProductColumns(workbook))
+            {
+                return importRedlineExcelByInline(workbook, bytes, filename, operName, taskId, forcedEff);
+            }
             Sheet catalog = workbook.getSheet(CATALOG_SHEET);
             if (catalog == null)
             {
@@ -665,6 +669,10 @@ public class BmsRedlineProductServiceImpl implements IBmsRedlineProductService
         }
         try (InputStream is = new java.io.ByteArrayInputStream(bytes); Workbook workbook = WorkbookFactory.create(is))
         {
+            if (workbookHasInlineProductColumns(workbook))
+            {
+                return readQuoteWorkbookByInlineProductCode(workbook).byCode;
+            }
             Sheet catalog = workbook.getSheet(CATALOG_SHEET);
             if (catalog == null)
             {
@@ -712,9 +720,15 @@ public class BmsRedlineProductServiceImpl implements IBmsRedlineProductService
     @Override
     public Map<String, Object> previewImportCatalog(byte[] bytes, String filename) throws Exception
     {
-        Map<String, List<BmsRedlineProductCountry>> byCode = parseQuoteExcelByProduct(bytes, filename);
         try (InputStream is = new java.io.ByteArrayInputStream(bytes); Workbook workbook = WorkbookFactory.create(is))
         {
+            if (workbookHasInlineProductColumns(workbook))
+            {
+                RedlineQuoteWorkbook parsed = readQuoteWorkbookByInlineProductCode(workbook);
+                List<BmsRedlineProduct> products = enrichInlineProductsFromCatalog(workbook, parsed.products);
+                return buildCatalogPreview(products, parsed.byCode);
+            }
+            Map<String, List<BmsRedlineProductCountry>> byCode = parseQuoteExcelByProduct(bytes, filename);
             Sheet catalog = workbook.getSheet(CATALOG_SHEET);
             List<BmsRedlineProduct> catalogProducts = dedupeCatalogProducts(parseCatalog(catalog));
             return buildCatalogPreview(catalogProducts, byCode);
@@ -1205,8 +1219,28 @@ public class BmsRedlineProductServiceImpl implements IBmsRedlineProductService
             throw new ServiceException(MessageUtils.message("price.product.import.noCountry",
                 productSheet.getSheetName()));
         }
+        return importOneProductFromRows(product, countries, operName, forcedEffectiveDate);
+    }
+
+    /** Import using pre-parsed country rows (inline product-code / product-name path). */
+    private int[] importOneProductFromRows(BmsRedlineProduct product, List<BmsRedlineProductCountry> countries,
+        String operName, Date forcedEffectiveDate)
+    {
+        if (product != null)
+        {
+            if (StringUtils.isEmpty(product.getSourceSheet()))
+            {
+                product.setSourceSheet(product.getProductName());
+            }
+            product.setCreateBy(operName);
+            product.setUpdateBy(operName);
+        }
+        if (countries == null || countries.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.product.import.noCountry",
+                product == null ? "" : product.getProductCode()));
+        }
         assertNoDuplicateCountryWeightRows(product, countries);
-        // UI-selected effective date wins over Excel; previous open product/country rows expire at this date
         Date newEff = forcedEffectiveDate == null && product.getEffectiveDate() == null
             ? null
             : requireImportEffectiveDate(forcedEffectiveDate != null ? forcedEffectiveDate
@@ -2447,6 +2481,574 @@ public class BmsRedlineProductServiceImpl implements IBmsRedlineProductService
         return map;
     }
 
+
+    private static final class RedlineQuoteWorkbook
+    {
+        private List<BmsRedlineProduct> products;
+        private Map<String, List<BmsRedlineProductCountry>> byCode;
+    }
+
+    private int[] importOneProductInline(BmsRedlineProduct product, List<BmsRedlineProductCountry> countries,
+        String operName, Date forcedEff, Long importPsvId) throws Exception
+    {
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+        TransactionStatus tx = transactionManager.getTransaction(def);
+        try
+        {
+            product.setEffectiveDate(forcedEff);
+            if (importPsvId != null)
+            {
+                product.setPsvId(importPsvId);
+            }
+            int[] nums = importOneProductFromRows(product, countries, operName, forcedEff);
+            transactionManager.commit(tx);
+            return nums;
+        }
+        catch (Exception e)
+        {
+            try { transactionManager.rollback(tx); } catch (Exception ignore) { }
+            throw e;
+        }
+    }
+
+    /**
+     * Formal redline import when price sheets carry inline product-code / product-name columns.
+     * Identifies products from detail rows (not catalog sheet-name matching).
+     */
+    private String importRedlineExcelByInline(Workbook workbook, byte[] bytes, String filename,
+        String operName, String taskId, Date forcedEff) throws Exception
+    {
+        RedlineQuoteWorkbook parsed = readQuoteWorkbookByInlineProductCode(workbook);
+        List<BmsRedlineProduct> products = enrichInlineProductsFromCatalog(workbook, parsed.products);
+        if (products.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.product.import.noData"));
+        }
+        reportImportProgress(taskId, 20, "parsing excel");
+        assertImportProductsEffectiveNotBeforePrev(products, forcedEff);
+
+        Map<String, BmsRegion> regionByNameCn = loadRegionByNameCn();
+        if (regionByNameCn.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.product.import.regionEmpty"));
+        }
+        List<BmsRegion> euRegions = loadEuRegions(regionByNameCn);
+        Map<String, PrcZone> zoneByCountryAndCode = loadZoneByCountryAndCode();
+
+        Long importPsvId = forcedEff == null
+            ? catalogVersionSupport.ensureDraftVersion(PriceType.REDLINE, null, false).getPsvId()
+            : catalogVersionSupport.requirePsvId(PriceType.REDLINE, null, forcedEff);
+        priceExcelFileService.saveImportExcel(
+            PrcPriceExcelFile.TYPE_REDLINE, forcedEff, bytes, filename, operName, importPsvId);
+
+        int successNum = 0;
+        int skipNum = 0;
+        int countryNum = 0;
+        Set<String> unmatchedCountries = new HashSet<String>();
+        StringBuilder failureMsg = new StringBuilder();
+        int total = products.size();
+        int index = 0;
+        for (BmsRedlineProduct product : products)
+        {
+            index++;
+            if (product == null || StringUtils.isEmpty(product.getProductCode()))
+            {
+                continue;
+            }
+            String code = product.getProductCode().trim().toUpperCase(Locale.ROOT);
+            reportImportProductProgress(taskId, index, total, product.getProductCode());
+            List<BmsRedlineProductCountry> countries = parsed.byCode.get(code);
+            try
+            {
+                int[] nums = importOneProductInline(product, countries, operName, forcedEff, importPsvId);
+                successNum += nums[0];
+                skipNum += nums[1];
+                countryNum += nums[2];
+            }
+            catch (Exception e)
+            {
+                String tip = e.getMessage();
+                if (StringUtils.isEmpty(tip))
+                {
+                    tip = e.getClass().getSimpleName();
+                }
+                failureMsg.append("<br/>").append(product.getProductCode()).append("：").append(tip);
+            }
+        }
+        reportImportProgress(taskId, 95, "finishing");
+        if (failureMsg.length() > 0)
+        {
+            return MessageUtils.message("price.product.import.partialFail",
+                Integer.valueOf(successNum), Integer.valueOf(skipNum), failureMsg.toString());
+        }
+        String msg = MessageUtils.message("price.product.import.success", successNum, skipNum, countryNum)
+            + "<br/>" + MessageUtils.message("price.product.import.success.detail1")
+            + "<br/>" + MessageUtils.message("price.product.import.success.detail2");
+        if (!unmatchedCountries.isEmpty())
+        {
+            msg += "<br/>" + MessageUtils.message("price.product.import.success.unmatched",
+                String.join("、", unmatchedCountries));
+        }
+        return msg;
+    }
+
+    /** Prefer catalog metadata when code matches; keep detail product name for variants. */
+    private List<BmsRedlineProduct> enrichInlineProductsFromCatalog(Workbook workbook, List<BmsRedlineProduct> inlineProducts)
+    {
+        Map<String, BmsRedlineProduct> catalogByCode = new HashMap<String, BmsRedlineProduct>();
+        Sheet catalog = workbook == null ? null : workbook.getSheet(CATALOG_SHEET);
+        if (catalog != null)
+        {
+            try
+            {
+                for (BmsRedlineProduct p : dedupeCatalogProducts(parseCatalog(catalog)))
+                {
+                    if (p == null || StringUtils.isEmpty(p.getProductCode()))
+                    {
+                        continue;
+                    }
+                    catalogByCode.put(p.getProductCode().trim().toUpperCase(Locale.ROOT), p);
+                }
+            }
+            catch (Exception ignored)
+            {
+                // Catalog optional for inline import.
+            }
+        }
+        List<BmsRedlineProduct> out = new ArrayList<BmsRedlineProduct>();
+        if (inlineProducts == null)
+        {
+            return out;
+        }
+        for (BmsRedlineProduct inline : inlineProducts)
+        {
+            if (inline == null || StringUtils.isEmpty(inline.getProductCode()))
+            {
+                continue;
+            }
+            String code = inline.getProductCode().trim().toUpperCase(Locale.ROOT);
+            BmsRedlineProduct cat = catalogByCode.get(code);
+            if (cat == null)
+            {
+                out.add(inline);
+                continue;
+            }
+            BmsRedlineProduct merged = new BmsRedlineProduct();
+            merged.setProductCode(inline.getProductCode());
+            merged.setProductName(StringUtils.isNotEmpty(inline.getProductName())
+                ? inline.getProductName() : cat.getProductName());
+            merged.setServiceLevel(cat.getServiceLevel());
+            merged.setCargoAttr(cat.getCargoAttr());
+            merged.setDestRegion(cat.getDestRegion());
+            merged.setUpdateNote(cat.getUpdateNote());
+            merged.setEffectiveDate(cat.getEffectiveDate());
+            merged.setTaxMode(StringUtils.isNotEmpty(cat.getTaxMode())
+                ? cat.getTaxMode() : resolveTaxMode(merged.getProductName()));
+            out.add(merged);
+        }
+        return out;
+    }
+
+    /**
+     * True when any multi-country price sheet has an inline product-code or product-name column
+     * (产品代码 / 产品对接代码 / 产品名称).
+     */
+    private boolean workbookHasInlineProductColumns(Workbook workbook)
+    {
+        if (workbook == null)
+        {
+            return false;
+        }
+        for (int i = 0; i < workbook.getNumberOfSheets(); i++)
+        {
+            String sheetName = workbook.getSheetName(i);
+            if (shouldSkipCountryPriceSheet(sheetName))
+            {
+                continue;
+            }
+            Sheet sheet = workbook.getSheetAt(i);
+            if (sheet == null)
+            {
+                continue;
+            }
+            int[] countryHeader = findHeaderCell(sheet, "国家");
+            if (countryHeader == null)
+            {
+                continue;
+            }
+            Row head = sheet.getRow(countryHeader[0]);
+            if (head == null)
+            {
+                continue;
+            }
+            if (firstCol(head, "产品代码", "产品对接代码") >= 0
+                || findColByHeader(head, "产品名称", 0) >= 0)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Multi-country parse keyed by inline product-code column on price sheets.
+     * Does not use 产品目录 sheet matching.
+     */
+    private RedlineQuoteWorkbook readQuoteWorkbookByInlineProductCode(Workbook workbook) throws Exception
+    {
+        Map<String, String> catalogCodeByName = buildCatalogCodeByName(workbook);
+        Map<String, BmsRegion> regionByNameCn = loadRegionByNameCn();
+        List<BmsRegion> euRegions = loadEuRegions(regionByNameCn);
+        Map<String, PrcZone> zoneByCountryAndCode = loadZoneByCountryAndCode();
+        Set<String> unmatchedCountries = new HashSet<String>();
+        Map<String, List<BmsRedlineProductCountry>> out = new LinkedHashMap<String, List<BmsRedlineProductCountry>>();
+        Map<String, BmsRedlineProduct> productMeta = new LinkedHashMap<String, BmsRedlineProduct>();
+        List<String> tips = new ArrayList<String>();
+
+        for (int i = 0; i < workbook.getNumberOfSheets(); i++)
+        {
+            String sheetName = workbook.getSheetName(i);
+            if (shouldSkipCountryPriceSheet(sheetName))
+            {
+                continue;
+            }
+            Sheet sheet = workbook.getSheetAt(i);
+            if (sheet == null || findHeaderCell(sheet, "国家") == null)
+            {
+                continue;
+            }
+            Map<String, List<BmsRedlineProductCountry>> sheetByCode = parseProductSheetByInlineCode(
+                sheet, catalogCodeByName, regionByNameCn, euRegions, zoneByCountryAndCode, unmatchedCountries);
+            if (sheetByCode == null || sheetByCode.isEmpty())
+            {
+                continue;
+            }
+            for (Map.Entry<String, List<BmsRedlineProductCountry>> e : sheetByCode.entrySet())
+            {
+                if (e == null || StringUtils.isEmpty(e.getKey()) || e.getValue() == null || e.getValue().isEmpty())
+                {
+                    continue;
+                }
+                String code = e.getKey();
+                List<BmsRedlineProductCountry> rows = e.getValue();
+                List<BmsRedlineProductCountry> existing = out.get(code);
+                if (existing == null)
+                {
+                    out.put(code, new ArrayList<BmsRedlineProductCountry>(rows));
+                }
+                else
+                {
+                    existing.addAll(rows);
+                }
+                if (!productMeta.containsKey(code))
+                {
+                    BmsRedlineProduct p = new BmsRedlineProduct();
+                    p.setProductCode(code);
+                    String name = null;
+                    for (BmsRedlineProductCountry r : rows)
+                    {
+                        if (r != null && StringUtils.isNotEmpty(r.getProductName()))
+                        {
+                            name = r.getProductName();
+                            break;
+                        }
+                    }
+                    p.setProductName(StringUtils.isNotEmpty(name) ? name : code);
+                    p.setTaxMode(resolveTaxMode(p.getProductName()));
+                    productMeta.put(code, p);
+                }
+            }
+        }
+
+        for (Map.Entry<String, List<BmsRedlineProductCountry>> e : out.entrySet())
+        {
+            BmsRedlineProduct p = productMeta.get(e.getKey());
+            String tip = buildDuplicateCountryWeightTip(p, e.getValue());
+            if (StringUtils.isNotEmpty(tip))
+            {
+                tips.add(tip);
+            }
+        }
+        if (!tips.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.product.import.dupCountry",
+                String.join("<br/>", tips)));
+        }
+        if (out.isEmpty())
+        {
+            throw new ServiceException(MessageUtils.message("price.set.import.noPriceRows"));
+        }
+        RedlineQuoteWorkbook parsed = new RedlineQuoteWorkbook();
+        parsed.products = new ArrayList<BmsRedlineProduct>(productMeta.values());
+        parsed.byCode = out;
+        return parsed;
+    }
+
+    /**
+     * Parse one multi-country price sheet grouped by inline product code / product name.
+     * Prefer product-code column; if only product-name exists, resolve code via catalog name map.
+     * Country / product-code / product-name / size / last-mile / lead-time carry forward
+     * when subsequent weight-band rows leave those cells blank.
+     */
+    private Map<String, List<BmsRedlineProductCountry>> parseProductSheetByInlineCode(Sheet sheet,
+        Map<String, String> catalogCodeByName, Map<String, BmsRegion> regionByNameCn,
+        List<BmsRegion> euRegions, Map<String, PrcZone> zoneByCountryAndCode,
+        Set<String> unmatchedCountries)
+    {
+        Map<String, List<BmsRedlineProductCountry>> out = new LinkedHashMap<String, List<BmsRedlineProductCountry>>();
+        if (sheet == null)
+        {
+            return out;
+        }
+        Date sheetEffective = parseSheetEffectiveDate(sheet);
+        int[] countryHeader = findHeaderCell(sheet, "国家");
+        if (countryHeader == null)
+        {
+            return out;
+        }
+        int headerRowIdx = countryHeader[0];
+        Row headerRow = sheet.getRow(headerRowIdx);
+        int colCountry = countryHeader[1];
+        int colProductCode = firstCol(headerRow, "产品代码", "产品对接代码");
+        int colProductName = findColByHeader(headerRow, "产品名称", 0);
+        if (colProductCode < 0 && colProductName < 0)
+        {
+            return out;
+        }
+        int colWeight = findColByHeader(headerRow, "重量", colCountry + 1);
+        int colFreight = findColByHeader(headerRow, "运费", colCountry + 1);
+        int colRegister = findColByHeader(headerRow, "挂号", colCountry + 1);
+        int colSize = findColByHeader(headerRow, "尺寸", colCountry + 1);
+        int colLastMile = findColByHeader(headerRow, "尾程", colCountry + 1);
+        int colLeadTime = findColByHeader(headerRow, "时效", colCountry + 1);
+        if (colWeight < 0 || colFreight < 0)
+        {
+            return out;
+        }
+
+        String currentCountryRaw = null;
+        String currentProductCode = null;
+        String currentProductName = null;
+        String currentSize = null;
+        String currentLastMile = null;
+        String currentLeadTime = null;
+        int lastRow = sheet.getLastRowNum();
+        for (int i = headerRowIdx + 1; i <= lastRow; i++)
+        {
+            Row row = sheet.getRow(i);
+            if (row == null)
+            {
+                continue;
+            }
+            String countryCell = cellString(row.getCell(colCountry));
+            String weightLabel = cellString(row.getCell(colWeight));
+            if ("国家".equals(countryCell)
+                || (weightLabel != null && weightLabel.contains("重量段")))
+            {
+                continue;
+            }
+            if (StringUtils.isNotEmpty(countryCell))
+            {
+                currentCountryRaw = countryCell;
+            }
+            boolean productChanged = false;
+            if (colProductCode >= 0)
+            {
+                String codeCell = normalizeImportProductCode(cellString(row.getCell(colProductCode)));
+                if (StringUtils.isNotEmpty(codeCell))
+                {
+                    String newCode = codeCell.trim().toUpperCase(Locale.ROOT);
+                    if (currentProductCode == null || !newCode.equals(currentProductCode))
+                    {
+                        productChanged = true;
+                        currentProductCode = newCode;
+                    }
+                }
+            }
+            if (colProductName >= 0)
+            {
+                String nameCell = cellString(row.getCell(colProductName));
+                if (StringUtils.isNotEmpty(nameCell) && !isSectionTitle(nameCell))
+                {
+                    String newName = nameCell.replace("\n", " ").replace("\r", " ").trim();
+                    if (currentProductName == null || !newName.equals(currentProductName))
+                    {
+                        productChanged = true;
+                        currentProductName = newName;
+                        // Name-only sheets: resolve product code from catalog by product name.
+                        if (colProductCode < 0)
+                        {
+                            String mapped = resolveCodeByProductName(currentProductName, catalogCodeByName);
+                            if (StringUtils.isNotEmpty(mapped))
+                            {
+                                currentProductCode = mapped;
+                            }
+                            else
+                            {
+                                currentProductCode = null;
+                            }
+                        }
+                    }
+                }
+            }
+            if (productChanged)
+            {
+                currentSize = null;
+                currentLastMile = null;
+                currentLeadTime = null;
+            }
+            if (colSize >= 0 && StringUtils.isNotEmpty(cellString(row.getCell(colSize))))
+            {
+                currentSize = emptyToNull(cellString(row.getCell(colSize)));
+            }
+            if (colLastMile >= 0 && StringUtils.isNotEmpty(cellString(row.getCell(colLastMile))))
+            {
+                currentLastMile = emptyToNull(cellString(row.getCell(colLastMile)));
+            }
+            if (colLeadTime >= 0 && StringUtils.isNotEmpty(cellString(row.getCell(colLeadTime))))
+            {
+                currentLeadTime = emptyToNull(cellString(row.getCell(colLeadTime)));
+            }
+            if (StringUtils.isEmpty(currentCountryRaw) || StringUtils.isEmpty(currentProductCode))
+            {
+                continue;
+            }
+            BigDecimal[] range = parseWeightRange(weightLabel);
+            if (range == null)
+            {
+                continue;
+            }
+            BigDecimal freight = cellDecimal(row.getCell(colFreight));
+            BigDecimal registration = colRegister >= 0 ? cellDecimal(row.getCell(colRegister)) : null;
+            Date eff = sheetEffective;
+
+            ZoneCodeAbbrevs.CountryZoneParts parts = ZoneCodeAbbrevs.splitCountryZone(currentCountryRaw);
+            if (parts == null || StringUtils.isEmpty(parts.countryName))
+            {
+                continue;
+            }
+            String baseCountry = parts.countryName;
+            String zoneLabel = parts.zoneLabel;
+            List<BmsRedlineProductCountry> bucket = out.get(currentProductCode);
+            if (bucket == null)
+            {
+                bucket = new ArrayList<BmsRedlineProductCountry>();
+                out.put(currentProductCode, bucket);
+            }
+
+            BmsRegion region = resolveRegion(baseCountry, regionByNameCn);
+            if (region != null)
+            {
+                BmsRedlineProductCountry c = buildCountryRow(region.getCountryNameCn(), region.getCountryCode2(),
+                    zoneLabel, zoneByCountryAndCode,
+                    range, freight, registration, currentSize, currentLastMile, currentLeadTime, eff);
+                c.setProductCode(currentProductCode);
+                c.setProductName(currentProductName);
+                bucket.add(c);
+                continue;
+            }
+            if (isEuZoneName(baseCountry) && StringUtils.isEmpty(zoneLabel))
+            {
+                if (euRegions == null || euRegions.isEmpty())
+                {
+                    throw new ServiceException(MessageUtils.message("price.product.import.euEmpty"));
+                }
+                for (BmsRegion eu : euRegions)
+                {
+                    BmsRedlineProductCountry c = buildCountryRow(eu.getCountryNameCn(), eu.getCountryCode2(),
+                        null, zoneByCountryAndCode,
+                        range, freight, registration, currentSize, currentLastMile, currentLeadTime, eff);
+                    c.setProductCode(currentProductCode);
+                    c.setProductName(currentProductName);
+                    bucket.add(c);
+                }
+                continue;
+            }
+            unmatchedCountries.add(currentCountryRaw.trim().replace("\n", " ").replace("\r", " "));
+            BmsRedlineProductCountry c = buildCountryRow(baseCountry, null, zoneLabel, zoneByCountryAndCode,
+                range, freight, registration, currentSize, currentLastMile, currentLeadTime, eff);
+            c.setProductCode(currentProductCode);
+            c.setProductName(currentProductName);
+            bucket.add(c);
+        }
+        return out;
+    }
+
+    /** Build productName -> productCode from 产品目录 (first row per name wins). */
+    private Map<String, String> buildCatalogCodeByName(Workbook workbook)
+    {
+        Map<String, String> map = new LinkedHashMap<String, String>();
+        if (workbook == null)
+        {
+            return map;
+        }
+        Sheet catalog = workbook.getSheet(CATALOG_SHEET);
+        if (catalog == null)
+        {
+            return map;
+        }
+        try
+        {
+            List<BmsRedlineProduct> products = dedupeCatalogProducts(parseCatalog(catalog));
+            for (BmsRedlineProduct p : products)
+            {
+                if (p == null || StringUtils.isEmpty(p.getProductCode()) || StringUtils.isEmpty(p.getProductName()))
+                {
+                    continue;
+                }
+                String nameKey = compactName(p.getProductName());
+                if (StringUtils.isEmpty(nameKey) || map.containsKey(nameKey))
+                {
+                    continue;
+                }
+                map.put(nameKey, p.getProductCode().trim().toUpperCase(Locale.ROOT));
+            }
+        }
+        catch (Exception ignored)
+        {
+            // Catalog optional for inline identity; ignore parse errors.
+        }
+        return map;
+    }
+
+    /** Resolve product code by product name; exact compact match, then base name before '(' / '（'. */
+    private String resolveCodeByProductName(String productName, Map<String, String> catalogCodeByName)
+    {
+        if (StringUtils.isEmpty(productName) || catalogCodeByName == null || catalogCodeByName.isEmpty())
+        {
+            return null;
+        }
+        String key = compactName(productName);
+        String hit = catalogCodeByName.get(key);
+        if (StringUtils.isNotEmpty(hit))
+        {
+            return hit;
+        }
+        String base = productName.trim();
+        int idx = base.indexOf('(');
+        int idx2 = base.indexOf('（');
+        int cut = -1;
+        if (idx >= 0)
+        {
+            cut = idx;
+        }
+        if (idx2 >= 0 && (cut < 0 || idx2 < cut))
+        {
+            cut = idx2;
+        }
+        if (cut > 0)
+        {
+            hit = catalogCodeByName.get(compactName(base.substring(0, cut)));
+            if (StringUtils.isNotEmpty(hit))
+            {
+                return hit;
+            }
+        }
+        return null;
+    }
+
+
     private static boolean shouldSkipCountryPriceSheet(String name)
     {
         if (StringUtils.isEmpty(name))
diff --git a/bms-front/src/views/price/set/components/create/PriceEditDrawer.vue b/bms-front/src/views/price/set/components/create/PriceEditDrawer.vue
index e672ef23..de59eb2e 100644
--- a/bms-front/src/views/price/set/components/create/PriceEditDrawer.vue
+++ b/bms-front/src/views/price/set/components/create/PriceEditDrawer.vue
@@ -118,7 +118,20 @@ const colSurcharge = '附加费'
 const colAction = '操作'
 
 function cellKey(row, field) {
-  return String(row && row.psdId != null ? row.psdId : row && row.productCountryId) + ':' + field
+  if (!row) return 'none:' + field
+  // Prefer DB id; local Excel draft uses _localKey (psdId cleared in applyLocalDraft).
+  if (row.psdId != null && row.psdId !== '') return String(row.psdId) + ':' + field
+  if (row._localKey) return String(row._localKey) + ':' + field
+  const parts = [
+    row.productCode,
+    row.countryCode || row.countryName,
+    row.zoneCode || row.zoneName,
+    row.weightLabel,
+    row.weightMin,
+    row.weightMax,
+    row.productCountryId
+  ]
+  return parts.map(v => (v == null ? '' : String(v))).join('|') + ':' + field
 }
 
 function formatNum(v, precision) {
@@ -150,7 +163,8 @@ async function commitEdit(row, field) {
   editingKey.value = ''
   try {
     if (!row) return
-    if (!row.psdId) return
+    // Always emit: create/IMPORT_FRESH local draft has no psdId until finish;
+    // parent persist path decides DB write vs local-only.
     emit('row-change', row)
   } finally {
     committing.value = false
diff --git a/bms-front/src/views/price/set/components/create/StepDetails.vue b/bms-front/src/views/price/set/components/create/StepDetails.vue
index 10e2eb5f..897bfb71 100644
--- a/bms-front/src/views/price/set/components/create/StepDetails.vue
+++ b/bms-front/src/views/price/set/components/create/StepDetails.vue
@@ -890,7 +890,10 @@ async function onRowPriceChange(row) {
     proxy.$modal.msgSuccess('价格已更新（完成时统一落库）')
     return
   }
-  if (!row.psdId) return
+  if (!row.psdId) {
+    proxy.$modal.msgWarning('明细尚未落库，请先点「完成」保存后再改价')
+    return
+  }
   const prevFv = row._editPrevFv
   const prevReg = row._editPrevReg
   try {
@@ -899,6 +902,7 @@ async function onRowPriceChange(row) {
   } catch (e) {
     if (prevFv !== undefined) row.fvValue = prevFv
     if (prevReg !== undefined) row.fvRegistrationFee = prevReg
+    proxy.$modal.msgError((e && e.message) ? e.message : '价格更新失败')
   }
 }
 

From 3481cfd6345c0ae2565b957cef87e7de1e743412 Mon Sep 17 00:00:00 2001
From: caojia <1301869380@qq.com>
Date: Mon, 2 Nov 2026 16:45:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bms-front/src/assets/logo/logo-bak.png | Bin 0 -> 5663 bytes
 bms-front/src/assets/logo/logo.png     | Bin 5663 -> 5794 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bms-front/src/assets/logo/logo-bak.png

diff --git a/bms-front/src/assets/logo/logo-bak.png b/bms-front/src/assets/logo/logo-bak.png
new file mode 100644
index 0000000000000000000000000000000000000000..e26376026420542212ed58d90d0ed34f554fa4ae
GIT binary patch
literal 5663
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

literal 0
HcmV?d00001

diff --git a/bms-front/src/assets/logo/logo.png b/bms-front/src/assets/logo/logo.png
index e26376026420542212ed58d90d0ed34f554fa4ae..7f810efaa31c3c84ecd2dea2c1344b84aa410808 100644
GIT binary patch
literal 5794
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

literal 5663
zcmZ`*WmMD;u>DcGh#=ia^G8y;1Xgl^C8S$Amyqrd1eKPKB}75GVToN(=@g_xS|pcV
zYT@y|zH{E0Gjl)8mzg<pXYL0bEmh)2^p5}lAXbAY>E0vwe;xGTK9)Pb`Ew71o)8mn
z03f3HU&jG*@@N6zk*2evqK=M}hmVK1lZPjZnxZ0$r<aF=Gt3?U0_Nd*{>G^oYPn^M
z{S!ll*~7X_SR}y4UJ2?aHTg{X39ybPB?tGsd;iFgl8P)3V$l6|>JbF~eyxxj;rR07
zd($`rbIAkd#nPtGAoTwJ^~`n0R^HalXyDkB2r_c6l)s-{04d#fFQjLgle8h-1IP$m
zD#!{x3+dmXAC3e)0C0#G7!c-DD}RGi;{o6To>KxG<bA7mQEfV0MgU6+u);>ZMTC>A
z3-k-<_frD>v_P$1gWV$_4FF()Aqs3jIWe$zswPJO%$B7t(g3rc8OuOG0uGSPt;&H5
zZU?LkB6az2yM6$Lm0&gj{H|)82$N=ERon<90pOQtocsiA1w>>k@C^ejlDL54Q;HEh
z7ARif^NG%tve%yP5D*-oYbbprQ)5De5|RFk-v9V;WsP<12dqxPn&ug)1K|c+US=*k
z1!M~kI{Fv@=r6~=-%83SZ~fg^{p+v=L!b71zI8qHV3T7#TE6Xw$HfOowZ_o%uQxZR
z@jUx*YJEFh%glgzL%?bI(n4f`u+a3;ub|7gK*<~M)BGZx{ufM)kBEr&Ic<uN&)4JR
z?nG8SR^r0W@3XfHL5IMb9B_73S8){fjkUX9wQl0p5Wa$tJ7$ahw(ngyHu2f`nrNLl
zAJxYr;|~ZOHqE}kR^1dO)`9dj^6hZpBjyY&VX8kdP#L4$rPchfX$aO8c7TH$M`AqT
z2Y|y)_~Yq`QUFp%QQ<%g0Hk(aCV_czfRW5E>j2R4kJkKK8V$4;1OQ5fkvz38A3pw0
zS=mLB_noPuiw4*FffD#JN7oBdg$ElEjE{<FGhWi^cS+CUH`U_N7n0?yk~V%9k|f?*
zAvcfQ^`v=VMVtSFwj+iR|7Aaj!kSh3J(*47EZZoECOZ+I%^D*5DdG#u_It`#Y(4#6
zUvSG5Tv99`?8p3Glu`-i;H%_?eiq@6Hy=Axh0-GHU*S#S`hr`(G1GtSE%YAu5q)A2
zk@4AeoWAj?Y((?t(s7M{zCJ+c$3)wRaUl|i_&ICy_*iAD561Ldebly_#$tv^Vzx}i
z5`I(+UHR5%5C?8t1jQc6GMe-U>}_(gsxj19@f+tJdn0)p$cQj1TIk1rY^mS08##l>
zFS`S5r0bH6RVuj-Sf8@yb6WmKLh(8k!a*|dX+!G~D`&E>8j+eSWC6neMemE;1gUc#
zlxsKHZQ#!as6L{SB{QWZ`AM?&r|W^A8!eR5J@40`gr7Ndzoe0?i`mO>;(sj=R>&?a
ze>GB;KM5*-FI`}&=2qyZBd8Z!Mj`5(!#R>mtvK|Bzj*3bj<cgP#z}D7r;Tta>Zx+(
zugnS8e-F2}wxdq{9}~wANA*E$xanN!g6T?WTj&I{p(O;rGqd~kpU((0WIJX($?`BT
z<~ipHp-LGfPnS+NOb<)nD%UsgHjtkREGN>hFnCg7X&73fV$h(oUPd@cT`^V0WYAtF
zUOlSoubZSZ_Ud&p>NWQ5l`V07%sZ9B7)Y_cZA&j*0xNZ|u>Fy-!nBtm-Y%bOmZpta
z{pB9ikKmfYPcRs&r|4boQ0b830RQ`D1c#)zZskyFE>C@wb(DBCm>-W{p1*F|rOKfy
ztV&`&XdX3hv+uP}y}vt;_Vt8=;e7BjX*X$%FJYT_+pD&BZ416*J958mcLTQx&j!y(
zwwK0L&)iOn&uDhg)97(#iRYpq@nkxfkfiP5aI)<`*DPnm_+j+wH?kq8wv=wC;&HX&
z{}5aUv5xCv0W@+Bl^%>Xm7;&_7hPXi+c*m^eChtuvw?axlIEJ@&^F%q+h=&VpKq~p
zwsK%EQEDpBHQyRF*RgPu@b0T}UXOa5cwAq`d`8F+L55}qrZUS=&M?sM%y6bsZQ6X7
zZ`W<w2&Thel>0bWI(Mk~TUBmVw_mQ?GUXa&(zA(YXL|1QLVGuRkM?r*9_&k<Tc2~D
zyPc0Q4KtE6P0RSmgn0S*4*S78J9fXUivBF?F8jG{<jCMy<PAR&qbboy9wN{5%cRkB
zEB#pNUJx{tzDa-3HqrF^tT?wlcd=^DZE|T?wkNdWT2mmGVZh?2Ec)f?A;x&^&G0(B
zG`IA}N%EGUrJtpV<u&rDc0(Rl{`7OV{)KL{735H`m9(6!{nh9;o?NdSZb48%EUE;>
zwk(Tc51S6l4tsc$e=T!0giX5WTn#*?KGGtv!ugJ~iGz%!k8Hqm#bd_L#{c?Ij39xa
z{ej?PIVy$6gv2JyUa1~kG{+2=wjzs;d^zJ(gCIDSDZ|zCVJ_&?X|lwaG0-w;m`BMa
zbbGiN^nOJZ_8!6POqWe_8A|z#N4Q*I=T)Pg&l?{M-*n}M$+aUg@hGV*zEx(yrP<5R
zvC;*m3$xwJMMNOV5s?A07s^MO<USM}g!>;hx@Ws(KdgJ>ZozUy@-}kxGkk2THy1y*
z()`^X9m@BAVIpRd93uHHi#)Slelv<iK}V2Qd$ZJClZoOuI`^HnGU{`}=T~(t2=y1A
z{=yB@&n1^+LKUx^VzgC!dqoJfb$J6*=svZwpJ*B?P5-GJn|m|IFO`;;mRGDx?3~fa
zJM+ASyG7f9mp7GoBk-@=AVX^GAZCO8()(nA3ib{<Ufif#twTZ$75v5<U`A^efPf$&
zrjsJe4!1j(>_l&=Ly*a}I*8haSww)z(F$9qayvD9oF0w8fRKf5n_YnO;Y8?=(@=c|
zR%gvv*WlPCaPc@%H)`VRS4G~pMxyCuX#+#<)u*Pdwp7;Xb_Qsd%qcU&a2}fU*Oi`?
z->NTaRS<vIjI>@)g`5St&CmZ)ZyDU*h3tOWb+5#jbk?XNU0zQ8ia8{%VmM0JWO(hS
z{>P^%$mJ|?q;X_$1W(LbY~O6SxpLvSNWAzw2p(=RWQeV*XhF?!%};kO`3IknL@`mx
z{6VMfbu{q?7`Y;qL(kkN4&E*$(c3Vzb^Z-oLa6#{_v9x9e+_<ku8iJw@$rBy)^v8(
z6T0b&Cp?8ndv4}Nc+BVS=lC~yn(~nRc)9ugzvYsU;B}pUMWa6#e~v6?hqs)8b|Hbh
z6Vjc&mHfqSg|bCR^uPFGIFlulDyro!3@x;7>)R)mWRzbB=axOX+<2S1UTRmG57&~H
zoy=Yg#6WMdT`gW&ARQIQ^5toK4xlZsF#{)mwvsFkJ3LR>Fg6REEgDs_)v~H#p4e4L
zjhV-;J!WX%=tZ^9sphWCIQn<^l}p!@_sqqNfJH$d65YGU(BjUu#E9T*JG<~Z->30^
zbO2qn2ucd5xk1ficOG6n*$HpFt+VfPTe-06vKsqo@&rvn7@L2acK17WbwYJmb&6eu
zJs}Cs%*;Sck36;;O<gUmFQph83^Tk7-1V;5TE?zjYm6D+%pMY5#*KAW2bP_9p)1O2
zr2E+Wm^(%TWsgd3szw(=(Fk<gavzd8oBIZQt8+4bW!qQ!OB*A%6>@tch>1SA=A0-H
zxmTMkwh&!S00`m)fQTpnxV*c^Z2<6n4gfn=03e+O05l$-UiYZnt5K+$(o6k-`Muo0
zcym>FU%0_pH42@7ux-1Sz5P>)l9j9n94!%D$j3VkQNvGRvkoMVn+0?ce(da&q$%L8
zpoTp4=XU9KU+tUf5sKZM9OT9dxZlrxw3GT|WkWHiVoTU7q|w9h_<g!9PaDQ0e$AP1
z>}k2>RB2dWOBh;=T%k+Loz^cP7s&cQHe04Sf3?2Uc{|uFi_q7&Y2h>5E;_jAH4oWN
z*|)r?3&mKN5Ygr~KU_?_J@Y>L8p~TX>*3W?*;s7Ol0Gab+Fn#lovzHGgPdF6lSi)G
zL^yLVH+_Q=>wUEj-%sE@TUwrf1xP~1p7_iN_cAh+sDxHG1s_+;wKCzch<JO!bj7rv
zE9TjjKeNqcGl})nr>DeCAO&#o-@o}`asDR~{uPgu1&}n#Oa=LFsLvp3f`C>Vt~|jK
zy_%nl{Zg&~$MZF%AA1=UPk~<8^!g4H@3cdr`6qHkzF~rSpo=V%Q{$Dr?VYlliu04v
z%=&RRf@F2de7c>);typLsxv{6>P2a7CpLZDX$>arZUIc2<T9=}(K-qoZCg!=b>_Ku
zUlbW`031ZK?1SN6t<ctS!aJ!IlQ@;A^gfNV>^_0fyGvg`-+!y|wIj(a0BaG-bmnF!
z-?&Ny8zS6sLm&VVOE>O+ox*~U^9i^5Cev4Mr=}OVv(#jGI%h6)ozpvIw=QeWg5yL%
zxc;dSYTByPsn;~w8I3%nVM7fPj~q;T4;*eQE<D8(w_v?%*ILGKDBzl8K%-E98A1+5
zkIc7!%;#tP{<!c53HKfzt9nYPl&!>H((##3K+F+ELsa=<qy7xJe+Dj=I6XkFIeR)u
zlI+BUa;xdn=jN>X*VuO?{$UoJERCFv1zCRtLIenGy2;i*IhzdLb#!lN%sklL-`-+F
z?JxllW2nPY<eewin;#u(fbhUOzjpK;JuVLI8ynMds#DP#!Ku_c%*Q9wr+6Rj`W0AE
zVmzQoC+V<|%MR{NFZj%sX)xD{^B=2M**4vWrt+t8bN|+U8YPg<Q(4^3-2T%0#Hm4!
zOBgpGy5Wkd(9!CIsk3JVTE(3d#64@<Z4pHM_3{b-=Up|DqhALqva^$%j<wxF8o|l;
zh?g*WTzX*KS1Q~pj1L#9RK0kEZ_LnU<s~HZP2WZB$(PzLX+`X^n(yX=JR0P#!M}b7
zG^kPW;Nt@L$gsojJ~!QK1`n+SnopHHRxVSae1teGaf2B@#X+<B*bd!Pg-SEnps|!Z
z-~}@+ACMe?|0b-ML;7j2>*Y~!;oIPgyr6C68E{%9$}}MS`_bfXO`Ru~*8xi-vjX-H
zvjoT^#5dq8?}IJ&Wlp}ze&Elo>fpvkve9{Y{0o(4l0UkcbJe=OGP1WBh}U=wuzoO(
zCb3vXz{I}y=<YbQAn!&Xg*n|>8r136RhGZj7?Wab`-)4x%6(E35ET$*S>Gr{7Hy?1
zPvuKMN4}VU7FTXrm>eeq5bN>rBwlp`PgxV`{`=85$()C5uFqLw0HxJzMi4{*__${J
zMO_0Q;^bTGu%N6*_-eEle8n4*dr{LGd=cI^nYaDe)$!S|w^k}Q2j^)sa|wa)rOWr7
z=U@&U{>sTuswbr)?Sjc<y)i{tOAvkpK5ir!Air+}bu$=a`QQ78(O@&}2wjhVGEFk3
z7nl(~A?Zq<wn5q=7C?V4`I=q3nl}yIS*~tA&=$AZiV-vPXQ~#r(SC<L3xSn;1#y|1
zpSMXTQ79~*)>9{E5BTD&WCFGRb!kCS_jD{BTS9)Yijf$eoGejH$BRliS>kQVwr#VP
zPs^4Xc>MxrsW#M9V*lD85LOCp=F<?8J-00UjX^#H61y@ElSuoh4Tf)joqVWmY3|`1
zzHE?to7@Gpk`sq@4s#@)7@1z!JPU>^GKJpn>%Q;Y^>4==VlYTCO|4^&7;9(e5<Brh
z0c#Lt#Zz~&=<_YeyOpZlwF-TQ2LP<`Ss6BS`b$j2h9uBS*AW}vzZI>&vsb23+jj1)
z4F{o&?1`kXX!p1QbG-x^0H9^JkC(#5i6HC4TWS(z9%5Q}!C`+c<F?yCZNLpg@MTYc
z{U!Qh_SXen*LY{5hpM_$^==16^u8a%??>IJOr-(fMiVq%-|BreT|=+0PWgXb&y5S$
zG_jI1l%yt}bT4l#k^g0eq2yHHjK&w{?`d3k@CQ<O{vA@=Y+O0|B2Cb}t#|g9+@vL@
zK;KSL1!6S_I+K)^zy)-8Xh1d~0AB&1Hh8o}zy<Ztmrx>?v1K)MT<H`P@xFO6l_}_0
z+%tbrql&kwa8IfBa@yuPYZ2~LK218_n6jNF!;SIU8leJp0XbhaXU}_j!INvG%$$2s
zv&?P0^>#dYWTTR+A7RoqtH(&|aO_;V>9LbLXPn3YBbp>+MnYOoTceweya=B)lEz5H
zLp=NDAK0Im^8*inYho^qYR#Qdzn_6Db?UQTs4j<|%h}JQ5#<wY7<_DdXA#Tlzy8kH
z=`5<=ZvMWaK@JVJ3=T3LiQw-vJNx}8JG;%5-EurXO~JbbQ;FoV#*(Bg{c%DEd|Q>?
z5{Fs+B?@B0C()s2L3QFMo?LZZrBRzLX=X>-xfw1_^{nkMY^?6lVgoW|%aOd~y;V$f
zSC2PJkfFe5A(&8sdo{0Co%f9>o#kz*CRzHQ8F$tEB>cewUnj)^>+%O%(dyCa!bQiP
zd$9D}qa>x9CI;OPHw~G}AbY<}mG;j)*X33HunLBdiRVoznp0xEgd+S?KC>~mPK80W
zQ^fo<JZ0_vs@k%~&YIVzNGmP9zIN}gvH@RYNX}Ic#MhOc$J`;_tjtjm2kypF&2=d*
z%~doNW4KB)p5Op{)eas4E#&fv7d-ObZ3{C*k*#V}6v^NmVZ&$X&Ycuj))f@_aJc2w
z{PGt(0aPX21E)*oq{nB_n&CEfW(jGKLfrFNST^-)?WrT?D9CZ=IoBS$^=nx(?$TQv
z{1xc2U5k#^@^6L!56vF0yG}$-s~9y87LwXG=pu57Ejs9sNqr$?YCd9VI}`Kz;|1@v
zzCElMT0(8W2Y~DC1_993(n<lN?R6hhou2#?OPHqLZtSPbE3d{{>F{<7rqIFN9hCB?
zZ{1Q3@oG>#AA8vR@Mza{MS#=Uc_yV~`N<vQu_#Jdyh+9JU$~icb8Q~4Me$tIcZ#RM
zXz^0FC1;%kub5{nVDdUUfJ4PLxK!p)9$_HgG3{q!nK;@<Bo8Msa4!=rU0yK3@Ovh{
zE00gFa~8ROHiJgts{Sjkf-{b2d2LzK3Fe*se-^ABwi3Xv^xolOvhY^2bMf<vkJdAq
z?cZrjXuUr_YjZKqu|z99bv^yrewWenTAV20jhQK2W~06){KxLjC=s|z%9>UvJ{jza
zT|v*pR%1$2TRUMF0e`DV+%8O#ii1<x7<lZ3sTk6A!Nx4_jFlwBie(OE#e^A|HTq}-
zwnY*AHGNxa8cEUE1ZY{l<gc9v;UiKGxZ)h1{R@a^<lkhG=5XvHU60}Y1(R?ouf}0v
ziB@MxUU^%aa^RFkKfpd^xCcMd*=82>Jz8+U5lkts*sd)3SKz%c<KaE~z+K?EXX2%)
z;A!0I?3)5oNpvkS%27{MLRclHxNbdMvz(C%*Fa<-HEPCNz>(j|OkN$*b3z1o8lke_
zZzLZqleC$I#|o*|>1;QvIPMtF8WlW@z%EFY@*W$g1UVFe01tVC?CaWvKX+N~&SMFh
w3o}1aSIuJtnzw?rKNs-3{y)=#g);%#4FR;juZ0`#H8`NAtff?~VD<KY0Mv8t8UO$Q