diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
index 67a3ec3f..ced22826 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
@@ -828,11 +828,14 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
             for (BackApplyDetails applyDetail : applyDetails) {
                 if (CollectionUtils.isNotEmpty(listL4)) {
                     for (TypeTreeNode typeTreeNode : listL4) {
-                        if (applyDetail.getTypeId().equals(typeTreeNode.getTypeId())) {
-                            if (applyDetail.getPreNum().compareTo(typeTreeNode.getNum()) > 0) {
-                                return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "退料数量不能大于在用数量");
+                        if(applyDetail.getTypeId()!=null){
+                            if (applyDetail.getTypeId().equals(typeTreeNode.getTypeId())) {
+                                if (applyDetail.getPreNum().compareTo(typeTreeNode.getNum()) > 0) {
+                                    return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "退料数量不能大于在用数量");
+                                }
                             }
                         }
+
                     }
                 }
             }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index 86f0daac..76f0980d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -1065,7 +1065,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         SELECT mm.ma_id        AS maId,
                mm.ma_code      AS maCode,
-               mm.ma_status    AS maStatus,AAAAAAAAAAAAAAAAAAAAA
+               mm.ma_status    AS maStatus,
                sd.dict_label    AS maStatusName,
                mt1.type_name   AS typeName,
                mm.type_id      AS typeId,