Merge branch 'sprint/S3' into release/S3

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());

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<CollectionDetailEntity> collectionDetailEntities = eaiRequest.getObject("get_data", new TypeReference<List<CollectionDetailEntity>>() {});
 
+        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<CollectionDetailEntity> 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) {

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);