Merge branch 'sprint/S3' into release/S3

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是异常排除任务
      */

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/PurchaseOrderDetailEntity.java

@@ -139,6 +139,20 @@ public class PurchaseOrderDetailEntity extends BaseMgrEntity<PurchaseOrderDetail
     @JsonProperty(value = "tab_status")
     private String tabStatus;
 
+    /**
+     * 交期回复任务卡状态
+     */
+    @SerializedName(value = "reply_tab_status")
+    @JsonProperty(value = "reply_tab_status")
+    private String replyTabStatus;
+
+    /**
+     * 异常排除任务卡状态
+     */
+    @SerializedName(value = "abnormal_tab_status")
+    @JsonProperty(value = "abnormal_tab_status")
+    private String abnormalTabStatus;
+
     /**
      * 任务卡类型:1是采购任务,2是交期回复任务,3是异常排除任务
      */

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

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