diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java index e72dde21f..614550056 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java @@ -21,6 +21,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import lombok.Data; @@ -108,5 +110,7 @@ public class EmisTmsSiteBatch extends BaseEntity private String startSiteName; private String nextSiteName; + private List batchDtlList; + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java index b7fb13cb4..457705c4c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java @@ -11,13 +11,18 @@ package com.xdadan.erp.emis.service.impl; import java.util.List; + +import com.xdadan.erp.emis.domain.EmisTmsSiteBatchDtl; +import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.domain.EmisTmsSiteBatch; import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchMapper; import com.xdadan.erp.emis.service.IEmisTmsSiteBatchService; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; -/** + /** * 一级网点TMS组批次Service业务层处理 * * @author linfso @@ -29,6 +34,9 @@ public class EmisTmsSiteBatchServiceImpl implements IEmisTmsSiteBatchService @Autowired private EmisTmsSiteBatchMapper emisTmsSiteBatchMapper; + @Autowired + private EmisTmsSiteBatchDtlMapper emisTmsSiteBatchDtlMapper; + /** * 查询一级网点TMS组批次 * @@ -59,10 +67,22 @@ public class EmisTmsSiteBatchServiceImpl implements IEmisTmsSiteBatchService * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ + @Transactional @Override public int insertEmisTmsSiteBatch(EmisTmsSiteBatch emisTmsSiteBatch) { - return emisTmsSiteBatchMapper.insertEmisTmsSiteBatch(emisTmsSiteBatch); + // 插入主批次数据 + emisTmsSiteBatchMapper.insertEmisTmsSiteBatch(emisTmsSiteBatch); + + // 插入明细数据 + if(!CollectionUtils.isEmpty(emisTmsSiteBatch.getBatchDtlList())){ + for (EmisTmsSiteBatchDtl itemDtl:emisTmsSiteBatch.getBatchDtlList()) { + itemDtl.setBatchNo(emisTmsSiteBatch.getBatchNo()); + emisTmsSiteBatchDtlMapper.insertEmisTmsSiteBatchDtl(itemDtl); + } + } + + return 1; } /**