From ebfd686f0979753d94f692158ef204f795f72c79 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 25 Nov 2024 09:30:36 +0800
Subject: [PATCH] =?UTF-8?q?11/25=20=E6=89=AB=E7=A0=81=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E6=96=B9=E6=B6=88=E5=A4=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/entity/collect/IoCollectOrder.java     | 1 +
 src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java  | 1 +
 .../api/service/collect/IoCollectOrderCodeManService.java    | 5 ++++-
 3 files changed, 6 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 a250d322b..97a90b600 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
@@ -276,6 +276,7 @@ public class IoCollectOrder implements Serializable {
     @TableField(value = "shipper")
     @ApiModelProperty(value = "发货方编码")
     private String shipper;
+
     @TableField(value = "shipperName")
     @ApiModelProperty(value = "发货方名称")
     private String shipperName;
diff --git a/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java b/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java
index f71887f86..d0aef23b3 100644
--- a/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java
+++ b/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java
@@ -54,6 +54,7 @@ public class AddTagCodeReqeust {
     private String busType;
 
     private String shipper;
+    private String shipperName;
 
     /**
      * 是否拆零码
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
index da2cf55e1..a7d6380d5 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -212,7 +212,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         .orderCirType(sysWorkplaceDocumentEntity.getOrderCirType())
                         .tagStatus(1)
                         .build();
-
+                if (StrUtil.isNotEmpty(addTagCodeReqeust.getShipper())){
+                    collectOrder.setShipper(addTagCodeReqeust.getShipper());
+                    collectOrder.setShipperName(addTagCodeReqeust.getShipperName());
+                }
                 if (StrUtil.isNotEmpty(addTagCodeReqeust.getInvCode())) {
                     InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getInvCode());
                     collectOrder.setShipperName(invWarehouseEntity.getName());