From ee20678e47d7b5f39cf20a9dd9a0220eec54ca5a Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Mon, 19 May 2025 12:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=BA=93?= =?UTF-8?q?=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qihangerp/module/goods/domain/OGoods.java | 5 ++++- .../goods/domain/OGoodsInventoryBatch.java | 4 ++-- .../goods/service/impl/OGoodsServiceImpl.java | 2 +- module/pom.xml | 5 +++++ .../module/stock/domain/WmsStockInItem.java | 4 ++-- .../stock/request/StockInCreateItem.java | 4 ++-- .../service/impl/WmsStockInServiceImpl.java | 4 +++- vue/src/views/goods/index.vue | 20 +++++++++---------- 8 files changed, 29 insertions(+), 19 deletions(-) diff --git a/module/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java b/module/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java index 2396b970..634c97c0 100644 --- a/module/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java +++ b/module/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java @@ -4,6 +4,7 @@ package cn.qihangerp.module.goods.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -120,6 +121,7 @@ public class OGoods implements Serializable { /** * 预计采购价格 */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.##") private BigDecimal purPrice; /** @@ -130,6 +132,7 @@ public class OGoods implements Serializable { /** * 建议零售价 */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.##") private BigDecimal retailPrice; /** @@ -140,7 +143,7 @@ public class OGoods implements Serializable { /** * 供应商id */ - private Long supplierId; + private String supplierId; /** * 品牌id diff --git a/module/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java b/module/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java index c8d1e8a2..cab6b3b4 100644 --- a/module/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java +++ b/module/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java @@ -53,12 +53,12 @@ public class OGoodsInventoryBatch implements Serializable { /** * 规格id */ - private String skuId; + private Long skuId; /** * 商品id */ - private String goodsId; + private Long goodsId; /** * sku编码 diff --git a/module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java b/module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java index 499a8821..ad734820 100644 --- a/module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java +++ b/module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java @@ -123,7 +123,7 @@ public class OGoodsServiceImpl extends ServiceImpl goods.setWholePrice(bo.getWholePrice()); goods.setRetailPrice(bo.getRetailPrice()); goods.setUnitCost(bo.getUnitCost()); - goods.setSupplierId(bo.getSupplierId()); + goods.setSupplierId(bo.getSupplierId().toString()); goods.setBrandId(bo.getBrandId()); goods.setLinkUrl(bo.getLinkUrl()); goods.setLowQty(0); diff --git a/module/pom.xml b/module/pom.xml index 3dda7735..603dc048 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -39,6 +39,11 @@ commons-lang3 3.12.0 + + com.fasterxml.jackson.core + jackson-annotations + 2.16.1 + org.projectlombok lombok diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsStockInItem.java b/module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsStockInItem.java index 39f60292..9094265e 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsStockInItem.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsStockInItem.java @@ -45,7 +45,7 @@ public class WmsStockInItem implements Serializable { /** * 商品id */ - private String goodsId; + private Long goodsId; /** * 商品编码 @@ -65,7 +65,7 @@ public class WmsStockInItem implements Serializable { /** * 商品规格id */ - private String skuId; + private Long skuId; /** * 商品规格编码 diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateItem.java b/module/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateItem.java index 9584300d..23d492cb 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateItem.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateItem.java @@ -4,8 +4,8 @@ import lombok.Data; @Data public class StockInCreateItem { - private String skuId; - private String goodsId; + private Long skuId; + private Long goodsId; private Integer quantity; private String skuCode; private String goodsName; diff --git a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockInServiceImpl.java b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockInServiceImpl.java index 0dd93931..53c69d41 100644 --- a/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockInServiceImpl.java +++ b/module/stock/src/main/java/cn/qihangerp/module/stock/service/impl/WmsStockInServiceImpl.java @@ -73,7 +73,9 @@ public class WmsStockInServiceImpl extends ServiceImpl> goodsGroup = request.getItemList().stream().collect(Collectors.groupingBy(x -> x.getGoodsId())); + Map> goodsGroup = + request.getItemList().stream().collect + (Collectors.groupingBy(x -> x.getGoodsId())); Long total = request.getItemList().stream().mapToLong(StockInCreateItem::getQuantity).sum(); //添加主表信息 WmsStockIn insert = new WmsStockIn(); diff --git a/vue/src/views/goods/index.vue b/vue/src/views/goods/index.vue index 84e5d751..4aba567b 100644 --- a/vue/src/views/goods/index.vue +++ b/vue/src/views/goods/index.vue @@ -150,9 +150,9 @@ --> - - - + + +