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);
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}
);
}