Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

2026-01-08 10:03:05 +08:00
parent 5b2f7683fb f7d53a671d
commit 9b99699de8
1 changed files with 1 additions and 1 deletions
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -570,7 +570,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {

        // 3. 插入钢卷数据
        WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class);
-        if(bo.getDataType() == 10){
+        if(bo.getDataType() != null && bo.getDataType() == 10){
            add.setDataType(10);
        }else {
            add.setDataType(1); // 新增的钢卷默认为当前数据