Parcourir la source

出库类型为空 bug

lyhzzz il y a 2 ans
Parent
commit
2ea36eb879

+ 8 - 4
src/main/java/com/fdkankan/manage/constant/CameraOutTypeEnum.java

@@ -1,5 +1,7 @@
 package com.fdkankan.manage.constant;
 
+import org.apache.commons.lang3.StringUtils;
+
 public enum CameraOutTypeEnum {
     NORMAL_SALES(0,"正常销售"),
     STAFF_USE(1,"员工自用"),
@@ -40,10 +42,12 @@ public enum CameraOutTypeEnum {
         return null;
     }
     public static CameraOutTypeEnum getByMsg(String msg){
-        CameraOutTypeEnum[] values = CameraOutTypeEnum.values();
-        for (CameraOutTypeEnum value : values) {
-            if(value.msg.equalsIgnoreCase(msg)){
-                return value;
+        if(StringUtils.isNotBlank(msg)){
+            CameraOutTypeEnum[] values = CameraOutTypeEnum.values();
+            for (CameraOutTypeEnum value : values) {
+                if(value.msg.equalsIgnoreCase(msg)){
+                    return value;
+                }
             }
         }
         return null;

+ 4 - 2
src/main/java/com/fdkankan/manage/service/impl/ExcelServiceImpl.java

@@ -120,10 +120,12 @@ public class ExcelServiceImpl implements IExcelService {
                 if(outTypeEnum == null || StringUtils.isBlank(snCode)){
                     errorIndex.add(index -3);
                 }
-                int outType = outTypeEnum.getCode();
                 CameraInOutParam param = new CameraInOutParam();
+                if(outTypeEnum != null){
+                    int outType = outTypeEnum.getCode();
+                    param.setOutType(outType);
+                }
                 param.setCompanyName(companyName);
-                param.setOutType(outType);
                 param.setOrderSn(orderSn);
                 param.setSnCode(snCode);
                 params.add(param);