出库导入报错;

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/utils/RegexUtil.java

@@ -42,7 +42,7 @@ public class RegexUtil {
      */
     public static boolean isAccountLegal(String str) throws PatternSyntaxException {
         // 4-20位，大小写字母或数字
-        String regEx = "(^[A-Za-z0-9]{3,20}$)";
+        String regEx = "(^[A-Za-z0-9]{1,20}$)";
         Pattern p = Pattern.compile(regEx);
         Matcher m = p.matcher(str);
         return m.matches();
@@ -109,4 +109,4 @@ public class RegexUtil {
     }
 
 
-}
+}

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -111,14 +111,15 @@ public class ReservationStockOutOrderDomainService {
         }
         stockOutOrderService.insert(stockOutOrderDO);
         List<ReservationDeliveryDetailsLink> reservationDeliveryDetailsLinkList = stockOutOrderDO.getReservationDeliveryDetailsLinkList();
-        reservationDeliveryDetailsLinkList.forEach(reservationDeliveryDetailsLink -> {
-            reservationDeliveryDetailsLink.setOrderNumber(stockOutOrderDO.getOutOrderNumber());
-            reservationDeliveryDetailsLink.setOrderId(stockOutOrderDO.getOutOrderId());
-        });
-        if (!CollectionUtils.isEmpty(reservationDeliveryDetailsLinkList)) {
-            reservationDeliveryDetailsLinkService.saveBatch(reservationDeliveryDetailsLinkList);
+        if (reservationDeliveryDetailsLinkList != null && !reservationDeliveryDetailsLinkList.isEmpty()){
+            reservationDeliveryDetailsLinkList.forEach(reservationDeliveryDetailsLink -> {
+                reservationDeliveryDetailsLink.setOrderNumber(stockOutOrderDO.getOutOrderNumber());
+                reservationDeliveryDetailsLink.setOrderId(stockOutOrderDO.getOutOrderId());
+            });
+            if (!CollectionUtils.isEmpty(reservationDeliveryDetailsLinkList)) {
+                reservationDeliveryDetailsLinkService.saveBatch(reservationDeliveryDetailsLinkList);
+            }
         }
-
         return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
     }
 

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java

@@ -191,7 +191,7 @@ public class StockReceiptOrderPO extends StockInOrderBasePO {
     @Excel(name = "业务单号")
     private String businessOrderNo;
 
-    @ApiModelProperty("业务单号")
-    @Excel(name = "业务单号")
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
     private String batchNo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java

@@ -114,6 +114,8 @@ public class StockShelfOrder extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
-
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java

@@ -135,5 +135,8 @@ public class StockShelfOrderPO extends StockInOrderBasePO {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java

@@ -148,4 +148,7 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java

@@ -137,4 +137,7 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNo;
 }