From 457e468312c247ef078b2db7de336baf8cc398d5 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 17:15:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
index e82eee2..0fc83c9 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
@@ -108,14 +108,16 @@
         /* 璁板綍宸ュ崟涓庡噣闇�姹傜殑鍖归厤鍏崇郴*/
         ApsPlateStandardRequireBomOrderDetail bomOrderDetail = ApsPlateStandardRequireBomOrderDetail.builder()
                 .id(IdUtil.getSnowflakeNextId())
-                .requireId(require.getId().toString())
-                .requireTrackId(require.getRequireId())
+                .requireId(require.getId())
+                .requireTrackId(require.getRequireTrackId())
                 .bomLineId(require.getBomLineId())
                 .bomLineCode(require.getBomLineCode())
                 .docNo(platePlan.getDocumentNumber())
                 .beforeProdAmount(stock)
                 .deductionAmount(netRequirement)
-                .afterProdAmount(subtract).build();
+                .afterProdAmount(subtract)
+                .batchNumber(require.getBatchNumber())
+                .build();
         apsPlateStandardRequireBomOrderDetailMapper.insertApsPlateStandardRequireBomOrderDetail(bomOrderDetail);
     }
 }

--
Gitblit v1.9.3