From e2c8d290159effe3ea10015201abd2af4ade64ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com>
Date: Sun, 25 Jan 2026 10:19:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84jd=E5=BA=97=E9=93=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/qihangerp/model/bo/TaoGoodsBo.java     |  2 +-
 .../service/impl/TaoGoodsServiceImpl.java     |  6 ++-
 .../service/impl/TaoGoodsSkuServiceImpl.java  |  1 +
 vue/src/views/jd/goods/goods_list.vue         | 39 ++++++++-----------
 vue/src/views/jd/goods/sku_list.vue           |  8 ++++
 vue/src/views/tao/goods/goods_list.vue        | 13 ++-----
 6 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/model/src/main/java/cn/qihangerp/model/bo/TaoGoodsBo.java b/model/src/main/java/cn/qihangerp/model/bo/TaoGoodsBo.java
index e8b61ce3..f3322466 100644
--- a/model/src/main/java/cn/qihangerp/model/bo/TaoGoodsBo.java
+++ b/model/src/main/java/cn/qihangerp/model/bo/TaoGoodsBo.java
@@ -18,6 +18,6 @@ public class TaoGoodsBo implements Serializable {
      */
     private String title;
     private String outerId;
-    private Integer shopId;
+    private Long shopId;
     private Integer hasLink;//是否关联
 }
diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsServiceImpl.java
index 0263b128..d3495c9d 100644
--- a/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsServiceImpl.java
+++ b/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsServiceImpl.java
@@ -50,7 +50,11 @@ public class TaoGoodsServiceImpl extends ServiceImpl<TaoGoodsMapper, TaoGoods>
     @Override
     public PageResult<TaoGoods> queryPageList(TaoGoodsBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TaoGoods> queryWrapper = new LambdaQueryWrapper<TaoGoods>()
-                .eq(bo.getShopId()!=null,TaoGoods::getShopId,bo.getShopId());
+                .eq(bo.getShopId()!=null,TaoGoods::getShopId,bo.getShopId())
+                .eq(bo.getNumIid()!=null,TaoGoods::getNumIid,bo.getNumIid())
+                .eq(org.springframework.util.StringUtils.hasText(bo.getOuterId()),TaoGoods::getOuterId,bo.getOuterId())
+
+                ;
 
         Page<TaoGoods> taoGoodsPage = mapper.selectPage(pageQuery.build(), queryWrapper);
         if(taoGoodsPage.getRecords()!=null && taoGoodsPage.getRecords().size()>0){
diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsSkuServiceImpl.java
index b767abfb..5b33c264 100644
--- a/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsSkuServiceImpl.java
+++ b/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsSkuServiceImpl.java
@@ -40,6 +40,7 @@ public class TaoGoodsSkuServiceImpl extends ServiceImpl<TaoGoodsSkuMapper, TaoGo
                 .eq(bo.getNumIid()!=null,TaoGoodsSku::getNumIid,bo.getNumIid())
                 .eq(bo.getSkuId()!=null,TaoGoodsSku::getSkuId,bo.getSkuId())
                 .eq(StringUtils.hasText(bo.getOuterId()),TaoGoodsSku::getOuterId,bo.getOuterId())
+                .eq(bo.getErpGoodsSkuId()!=null,TaoGoodsSku::getErpGoodsSkuId,bo.getErpGoodsSkuId())
                 ;
         IPage<TaoGoodsSku> result = mapper.selectPage(pageQuery.build(), ew);
         return PageResult.build(result);
diff --git a/vue/src/views/jd/goods/goods_list.vue b/vue/src/views/jd/goods/goods_list.vue
index 301fe9fb..a70ca419 100644
--- a/vue/src/views/jd/goods/goods_list.vue
+++ b/vue/src/views/jd/goods/goods_list.vue
@@ -1,40 +1,33 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
-      <el-form-item label="平台SkuId" prop="skuId">
+      <el-form-item label="平台商品ID" prop="wareId">
         <el-input
-          v-model="queryParams.skuId"
-          placeholder="请输入平台SkuId"
+          v-model="queryParams.wareId"
+          placeholder="请输入平台商品ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="商家sku编码" prop="outerId">
+
+      <el-form-item label="商家商品编码" prop="itemNum">
         <el-input
-          v-model="queryParams.outerId"
-          placeholder="请输入商家sku编码"
+          v-model="queryParams.itemNum"
+          placeholder="请输入商家商品编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="ERP skuId" prop="erpSkuId">
-        <el-input
-          v-model="queryParams.erpSkuId"
-          placeholder="请输入ERP skuId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="店铺" prop="shopId">
+        <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
+         <el-option
+            v-for="item in shopList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-            <el-form-item label="店铺" prop="shopId">
-              <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
-               <el-option
-                  v-for="item in shopList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
diff --git a/vue/src/views/jd/goods/sku_list.vue b/vue/src/views/jd/goods/sku_list.vue
index 6b56409a..98bca779 100644
--- a/vue/src/views/jd/goods/sku_list.vue
+++ b/vue/src/views/jd/goods/sku_list.vue
@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="平台商品ID" prop="wareId">
+        <el-input
+          v-model="queryParams.wareId"
+          placeholder="请输入平台商品ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="商家sku编码" prop="outerId">
         <el-input
           v-model="queryParams.outerId"
diff --git a/vue/src/views/tao/goods/goods_list.vue b/vue/src/views/tao/goods/goods_list.vue
index cf6cc63c..30a38929 100644
--- a/vue/src/views/tao/goods/goods_list.vue
+++ b/vue/src/views/tao/goods/goods_list.vue
@@ -10,22 +10,15 @@
         />
       </el-form-item>
 
-      <el-form-item label="商家编码" prop="outerId">
+      <el-form-item label="商家商品编码" prop="outerId">
         <el-input
           v-model="queryParams.outerId"
-          placeholder="请输入商家编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="ERP商品ID" prop="erpGoodsId">
-        <el-input
-          v-model="queryParams.erpGoodsId"
-          placeholder="请输入ERP skuId"
+          placeholder="请输入商家商品编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="店铺" prop="shopId">
         <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
          <el-option