From 22895d351381f007849af47bff8f1297a4c79c36 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Tue, 28 Oct 2025 16:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86coilId=E7=9A=84=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=94=B9=E6=88=90string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 98c84e71..2f85baa7 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -177,7 +177,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             
             contentMap.put("enter_coil_no", bo.getEnterCoilNo()); // 入场钢卷号（唯一不变）
             contentMap.put("current_coil_no", currentCoilNo); // 当前钢卷号（可变）
-            contentMap.put("coil_id", null); // 钢卷ID（新增时暂时为null，插入后更新）
+            contentMap.put("coil_id", "null"); // 钢卷ID（新增时暂时为null，插入后更新）
             
             // 创建steps数组
             List<Map<String, Object>> steps = new ArrayList<>();
@@ -450,7 +450,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             Map<String, Object> contentMap = new HashMap<>();
             contentMap.put("enter_coil_no", oldCoil.getEnterCoilNo());
             contentMap.put("current_coil_no", newCoilBo.getCurrentCoilNo());
-            contentMap.put("coil_id", null); // 钢卷ID（分卷时暂时为null，插入后更新）
+            contentMap.put("coil_id", "null"); // 钢卷ID（分卷时暂时为null，插入后更新）
             
             // 复制原钢卷的历史steps
             List<Map<String, Object>> steps = new ArrayList<>();
@@ -474,7 +474,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             splitStep.put("action", "更新");
             splitStep.put("operation", "分卷");
             splitStep.put("old_current_coil_no", oldCoil.getCurrentCoilNo());
-            splitStep.put("old_coil_id", oldCoil.getCoilId());
+            splitStep.put("old_coil_id", String.valueOf(oldCoil.getCoilId()));
             splitStep.put("new_current_coil_nos", String.join(",", allNewCoilNos));
             splitStep.put("child_coils", allNewCoilNos);
             steps.add(splitStep);
@@ -518,7 +518,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             }
             contentMap.put("enter_coil_no", enterCoilNo);
             contentMap.put("current_coil_no", mergedCoilBo.getCurrentCoilNo());
-            contentMap.put("coil_id", null); // 钢卷ID（合卷时暂时为null，插入后更新）
+            contentMap.put("coil_id", "null"); // 钢卷ID（合卷时暂时为null，插入后更新）
             
             // 合并所有参与合卷的原始钢卷的历史steps
             List<Map<String, Object>> steps = new ArrayList<>();
@@ -604,7 +604,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             Map<String, Object> contentMap = objectMapper.readValue(record.getContent(), Map.class);
             
             // 更新coilId
-            contentMap.put("coil_id", coilId);
+            contentMap.put("coil_id", String.valueOf(coilId));
             
             // 更新二维码记录
             String newContentJson = objectMapper.writeValueAsString(contentMap);
@@ -648,7 +648,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             newStep.put("action", "更新");
             newStep.put("old_current_coil_no", oldCoil.getCurrentCoilNo()); // 原当前钢卷号
             newStep.put("new_current_coil_no", bo.getCurrentCoilNo()); // 新当前钢卷号
-            newStep.put("coil_id", bo.getCoilId()); // 钢卷ID
+            newStep.put("coil_id", String.valueOf(bo.getCoilId())); // 钢卷ID
             
             // 判断操作类型
             if (bo.getHasMergeSplit() != null && bo.getHasMergeSplit() == 2) {