From b57ba4194ba3938143a6a24e18eaa70bc97e03cb Mon Sep 17 00:00:00 2001 From: zhenggl Date: Thu, 14 Sep 2023 19:29:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receivables/ReceivablesInitialCreateEAIService.java | 2 +- .../service/receivables/ReceivablesTaskGetEAIService.java | 6 +++++- doc/sql/app-20230912-ddl.sql | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java index 28653c0..819804b 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java @@ -133,7 +133,7 @@ public class ReceivablesInitialCreateEAIService extends AbsEAIService { receivablesDetailEntity.setSkuName(sku.getSkuName()); receivablesDetailEntity.setSkuSpec(sku.getSkuSpec()); receivablesDetailEntity.setReceivableNo("RE-"+DateUtils.currentTimeString()); - receivablesDetailEntity.setReceivableNo("SEQ-"+DateUtils.currentTimeString()); + receivablesDetailEntity.setReceivableNon("SEQ-"+DateUtils.currentTimeString()); receivablesDetailEntity.setStatus("1"); receivablesDetailEntity.setSalesOrder("SO-"+DateUtils.currentTimeString()); receivablesDetailEntity.setSalesOrderNumber("SON-"+DateUtils.currentTimeString()); diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesTaskGetEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesTaskGetEAIService.java index aa44389..7b923c9 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesTaskGetEAIService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesTaskGetEAIService.java @@ -40,6 +40,8 @@ public class ReceivablesTaskGetEAIService extends AbsEAIService { EAIRequest eaiRequest = EAIRequest.build(messageBody); List collectionDetailEntities = eaiRequest.getObject("get_data", new TypeReference>() {}); + String status = eaiRequest.getString("receivables_status"); + for (CollectionDetailEntity collectionDetailEntity : collectionDetailEntities) { if (StringUtils.isEmpty(collectionDetailEntity.getSalesOrder()) ||StringUtils.isEmpty(collectionDetailEntity.getSalesOrderNumber())){ @@ -47,8 +49,10 @@ public class ReceivablesTaskGetEAIService extends AbsEAIService { } } + + LambdaQueryWrapper lmq = new LambdaQueryWrapper<>(); - lmq.eq(CollectionDetailEntity::getStatus, TabStatusEnums.PENDING.getValue()); + lmq.eq(CollectionDetailEntity::getStatus, status); lmq.eq(CollectionDetailEntity::getTenantSid, SecurityUtil.getUserProfile().getTenantSid()); lmq.and(queryWrapperInner -> { for (CollectionDetailEntity collectionDetailEntity : collectionDetailEntities) { diff --git a/doc/sql/app-20230912-ddl.sql b/doc/sql/app-20230912-ddl.sql index 2c3332c..6fb5920 100644 --- a/doc/sql/app-20230912-ddl.sql +++ b/doc/sql/app-20230912-ddl.sql @@ -134,3 +134,4 @@ alter table cim_receivables_detail Add column email varchar(50) null default '' --修改规格字段长度 ALTER TABLE `cim_receivables_detail` MODIFY COLUMN `sku_spec` varchar (255); +ALTER TABLE `cim_collection_detail` MODIFY COLUMN `sku_spec` varchar (255);