From 01028cc67f49d18f94c9dbed8fee033c2faa981b Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 19 Sep 2024 09:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81=E5=8D=95?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=9A=E5=8A=A1=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inout/IoCodeTempController.java   |  2 +-
 .../collect/IoCollectOrderCodeManService.java        | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 667901bc0..ad90f5897 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -186,7 +186,7 @@ public class IoCodeTempController extends BaseController {
 
     //前端扫码完整性校验
     @AuthRuleAnnotation("")
-    @PostMapping("warehouse/inout/`enterCode")
+    @PostMapping("warehouse/inout/enterCode")
     public BaseResponse addEndterCode(@RequestBody AddEnterCodeRequest addEnterCodeRequest) {
 
         if (StrUtil.isEmpty(addEnterCodeRequest.getCode())) {
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 9a35525c6..7e766459e 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -10,6 +10,7 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.WorkOperType;
 import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper;
+import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.entity.basic.UdiEntity;
@@ -25,6 +26,7 @@ import com.glxp.api.req.inout.AddTagCodeReqeust;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.collect.CollectOrderCodeManResponse;
 import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.BasicCollectBustypeService;
 import com.glxp.api.service.basic.SysWorkplaceDocumentService;
@@ -97,6 +99,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 .eq(IoCollectOrderCodeMan::getUdiCode, code).last("limit 1"));
     }
 
+
+    @Resource
+    InvWarehouseService invWarehouseService;
+
     @Transactional(rollbackFor = Exception.class)
     public IoCollectOrder prescribeTagCode(AddTagCodeReqeust addTagCodeReqeust) {
         Long userId = customerService.getUserId();
@@ -142,9 +148,15 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         .workPlaceCode(workPlace.getWorkplaceId())
                         .createTime(new Date())
                         .createUser(userIds)
+                        .shipper(addTagCodeReqeust.getInvCode())
                         .updateTime(new Date())
                         .tagStatus(1)
                         .build();
+
+                if (StrUtil.isNotEmpty(addTagCodeReqeust.getInvCode())) {
+                    InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getCode());
+                    collectOrder.setShipperName(invWarehouseEntity.getName());
+                }
                 if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1) {
                     collectOrder.setFromType("UDI系统");
                 } else {