From 03760a64b8230dbde332d0f750bd34d2234ffc0c Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 7 Nov 2025 09:21:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=94=B9=E4=BA=A7?=
=?UTF-8?q?=E5=93=81=E5=92=8C=E5=8E=9F=E6=96=99=E9=BB=98=E8=AE=A4=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7=E5=80=BC=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 将产品默认属性值从具体值改为null- 将原料默认属性值从具体值改为null
- 统一处理产品和原料的默认属性逻辑
---
.../com/klp/service/impl/WmsProductServiceImpl.java | 12 ++++++------
.../klp/service/impl/WmsRawMaterialServiceImpl.java | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
index 1c6a4b85..be191bf8 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
@@ -145,16 +145,16 @@ public class WmsProductServiceImpl implements IWmsProductService {
if ("产品".equals(type)) {
// 产品默认属性（根据截图）
defaultAttrs = Arrays.asList(
- new String[]{"规格", "0.6 * 1250"},
- new String[]{"材质", "SPCC"},
- new String[]{"表面处理", "涂油"}
+ new String[]{"规格", null},
+ new String[]{"材质", null},
+ new String[]{"表面处理", null}
);
} else {
// 原料默认属性（根据截图）
defaultAttrs = Arrays.asList(
- new String[]{"规格", "4 * 1265"},
- new String[]{"材质", "Q195L"},
- new String[]{"厂家", "天铁"}
+ new String[]{"规格", null},
+ new String[]{"材质", null},
+ new String[]{"厂家", null}
);
}
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
index b1ec0ac4..806d7a45 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
@@ -255,16 +255,16 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
if ("产品".equals(type)) {
// 产品默认属性（根据截图）
defaultAttrs = Arrays.asList(
- new String[]{"规格", "0.6 * 1250"},
- new String[]{"材质", "SPCC"},
- new String[]{"表面处理", "涂油"}
+ new String[]{"规格", null},
+ new String[]{"材质", null},
+ new String[]{"表面处理", null}
);
} else {
// 原料默认属性（根据截图）
defaultAttrs = Arrays.asList(
- new String[]{"规格", "4 * 1265"},
- new String[]{"材质", "Q195L"},
- new String[]{"厂家", "天铁"}
+ new String[]{"规格", null},
+ new String[]{"材质", null},
+ new String[]{"厂家", null}
);
}
From e26a80dd3d6edefdbfb342363d8305cbd171efd9 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Fri, 7 Nov 2025 14:33:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=89=8D=E5=90=8E?=
=?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/wms/coil/panels/CoilTraceResult.vue | 10 ++++++++++
klp-ui/src/views/wms/coil/panels/base.vue | 14 ++++++++++++++
.../service/impl/WmsMaterialCoilServiceImpl.java | 11 ++++++++++-
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue b/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue
index b5dfcb42..e54917ba 100644
--- a/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue
+++ b/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue
@@ -144,6 +144,16 @@
库区：{{ coil.warehouse.warehouseName }}
+
+
+ 来自母卷：{{ coil.parentCoilNos }}
+
+
+ 分为子卷：{{ coil.parentCoilNos }}
+
+
+ 合并自：{{ coil.parentCoilNos }}
+
{{ coil.createTime }}
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index cb93dd28..6e0442b7 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -115,6 +115,20 @@
+
+
+
+ 来自母卷：{{ scope.row.parentCoilNos }}
+
+
+ 分为子卷：{{ scope.row.parentCoilNos }}
+
+
+ 合并自：{{ scope.row.parentCoilNos }}
+
+ —
+
+
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 2c15faa1..987dd107 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
@@ -541,7 +541,13 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
generateRecordService.updateByBo(oldQrBo);
}
- // 2. 将原始钢卷标记为历史数据（已在上面完成）
+ // 2. 将原始钢卷标记为历史数据，并记录所有子卷号
+ // 在母卷的 parent_coil_nos 字段中记录所有子卷号（用逗号分隔）
+ String childCoilNos = String.join(",", allNewCoilNos);
+ LambdaUpdateWrapper motherUpdateWrapper = new LambdaUpdateWrapper<>();
+ motherUpdateWrapper.eq(WmsMaterialCoil::getCoilId, oldCoil.getCoilId())
+ .set(WmsMaterialCoil::getParentCoilNos, childCoilNos); // 记录子卷号
+ baseMapper.update(null, motherUpdateWrapper);
// 3. 为每个分卷后的子钢卷生成独立的二维码并插入数据库
for (WmsMaterialCoilBo newCoilBo : bo.getNewCoils()) {
@@ -562,6 +568,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
newCoil.setWarehouseId(oldCoil.getWarehouseId());
newCoil.setActualWarehouseId(oldCoil.getActualWarehouseId());
}
+
+ // 在子卷的 parent_coil_nos 字段中记录母卷号
+ newCoil.setParentCoilNos(oldCoil.getCurrentCoilNo());
// 为每个子钢卷生成独立二维码
Long newQrcodeId = generateQrcodeForSplit(oldCoil, newCoilBo, allNewCoilNos);