From 7c07cbaffdde8bb7e2d2e0363a2e91f32961859b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 1 Sep 2024 17:58:09 +0800
Subject: [PATCH] md

---
 .../impl/EmisWarehouseInBatchServiceImpl.java    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
index bf5b615bc..45ccdf695 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -13,6 +13,7 @@ package com.xdadan.erp.emis.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
@@ -74,22 +75,29 @@ public class EmisWarehouseInBatchServiceImpl implements IEmisWarehouseInBatchSer
     @Transactional
     @Override
     public int insertEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch) throws EmisBizError {
-        // 进仓序列号
-        String serialNo= WaybillHelper.genWsInSerialNo();
 
-        emisWarehouseInBatch.setSerialNo(serialNo);
-        emisWarehouseInBatch.setEntryDate(new Date());
+        if(StringUtils.isEmpty(emisWarehouseInBatch.getInNo())){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"进仓货物列表不能为空");
+        }
 
         List<EmisWarehouseInDtl> cargoList=emisWarehouseInBatch.getCargoList();
         if(CollectionUtils.isEmpty(cargoList)){
             throw new EmisBizError(EmisBizErrorType.FAIL,"进仓货物列表不能为空");
         }
 
+
+        // 进仓序列号
+        String serialNo= WaybillHelper.genWsInSerialNo();
+
+        emisWarehouseInBatch.setSerialNo(serialNo);
+        emisWarehouseInBatch.setEntryDate(new Date());
+
         for(EmisWarehouseInDtl item:cargoList){
             item.setId(null);
             emisWarehouseInDtlMapper.insertEmisWarehouseInDtl(item);
         }
 
+        emisWarehouseInBatch.setId(null);
         emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch);
 
         return 1;