From 48bdd6d0b6c13c99dfc8ec5801d70a056d9db315 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 04 三月 2025 10:43:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazmat_manage

---
 hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductEntryRecordServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductEntryRecordServiceImpl.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductEntryRecordServiceImpl.java
index ff9d8a7..17092ed 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductEntryRecordServiceImpl.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductEntryRecordServiceImpl.java
@@ -160,6 +160,7 @@
             //新增危化品变动记录
             HzProductWarehouseRecord warehouseRecord = new HzProductWarehouseRecord()
                     .setWarehouseId(entryRecord.getWarehouseId())
+                    .setCupboardId(entryRecord.getCupboardId())
                     .setBasicId(productBasic.getId())
                     .setNum(entryRecord.getNum())
                     .setCompanyId(currentUser.getCompanyId())
@@ -173,6 +174,7 @@
                 String lastCode= StringUtils.addZeroForNum(String.valueOf(i),4);
                 String code=String.format("%s%s",entryRecord.getCodePrex(),lastCode);
                 productList.add(new HzProduct().setWarehouseId(entryRecord.getWarehouseId())
+                                .setCupboardId(entryRecord.getCupboardId())
                         .setBasicId(entryRecord.getBasicId())
                         .setEntryId(entryRecord.getId())
                         .setRemaining(productBasic.getMetering())

--
Gitblit v1.9.2