DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将coilId的存储模式改成string

Browse Source
This commit is contained in:
86156
2025-10-28 16:05:11 +08:00
parent 99bdfe94d6
commit 22895d3513
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -177,7 +177,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
contentMap.put("enter_coil_no", bo.getEnterCoilNo()); // 入场钢卷号（唯一不变） contentMap.put("enter_coil_no", bo.getEnterCoilNo()); // 入场钢卷号（唯一不变）
contentMap.put("current_coil_no", currentCoilNo); // 当前钢卷号（可变） contentMap.put("current_coil_no", currentCoilNo); // 当前钢卷号（可变）
contentMap.put("coil_id", null); // 钢卷ID（新增时暂时为null，插入后更新） contentMap.put("coil_id", "null"); // 钢卷ID（新增时暂时为null，插入后更新）
// 创建steps数组 // 创建steps数组
List<Map<String, Object>> steps = new ArrayList<>(); List<Map<String, Object>> steps = new ArrayList<>();
@@ -450,7 +450,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
Map<String, Object> contentMap = new HashMap<>(); Map<String, Object> contentMap = new HashMap<>();
contentMap.put("enter_coil_no", oldCoil.getEnterCoilNo()); contentMap.put("enter_coil_no", oldCoil.getEnterCoilNo());
contentMap.put("current_coil_no", newCoilBo.getCurrentCoilNo()); contentMap.put("current_coil_no", newCoilBo.getCurrentCoilNo());
contentMap.put("coil_id", null); // 钢卷ID（分卷时暂时为null，插入后更新） contentMap.put("coil_id", "null"); // 钢卷ID（分卷时暂时为null，插入后更新）
// 复制原钢卷的历史steps // 复制原钢卷的历史steps
List<Map<String, Object>> steps = new ArrayList<>(); List<Map<String, Object>> steps = new ArrayList<>();
@@ -474,7 +474,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
splitStep.put("action", "更新"); splitStep.put("action", "更新");
splitStep.put("operation", "分卷"); splitStep.put("operation", "分卷");
splitStep.put("old_current_coil_no", oldCoil.getCurrentCoilNo()); 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("new_current_coil_nos", String.join(",", allNewCoilNos));
splitStep.put("child_coils", allNewCoilNos); splitStep.put("child_coils", allNewCoilNos);
steps.add(splitStep); steps.add(splitStep);
@@ -518,7 +518,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
} }
contentMap.put("enter_coil_no", enterCoilNo); contentMap.put("enter_coil_no", enterCoilNo);
contentMap.put("current_coil_no", mergedCoilBo.getCurrentCoilNo()); contentMap.put("current_coil_no", mergedCoilBo.getCurrentCoilNo());
contentMap.put("coil_id", null); // 钢卷ID（合卷时暂时为null，插入后更新） contentMap.put("coil_id", "null"); // 钢卷ID（合卷时暂时为null，插入后更新）
// 合并所有参与合卷的原始钢卷的历史steps // 合并所有参与合卷的原始钢卷的历史steps
List<Map<String, Object>> steps = new ArrayList<>(); 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); Map<String, Object> contentMap = objectMapper.readValue(record.getContent(), Map.class);
// 更新coilId // 更新coilId
contentMap.put("coil_id", coilId); contentMap.put("coil_id", String.valueOf(coilId));
// 更新二维码记录 // 更新二维码记录
String newContentJson = objectMapper.writeValueAsString(contentMap); String newContentJson = objectMapper.writeValueAsString(contentMap);
@@ -648,7 +648,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
newStep.put("action", "更新"); newStep.put("action", "更新");
newStep.put("old_current_coil_no", oldCoil.getCurrentCoilNo()); // 原当前钢卷号 newStep.put("old_current_coil_no", oldCoil.getCurrentCoilNo()); // 原当前钢卷号
newStep.put("new_current_coil_no", bo.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) { if (bo.getHasMergeSplit() != null && bo.getHasMergeSplit() == 2) {