From fafd6afa2e43c9806e4d31bde089996a611bd8da Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Thu, 5 Sep 2024 18:20:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=9C=AA=E5=AF=B9=E7=85=A7?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/collect/IoCollectOrder.java  | 12 ++++++++++++
 .../api/service/collect/IoCollectOrderService.java   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
index 455020da2..6485691f2 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
@@ -66,6 +66,13 @@ public class IoCollectOrder implements Serializable {
     @ApiModelProperty(value = "往来信息")
     private String fromCorp;
 
+    /**
+     * 往来信息名称
+     */
+    @TableField(value = "fromCorpName")
+    @ApiModelProperty(value = "往来信息名称")
+    private String fromCorpName;
+
     /**
      * 单据时间
      */
@@ -221,6 +228,11 @@ public class IoCollectOrder implements Serializable {
     @TableField(exist = false)
     private List<IoCollectOrderBiz> bizList;
 
+    /**
+     * 异常信息
+     */
+    @TableField(value = "errorMsg")
+    private String errorMsg;
 
     /**
      *上传状态(1.未上传,2.已上传,3.上传失败)
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 040c29364..df6b2efa4 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -493,7 +493,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
                 collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
                 collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType());
-                if (collectOrder.getWorkPlaceCode() != null) {
+                if (!collectOrder.getTagStatus().equals(4) && collectOrder.getWorkPlaceCode() != null) {
                     collectOrder.setTagStatus(1);
                 }
                 this.save(collectOrder);