From f03338513cb5667a1b1f7ad293f0418b66e9f991 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:04:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84wei=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wei/controller/WeiGoodsController.java | 6 ++- .../cn/qihangerp/model/bo/DouGoodsBo.java | 14 +++--- .../cn/qihangerp/model/bo/DouGoodsSkuBo.java | 4 +- .../cn/qihangerp/model/bo/WeiGoodsBo.java | 15 ++++++ .../cn/qihangerp/model/bo/WeiGoodsSkuBo.java | 17 +++++++ .../module/service/WeiGoodsService.java | 3 +- .../module/service/WeiGoodsSkuService.java | 3 +- .../service/impl/DouGoodsServiceImpl.java | 3 +- .../service/impl/DouGoodsSkuServiceImpl.java | 1 + .../service/impl/OGoodsServiceImpl.java | 1 + .../service/impl/WeiGoodsServiceImpl.java | 11 ++--- .../service/impl/WeiGoodsSkuServiceImpl.java | 13 +++-- vue/src/views/dou/goods/goods_sku.vue | 18 +++++-- vue/src/views/goods/goods/goods_sku.vue | 15 ++++-- vue/src/views/jd/goods/goods_list.vue | 5 +- vue/src/views/pdd/goods/goods_list.vue | 10 ++-- vue/src/views/pdd/goods/goods_sku.vue | 18 +++++-- vue/src/views/tao/goods/goods_list.vue | 5 +- vue/src/views/wei/goods/goods_list.vue | 48 +++++++++---------- vue/src/views/wei/goods/goods_sku.vue | 22 +++++++-- 20 files changed, 162 insertions(+), 70 deletions(-) create mode 100644 model/src/main/java/cn/qihangerp/model/bo/WeiGoodsBo.java create mode 100644 model/src/main/java/cn/qihangerp/model/bo/WeiGoodsSkuBo.java diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java index 4202325b..145a9785 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java @@ -2,6 +2,8 @@ package cn.qihangerp.oms.wei.controller; import cn.qihangerp.common.*; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.WeiGoodsBo; +import cn.qihangerp.model.bo.WeiGoodsSkuBo; import cn.qihangerp.module.service.OGoodsSkuService; import cn.qihangerp.model.entity.WeiGoods; import cn.qihangerp.model.entity.WeiGoodsSku; @@ -24,14 +26,14 @@ public class WeiGoodsController extends BaseController { private final OGoodsSkuService oGoodsSkuService; @RequestMapping(value = "/list", method = RequestMethod.GET) - public TableDataInfo list(WeiGoods bo, PageQuery pageQuery) { + public TableDataInfo list(WeiGoodsBo bo, PageQuery pageQuery) { PageResult result = goodsService.queryPageList(bo, pageQuery); return getDataTable(result); } @RequestMapping(value = "/skuList", method = RequestMethod.GET) - public TableDataInfo skuList(WeiGoodsSku bo, PageQuery pageQuery) { + public TableDataInfo skuList(WeiGoodsSkuBo bo, PageQuery pageQuery) { PageResult result = skuService.queryPageList(bo, pageQuery); return getDataTable(result); diff --git a/model/src/main/java/cn/qihangerp/model/bo/DouGoodsBo.java b/model/src/main/java/cn/qihangerp/model/bo/DouGoodsBo.java index 3a419b66..db2e1382 100644 --- a/model/src/main/java/cn/qihangerp/model/bo/DouGoodsBo.java +++ b/model/src/main/java/cn/qihangerp/model/bo/DouGoodsBo.java @@ -3,16 +3,14 @@ package cn.qihangerp.model.bo; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; @Data public class DouGoodsBo implements Serializable { - /** - * 商品数字id - */ - private Long productId; - private Long skuId; + + private String productId; + private String outerProductId; private String title; - private String code; - private Integer shopId; - private Integer hasLink;//是否关联 + private Long shopId; + } diff --git a/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java b/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java index 6ad1bbc6..0b593aeb 100644 --- a/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java +++ b/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java @@ -13,6 +13,6 @@ public class DouGoodsSkuBo implements Serializable { private Long id; private String title; private String code; - private Integer shopId; - private Integer hasLink;//是否关联 + private Long shopId; + private Long erpSkuId; } diff --git a/model/src/main/java/cn/qihangerp/model/bo/WeiGoodsBo.java b/model/src/main/java/cn/qihangerp/model/bo/WeiGoodsBo.java new file mode 100644 index 00000000..42fe9358 --- /dev/null +++ b/model/src/main/java/cn/qihangerp/model/bo/WeiGoodsBo.java @@ -0,0 +1,15 @@ +package cn.qihangerp.model.bo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class WeiGoodsBo implements Serializable { + + private String productId; + private String outProductId; + private String title; + private Long shopId; + private Integer status; +} diff --git a/model/src/main/java/cn/qihangerp/model/bo/WeiGoodsSkuBo.java b/model/src/main/java/cn/qihangerp/model/bo/WeiGoodsSkuBo.java new file mode 100644 index 00000000..727a5a50 --- /dev/null +++ b/model/src/main/java/cn/qihangerp/model/bo/WeiGoodsSkuBo.java @@ -0,0 +1,17 @@ +package cn.qihangerp.model.bo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class WeiGoodsSkuBo implements Serializable { + + private String productId; + private String skuId; + private String title; + private String skuCode; + private Long shopId; + private Long erpSkuId; + private Integer status; +} diff --git a/service/src/main/java/cn/qihangerp/module/service/WeiGoodsService.java b/service/src/main/java/cn/qihangerp/module/service/WeiGoodsService.java index 61afca9d..c9bfd506 100644 --- a/service/src/main/java/cn/qihangerp/module/service/WeiGoodsService.java +++ b/service/src/main/java/cn/qihangerp/module/service/WeiGoodsService.java @@ -3,6 +3,7 @@ package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; +import cn.qihangerp.model.bo.WeiGoodsBo; import cn.qihangerp.model.entity.WeiGoods; import com.baomidou.mybatisplus.extension.service.IService; @@ -12,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2025-05-20 16:31:43 */ public interface WeiGoodsService extends IService { - PageResult queryPageList(WeiGoods bo, PageQuery pageQuery); + PageResult queryPageList(WeiGoodsBo bo, PageQuery pageQuery); int saveAndUpdateGoods(Long shopId, WeiGoods goods); ResultVo pushToOms(Long taoGoodsId); } diff --git a/service/src/main/java/cn/qihangerp/module/service/WeiGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/WeiGoodsSkuService.java index 12e38bd8..9e328424 100644 --- a/service/src/main/java/cn/qihangerp/module/service/WeiGoodsSkuService.java +++ b/service/src/main/java/cn/qihangerp/module/service/WeiGoodsSkuService.java @@ -4,6 +4,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.WeiGoodsSkuBo; import cn.qihangerp.model.entity.WeiGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; @@ -13,6 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2025-05-20 16:30:57 */ public interface WeiGoodsSkuService extends IService { - PageResult queryPageList(WeiGoodsSku bo, PageQuery pageQuery); + PageResult queryPageList(WeiGoodsSkuBo bo, PageQuery pageQuery); ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo); } diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java index a35c3549..43ae4df7 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java @@ -48,7 +48,8 @@ public class DouGoodsServiceImpl extends ServiceImpl public PageResult queryPageList(DouGoodsBo bo, PageQuery pageQuery) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(bo.getShopId()!=null,DouGoods::getShopId,bo.getShopId()) - .eq(bo.getProductId()!=null,DouGoods::getProductId,bo.getProductId()) + .eq(org.springframework.util.StringUtils.hasText(bo.getProductId()),DouGoods::getProductId,bo.getProductId()) + .eq(org.springframework.util.StringUtils.hasText(bo.getOuterProductId()),DouGoods::getOuterProductId,bo.getOuterProductId()) ; Page goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java index 39e7b600..3834f097 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java @@ -50,6 +50,7 @@ public class DouGoodsSkuServiceImpl extends ServiceImpl goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsServiceImpl.java index cb8af5d3..a0c2a5af 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsServiceImpl.java @@ -50,6 +50,7 @@ public class OGoodsServiceImpl extends ServiceImpl public PageResult querySkuPageList(OGoodsSku bo, PageQuery pageQuery) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(bo.getStatus()!=null, OGoodsSku::getStatus,bo.getStatus()); + queryWrapper.eq(bo.getGoodsId()!=null, OGoodsSku::getGoodsId,bo.getGoodsId()); queryWrapper.eq(bo.getOuterErpSkuId()!=null,OGoodsSku::getOuterErpSkuId,bo.getOuterErpSkuId()); queryWrapper.eq(bo.getOuterErpGoodsId()!=null,OGoodsSku::getOuterErpGoodsId,bo.getOuterErpGoodsId()); queryWrapper.eq(StringUtils.hasText(bo.getSkuCode()),OGoodsSku::getSkuCode,bo.getSkuCode()); diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsServiceImpl.java index 91fc6ded..a852991f 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsServiceImpl.java @@ -5,14 +5,11 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.model.entity.OGoods; -import cn.qihangerp.model.entity.OGoodsInventory; -import cn.qihangerp.model.entity.OGoodsSku; +import cn.qihangerp.model.bo.WeiGoodsBo; +import cn.qihangerp.model.entity.*; import cn.qihangerp.mapper.OGoodsInventoryMapper; import cn.qihangerp.mapper.OGoodsMapper; import cn.qihangerp.mapper.OGoodsSkuMapper; -import cn.qihangerp.model.entity.WeiGoods; -import cn.qihangerp.model.entity.WeiGoodsSku; import cn.qihangerp.mapper.WeiGoodsMapper; import cn.qihangerp.mapper.WeiGoodsSkuMapper; import cn.qihangerp.module.service.WeiGoodsService; @@ -45,9 +42,11 @@ public class WeiGoodsServiceImpl extends ServiceImpl private final OGoodsInventoryMapper inventoryMapper; @Override - public PageResult queryPageList(WeiGoods bo, PageQuery pageQuery) { + public PageResult queryPageList(WeiGoodsBo bo, PageQuery pageQuery) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(bo.getShopId()!=null,WeiGoods::getShopId,bo.getShopId()) + .eq(org.springframework.util.StringUtils.hasText(bo.getProductId()), WeiGoods::getProductId,bo.getProductId()) + .eq(org.springframework.util.StringUtils.hasText(bo.getOutProductId()),WeiGoods::getOutProductId,bo.getOutProductId()) ; Page page = mapper.selectPage(pageQuery.build(), queryWrapper); diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsSkuServiceImpl.java index 9092829c..ab494575 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsSkuServiceImpl.java @@ -4,10 +4,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.model.entity.OGoods; -import cn.qihangerp.model.entity.OGoodsSku; -import cn.qihangerp.model.entity.WeiGoods; -import cn.qihangerp.model.entity.WeiGoodsSku; +import cn.qihangerp.model.bo.WeiGoodsSkuBo; +import cn.qihangerp.model.entity.*; import cn.qihangerp.mapper.WeiGoodsMapper; import cn.qihangerp.mapper.WeiGoodsSkuMapper; import cn.qihangerp.module.service.OGoodsService; @@ -20,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; import java.util.List; @@ -38,9 +37,13 @@ public class WeiGoodsSkuServiceImpl extends ServiceImpl queryPageList(WeiGoodsSku bo, PageQuery pageQuery) { + public PageResult queryPageList(WeiGoodsSkuBo bo, PageQuery pageQuery) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(bo.getShopId()!=null,WeiGoodsSku::getShopId,bo.getShopId()) + .eq(StringUtils.hasText(bo.getProductId()), WeiGoodsSku::getProductId,bo.getProductId()) + .eq(StringUtils.hasText(bo.getSkuId()), WeiGoodsSku::getSkuId,bo.getSkuId()) + .like(StringUtils.hasText(bo.getSkuCode()), WeiGoodsSku::getSkuCode,bo.getSkuCode()) + .eq(bo.getErpSkuId()!=null, WeiGoodsSku::getErpGoodsSkuId,bo.getErpSkuId()) ; Page page = mapper.selectPage(pageQuery.build(), queryWrapper); diff --git a/vue/src/views/dou/goods/goods_sku.vue b/vue/src/views/dou/goods/goods_sku.vue index a673efb8..e3062652 100644 --- a/vue/src/views/dou/goods/goods_sku.vue +++ b/vue/src/views/dou/goods/goods_sku.vue @@ -17,6 +17,14 @@ @keyup.enter.native="handleQuery" /> + + + { if (valid) { linkErpGoodsSkuId(this.form).then(response => { - this.$modal.msgSuccess("关联成功"); - this.open = false; - this.getList(); + if(response.code === 200) { + this.$modal.msgSuccess("关联成功"); + this.open = false; + this.getList(); + }else{ + this.$modal.msgError(response.msg) + } }); } }); diff --git a/vue/src/views/goods/goods/goods_sku.vue b/vue/src/views/goods/goods/goods_sku.vue index dfb15392..5bd13d78 100644 --- a/vue/src/views/goods/goods/goods_sku.vue +++ b/vue/src/views/goods/goods/goods_sku.vue @@ -2,10 +2,11 @@
- + + @@ -18,6 +19,14 @@ @keyup.enter.native="handleQuery" /> + + + diff --git a/vue/src/views/jd/goods/goods_list.vue b/vue/src/views/jd/goods/goods_list.vue index cf497ca9..301fe9fb 100644 --- a/vue/src/views/jd/goods/goods_list.vue +++ b/vue/src/views/jd/goods/goods_list.vue @@ -119,7 +119,7 @@ /> - + @@ -180,7 +180,7 @@ import {listGoods,getGoodsSku,linkErpGoodsSkuId,pullGoodsList,pushToOms} from "@ import {listShop} from "@/api/shop/shop"; import {MessageBox} from "element-ui"; import {isRelogin} from "@/utils/request"; -import {amountFormatter} from "@/utils/zhijian"; +import {amountFormatter, rowIndex} from "@/utils/zhijian"; export default { @@ -245,6 +245,7 @@ export default { // this.getList(); }, methods: { + rowIndex, amountFormatter, // 多选框选中数据 handleSelectionChange(selection) { diff --git a/vue/src/views/pdd/goods/goods_list.vue b/vue/src/views/pdd/goods/goods_list.vue index b7168187..6e2da5ef 100644 --- a/vue/src/views/pdd/goods/goods_list.vue +++ b/vue/src/views/pdd/goods/goods_list.vue @@ -325,9 +325,13 @@ export default { this.$refs["form"].validate(valid => { if (valid) { linkErpGoodsSkuId(this.form).then(response => { - this.$modal.msgSuccess("关联成功"); - this.open = false; - this.getList(); + if(response.code === 200) { + this.$modal.msgSuccess("关联成功"); + this.open = false; + this.getList(); + }else{ + this.$modal.msgError(response.msg) + } }); } }); diff --git a/vue/src/views/pdd/goods/goods_sku.vue b/vue/src/views/pdd/goods/goods_sku.vue index c6e52ea4..5c0b5d06 100644 --- a/vue/src/views/pdd/goods/goods_sku.vue +++ b/vue/src/views/pdd/goods/goods_sku.vue @@ -9,6 +9,14 @@ @keyup.enter.native="handleQuery" /> + + + { if (valid) { linkErpGoodsSkuId(this.form).then(response => { - this.$modal.msgSuccess("关联成功"); - this.open = false; - this.getList(); + if(response.code === 200) { + this.$modal.msgSuccess("关联成功"); + this.open = false; + this.getList(); + }else{ + this.$modal.msgError(response.msg) + } }); } }); diff --git a/vue/src/views/tao/goods/goods_list.vue b/vue/src/views/tao/goods/goods_list.vue index a310a094..cf6cc63c 100644 --- a/vue/src/views/tao/goods/goods_list.vue +++ b/vue/src/views/tao/goods/goods_list.vue @@ -111,7 +111,7 @@ /> - + @@ -179,7 +179,7 @@ import { listShop } from "@/api/shop/shop"; import { searchSku } from "@/api/goods/goods"; import {MessageBox} from "element-ui"; import {getGoodsSku, linkErpGoodsSkuId, listGoods, pullGoodsList,pushToOms} from "@/api/tao/goods"; -import {amountFormatter, parseTime} from "@/utils/zhijian"; +import {amountFormatter, parseTime, rowIndex} from "@/utils/zhijian"; export default { name: "GoodsListTao", @@ -247,6 +247,7 @@ export default { } }, methods: { + rowIndex, parseTime, amountFormatter, getSkuProper(proper){ diff --git a/vue/src/views/wei/goods/goods_list.vue b/vue/src/views/wei/goods/goods_list.vue index c7c7da99..3c668b12 100644 --- a/vue/src/views/wei/goods/goods_list.vue +++ b/vue/src/views/wei/goods/goods_list.vue @@ -1,30 +1,23 @@