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 940f7a686..94190aca1 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 @@ -10,11 +10,17 @@ package com.xdadan.erp.emis.service.impl; +import java.util.Date; import java.util.List; +import com.xdadan.erp.common.core.redis.RedissonService; +import com.xdadan.erp.common.utils.DateUtils; +import com.xdadan.erp.common.utils.SecurityUtils; +import com.xdadan.erp.emis.domain.EmisSite; import com.xdadan.erp.emis.domain.EmisTmsSiteBatchDtl; import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper; import com.xdadan.erp.emis.service.EmisBaseService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.domain.EmisTmsSiteBatch; @@ -38,6 +44,9 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi @Autowired private EmisTmsSiteBatchDtlMapper emisTmsSiteBatchDtlMapper; + @Autowired + RedissonService redissonService; + /** * 查询一级网点TMS组批次 * @@ -72,6 +81,25 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi @Override public int insertEmisTmsSiteBatch(EmisTmsSiteBatch emisTmsSiteBatch) { + // 产生批次号 + String yyMMdd = "yyMMdd"; + // 站点三字码 + String siteThreeCode="--"; + try{ + + EmisSite site=getSiteByCode(SecurityUtils.getLoginUser().getUser().getOwnerSiteCode()); + if(!StringUtils.isEmpty(site.getSizeCode3())) { + siteThreeCode = site.getSizeCode3(); + } + }catch (Exception ex){ + ex.printStackTrace(); + } + + String batchKey= "B"+siteThreeCode+ DateUtils.parseDateToStr(yyMMdd,new Date()); + Long lockNo = redissonService.addAndGetLong(batchKey,1L); + String batchNo =batchKey +StringUtils.leftPad(String.valueOf(lockNo),2,"0"); + emisTmsSiteBatch.setBatchNo(batchNo); + // 插入明细数据 if(!CollectionUtils.isEmpty(emisTmsSiteBatch.getBatchDtlList())){ for (EmisTmsSiteBatchDtl itemDtl:emisTmsSiteBatch.getBatchDtlList()) {