From b2f7f3d7152fd1e2a54c524726473e0c2a86a59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A3=AE=E5=A3=AE?= Date: Wed, 13 Sep 2023 14:13:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=B7=E8=B4=AD=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=A4=E7=A7=8D=E4=BB=BB=E5=8A=A1=E5=8D=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/infra/dto/PurchaseOrderDetailDTO.java | 13 +++++++++++++ .../infra/entity/PurchaseOrderDetailEntity.java | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/dto/PurchaseOrderDetailDTO.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/dto/PurchaseOrderDetailDTO.java index c0041f5..3cb3a72 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/dto/PurchaseOrderDetailDTO.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/dto/PurchaseOrderDetailDTO.java @@ -2,6 +2,7 @@ package com.digiwin.athena.app.infra.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -124,6 +125,18 @@ public class PurchaseOrderDetailDTO { @JsonProperty(value = "tab_status") private String tabStatus; + /** + * 交期回复任务卡状态 + */ + @JsonProperty(value = "reply_tab_status") + private String replyTabStatus; + + /** + * 异常排除任务卡状态 + */ + @JsonProperty(value = "abnormal_tab_status") + private String abnormalTabStatus; + /** * 任务卡类型:1是采购任务,2是交期回复任务,3是异常排除任务 */ diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/PurchaseOrderDetailEntity.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/PurchaseOrderDetailEntity.java index 7ae4483..88b464d 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/PurchaseOrderDetailEntity.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/PurchaseOrderDetailEntity.java @@ -139,6 +139,20 @@ public class PurchaseOrderDetailEntity extends BaseMgrEntity Date: Wed, 13 Sep 2023 14:18:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:stringbuider=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BAstringbuffer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ptc/service/production/ProductionCreateEAIService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a1097de..8dbd85c 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 @@ -99,7 +99,7 @@ public class ProductionCreateEAIService extends AbsEAIService { } private String cteateBatchNo(){ - StringBuilder sb = new StringBuilder(); + StringBuffer sb = new StringBuffer(); Long batchNo; if (redisUtil.getRedisTemplate().hasKey(ProductionUtil.KEY)) { batchNo = redisUtil.incrBy(ProductionUtil.KEY, 1); From efb130a73fc912e37b4b201bd5fc023e7203e2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A3=AE=E5=A3=AE?= Date: Wed, 13 Sep 2023 14:18:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=B7=E8=B4=AD=E5=8D=95get=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../athena/app/service/purchase/PurchaseDemoGetService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/purchase/PurchaseDemoGetService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/purchase/PurchaseDemoGetService.java index aef6720..d79d3bd 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/purchase/PurchaseDemoGetService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/purchase/PurchaseDemoGetService.java @@ -57,6 +57,8 @@ public class PurchaseDemoGetService extends AbsEAIService { .eq(!StringUtils.isEmpty(purchaseOrderDetail.getPurchaseOrderNo()), PurchaseOrderDetailEntity::getPurchaseOrderNo, purchaseOrderDetail.getPurchaseOrderNo()) .eq(!StringUtils.isEmpty(purchaseOrderDetail.getPurchaseOrderSeq()), PurchaseOrderDetailEntity::getPurchaseOrderSeq, purchaseOrderDetail.getPurchaseOrderSeq()) .eq(!StringUtils.isEmpty(purchaseOrderDetail.getTabStatus()), PurchaseOrderDetailEntity::getTabStatus, purchaseOrderDetail.getTabStatus()) + .eq(!StringUtils.isEmpty(purchaseOrderDetail.getAbnormalTabStatus()), PurchaseOrderDetailEntity::getAbnormalTabStatus, purchaseOrderDetail.getAbnormalTabStatus()) + .eq(!StringUtils.isEmpty(purchaseOrderDetail.getReplyTabStatus()), PurchaseOrderDetailEntity::getReplyTabStatus, purchaseOrderDetail.getReplyTabStatus()) .eq(!StringUtils.isEmpty(purchaseOrderDetail.getTaskType()), PurchaseOrderDetailEntity::getTaskType, purchaseOrderDetail.getTaskType()) );