From 72699ee8fcceaa03a3574861053f8b9618fea74a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 12 Dec 2024 18:06:31 +0800
Subject: [PATCH] =?UTF-8?q?12/12=20=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/collect/IoCollectCodeBackService.java  | 6 +++++-
 src/main/resources/mybatis/mapper/inv/invProductDao.xml     | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java
index 5728f00e7..d6ab7fcde 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java
@@ -107,7 +107,11 @@ public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMappe
             //校验是否本单产品
             IoCollectOrderBizBackup collectOrderBizBackup = vailByBatchNo(udiRelevanceResponses, ioCollectOrderBizBackups, udiEntity);
             if (collectOrderBizBackup == null) {
-                return ResultVOUtils.error(500, "非此单产品");
+                BaseResponse response = new BaseResponse();
+                response.setData(filterCodeRequest.getCode());
+                response.setCode(500);
+                response.setMessage("非此单产品");
+                return response;
             }
             udiEntity.setCode(filterCodeRequest.getCode());
             AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse);
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index d008f4586..01a138afc 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -11,7 +11,6 @@
                bp.measname,
                COALESCE(bp.ggxh, bp.bzgg)                as ggxh,
                ip.relIdFk,
-               bp.ggxh,
                ip.batchNo,
                ip.productionDate,
                ip.expireDate,
@@ -27,7 +26,7 @@
                auth_warehouse.name                          invName,
                ip.deptCode,
                ip.invCode,
-               as.name                                      spaceName,
+               s.name                                      spaceName,
                bp.productsType,
                bp.levelUnit,
                bp.prepnUnit,