From 4ece18812eaa7246b5667e5ed3f8b7d6a14d39eb Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 5 Mar 2025 15:31:48 +0800
Subject: [PATCH 1/2] 1

---
 .../bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java
index 5e83ef1f4..8c03a1d2b 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSupplierSimpleVo.java
@@ -14,6 +14,9 @@ import lombok.Data;
 public class SmErpSupplierSimpleVo {
 
 
+    /**
+     * id
+     */
     @Schema(description="id")
     private Long supplierId;
 

From f923ad16eef559b3632d77827a90c51a556f7b00 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 5 Mar 2025 16:45:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java | 8 --------
 .../supermarket/service/impl/SmErpSpuServiceImpl.java     | 8 ++++++--
 .../src/main/resources/mapper/SmErpUnitMapper.xml         | 4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java
index f640475de..e168159d0 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java
@@ -40,29 +40,21 @@ public class SmErpSpuImportDto {
     private Integer packageNum; // 装数
 
     @ExcelProperty("进价")
-//    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-//    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
     private Integer purchasePrice; // 进价
 
     @ExcelProperty("零售价")
-//    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-//    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
     private Integer retailPrice; // 零售价
 
     @ExcelProperty("货商")
     private String supplier; // 货商
 
     @ExcelProperty("促销价")
-    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
     private Integer promotionPrice; // 促销价
 
     @ExcelProperty("商品性质")
     private String commodityNature; // 商品性质
 
     @ExcelProperty("成本单价")
-    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
     private Integer costPrice; // 成本单价
 
     @ExcelProperty("库存上限")
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
index 456ead2f8..f62c4bfdc 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
@@ -971,8 +971,10 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
                 SmErpSpuEntity existingSpu = existingSpuMap.get(productCode);
                 if (existingSpu != null) {
                     // 更新模式：设置原有主键
-                    spu.setId(existingSpu.getId());
-                    updateBatch.add(spu);
+//                    spu.setId(existingSpu.getId());
+//                    updateBatch.add(spu);
+                    errorReasons.add(existingSpu.getProductCode()+"-"+existingSpu.getProductName()+",该货号商品系统中已存在");
+                    errorList.add(createErrorInfo(rowNumber, productCode, errorReasons));
                 } else {
                     // 新增模式
                     insertBatch.add(spu);
@@ -1028,6 +1030,8 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
                 // 处理单位数据
                 SmErpUnitEntity unit = new SmErpUnitEntity();
                 org.springframework.beans.BeanUtils.copyProperties(dto, unit);
+                unit.setPurchasePrice(dto.getPurchasePrice()*100);
+                unit.setRetailPrice(dto.getRetailPrice()*100);
                 unit.setSpuId(spu.getId());
                 unit.setIsBase(true);
                 unitBatch.add(unit);
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml
index 6681b87e8..485516484 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml
@@ -59,8 +59,8 @@
                  u.retail_price,
                  u.promotion_price,
                  u.spu_id
-          FROM supermarket_unit u
-                     LEFT JOIN supermarket_spu s
+          FROM sm_erp_unit u
+                     LEFT JOIN sm_erp_spu s
                                on u.spu_id = s.id
           <where>
                 u.del_flag = '0'