diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index e899e165c..f7e22e97d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -865,4 +865,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS return emisSettleBillMapper.deleteEmisSettleBillById(id); } + public static void main(String[] args) { + + } + } 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 457705c4c..482d48abb 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 @@ -14,6 +14,7 @@ import java.util.List; import com.xdadan.erp.emis.domain.EmisTmsSiteBatchDtl; import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper; +import com.xdadan.erp.emis.service.EmisBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.domain.EmisTmsSiteBatch; @@ -29,7 +30,7 @@ import org.springframework.util.CollectionUtils; * @date 2024-03-01 08:54:56 */ @Service -public class EmisTmsSiteBatchServiceImpl implements IEmisTmsSiteBatchService +public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmisTmsSiteBatchService { @Autowired private EmisTmsSiteBatchMapper emisTmsSiteBatchMapper; @@ -71,9 +72,6 @@ public class EmisTmsSiteBatchServiceImpl implements IEmisTmsSiteBatchService @Override public int insertEmisTmsSiteBatch(EmisTmsSiteBatch emisTmsSiteBatch) { - // 插入主批次数据 - emisTmsSiteBatchMapper.insertEmisTmsSiteBatch(emisTmsSiteBatch); - // 插入明细数据 if(!CollectionUtils.isEmpty(emisTmsSiteBatch.getBatchDtlList())){ for (EmisTmsSiteBatchDtl itemDtl:emisTmsSiteBatch.getBatchDtlList()) { @@ -82,6 +80,9 @@ public class EmisTmsSiteBatchServiceImpl implements IEmisTmsSiteBatchService } } + // 插入主批次数据 + emisTmsSiteBatchMapper.insertEmisTmsSiteBatch(emisTmsSiteBatch); + return 1; } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml index 32c08eb8b..39a06d750 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml @@ -87,9 +87,9 @@ and remark like concat('%', #{remark}, '%') and tenant_id like concat('%', #{tenantId}, '%') and del_flag like concat('%', #{delFlag}, '%') - and create_by like concat('%', #{createBy}, '%') + and create_by=#{createBy} and create_time = #{createTime} - and update_by like concat('%', #{updateBy}, '%') + and update_by=#{updateBy} and update_time = #{updateTime} and create_site=#{createSite} and update_site=#{updateSite}