From 76a109ad36754c8031fd2ff24ade89d350c7f17d Mon Sep 17 00:00:00 2001 From: zhenggl Date: Fri, 15 Sep 2023 14:31:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8D=95=E4=BD=8D=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../production/ProductionCreateEAIService.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java index 1da6e96..2c4ddd8 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java @@ -11,10 +11,7 @@ import com.digiwin.athena.app.ptc.infra.service.ProductionDetailsService; import com.digiwin.athena.app.ptc.infra.service.ReceivablesDetailService; import com.digiwin.athena.opt.common.eai.EAIRequest; import com.digiwin.athena.opt.common.eai.service.AbsEAIService; -import com.digiwin.athena.opt.common.generator.SnowflakeWorker; -import com.digiwin.athena.opt.common.util.RedisUtil; import org.apache.commons.lang.time.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -34,8 +31,6 @@ public class ProductionCreateEAIService extends AbsEAIService { @Resource private ReceivablesDetailService receivablesDetailService; - @Autowired - private RedisUtil redisUtil; @Override @@ -68,8 +63,9 @@ public class ProductionCreateEAIService extends AbsEAIService { Random random = new Random(); //默认赋值 + Integer batchNo = 1; for (ProductionDetailsEntity productionDetailsEntity : productionDetailsEntities) { - int randomNumber = random.nextInt(2)+1; + int randomNumber = random.nextInt(3); productionDetailsEntity.setFactoryNo(this.list.get(randomNumber).getFactoryNo()); productionDetailsEntity.setFactoryName(this.list.get(randomNumber).getFactoryName()); productionDetailsEntity.setProductionManagementPerson(this.list.get(randomNumber).getProductionManagementPerson()); @@ -77,10 +73,11 @@ public class ProductionCreateEAIService extends AbsEAIService { productionDetailsEntity.setProduceBoss("23467345221"); productionDetailsEntity.setProductionStatus(TabStatusEnums.PENDING.getValue().toString()); productionDetailsEntity.setNature(String.valueOf(randomNumber)); - String batchNo = SnowflakeWorker.nextId().toString(); - productionDetailsEntity.setBatchNo("MMDD-"+batchNo); + productionDetailsEntity.setBatchNo("MMDD-000"+batchNo); + productionDetailsEntity.setUnit("pcs"); + batchNo = batchNo+1; //预计产量赋值 - if (CollectionUtils.isNotEmpty(list)) { + if (CollectionUtils.isNotEmpty(receivablesDetailEntities)) { for (ReceivablesDetailEntity receivablesDetailEntity : receivablesDetailEntities) { productionDetailsEntity.setExpectedQuantity(receivablesDetailEntity.getQuantity()); //取应收日期前后5天 @@ -90,11 +87,10 @@ public class ProductionCreateEAIService extends AbsEAIService { productionDetailsEntity.setSkuCode(receivablesDetailEntity.getSkuCode()); productionDetailsEntity.setSkuName(receivablesDetailEntity.getSkuName()); productionDetailsEntity.setSkuSpec(receivablesDetailEntity.getSkuSpec()); - productionDetailsEntity.setUnit("待定"); } } } - + productionDetailsService.saveBatch(productionDetailsEntities); return buildOK(); }