采购

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/impl/StockServiceImpl.java

@@ -24,7 +24,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -195,7 +199,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             stockJournal.setType(type);
             stockJournal.setDetailsType(typeEnum instanceof InTypeEnum ?
                     ((InTypeEnum) typeEnum).getKey() : ((OutTypeEnum) typeEnum).getKey());
-            stockJournal.setBusinessId(stockChangeVo.getBusinessId());
+            stockJournal.setBusinessId(ObjectUtil.defaultIfNull(changeDetails.getBusinessId(), stockChangeVo.getDefaultBusinessId()));
             stockJournal.setGoodsId(changeDetails.getGoodsId());
             stockJournal.setWarehouseId(changeDetails.getWarehouseId());
             stockJournal.setChangeQuantity(changeQuantity);