From f5415f06bcf820e5ed9847e9ccd1abbfde138440 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 8 Aug 2025 17:47:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=99=BA=E6=85=A7=E8=B6=85=E5=B8=82):?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98pd=E5=AF=BC=E5=85=A5=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarket/service/impl/SmErpSpuServiceImpl.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 f767b62fc..6ab84d1e7 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
@@ -14,6 +14,7 @@ import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.common.sequence.sequence.Sequence;
 import com.bsd.pjcloud.supermarket.constant.InventoryTypeEnum;
 import com.bsd.pjcloud.supermarket.constant.OrderTypeEnum;
+import com.bsd.pjcloud.supermarket.controller.SmErpCommonController;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockByCodeReqDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO;
@@ -98,6 +99,9 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
 
     private final SmErpInventoryRecordsItemService smErpInventoryRecordsItemService;
 
+
+    private final SmErpCommonController smErpCommonController;
+
     @Autowired
     private Sequence sequence;
 
@@ -1796,9 +1800,9 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
         List<PDItemSaveDTO> pdItemList = new ArrayList<>();
         int successCount = 0;
         int total = dtos.size();
-
+//        R erpSpuPage = smErpCommonController.getErpSpuPage("7");
         // 定义基准日期：2024年8月7日
-        LocalDate baseDate = LocalDate.of(2024, 8, 7);
+        LocalDate baseDate = LocalDate.of(2025, 8, 7);
         LocalDate currentDate = LocalDate.now();
         
         // 查询从基准日期到当前日期的零售出库记录
@@ -1972,7 +1976,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
         if (!pdItemList.isEmpty()) {
             // 创建盘点主记录
             PDSaveDTO pdSaveDTO = new PDSaveDTO();
-            pdSaveDTO.setInventoryCode("PD" + System.currentTimeMillis());
+            pdSaveDTO.setInventoryCode(String.valueOf(smErpCommonController.getErpSpuPage("7").getData()));
             pdSaveDTO.setInventoryDate(LocalDate.now());
             pdSaveDTO.setInventoryType("7"); // KCPD 库存盘点
             pdSaveDTO.setHandlerUserId(SecurityUtils.getUser().getId());