From e266ae4e7b5c578de1843d746cf7ae1c58c2c70a Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 5 Dec 2023 13:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=86=8D=E6=AC=A1=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/UdiContrastController.java   | 3 ++-
 src/main/java/com/glxp/api/http/NmpaUdiClient.java         | 4 +++-
 .../java/com/glxp/api/service/inout/IoAddInoutService.java | 7 +++++--
 .../mybatis/mapper/thrsys/ThrProductsAddDiDao.xml          | 7 +++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
index 0b58b53e..8a1e973c 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
@@ -193,8 +193,9 @@ public class UdiContrastController {
                     productInfoService.insertProductInfos(productInfoEntityList);
                     newUuid = productInfoEntityList.get(0).getUuid();
                 }
+            } else {
+                return ResultVOUtils.error(500, "实时获取国家库数据失败！");
             }
-
             udiInfoEntities = udiDlHttpClient.getUdiByUuid(newUuid);
             udiProductService.deleteByUuid(udiCombineRequest.getUuid());
             for (UdiProductEntity udiProductEntity : udiInfoEntities) {
diff --git a/src/main/java/com/glxp/api/http/NmpaUdiClient.java b/src/main/java/com/glxp/api/http/NmpaUdiClient.java
index 700a1e79..ed53bd05 100644
--- a/src/main/java/com/glxp/api/http/NmpaUdiClient.java
+++ b/src/main/java/com/glxp/api/http/NmpaUdiClient.java
@@ -2,6 +2,7 @@ package com.glxp.api.http;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.basic.UdiProductEntity;
@@ -33,7 +34,8 @@ public class NmpaUdiClient {
         productInfoFilterRequest.setPage(1);
         productInfoFilterRequest.setLimit(100);
         productInfoFilterRequest.setUuid(uuid);
-
+        if (StrUtil.isEmpty(uuid))
+            return null;
         List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
         List<UdiProductEntity> udiInfoEntities = new ArrayList<>();
         String myUuid = UuidUtils.getUUId();
diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
index b37762ef..4e1199c0 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -154,6 +154,7 @@ public class IoAddInoutService {
             } else {
                 orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR);
                 orderEntity.setUpdateTime(new Date());
+                orderEntity.setErrMsg(result);
                 orderService.update(orderEntity);
                 insertList.clear();
                 return;
@@ -682,7 +683,10 @@ public class IoAddInoutService {
         int count = 0;
         if (filterList != null) {
             for (IoCodeTempEntity temp : filterList) {
-                if (temp.getCode().equals(codeEntity.getCode())) {
+                if (temp.getCode().equals(codeEntity.getCode())
+                        && StrUtil.trimToEmpty(temp.getSerialNo()).equals(StrUtil.trimToEmpty(codeEntity.getSerialNo()))
+                        && StrUtil.trimToEmpty(temp.getInBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getInBatchNo()))
+                ) {
                     count = count + 1;
                 }
             }
@@ -693,7 +697,6 @@ public class IoAddInoutService {
             return null;
     }
 
-
     public String checkOriginCode(IoCodeTempEntity warehouseEntity) {
 
         UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
index 66d052a8..4e113e47 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
@@ -16,7 +16,7 @@
                                          qxlb, tyshxydm, zczbhhzbapzbh,
                                          ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
                                          supName, model, `standard`,
-                                         qtbm, zczyxqz, relId, type)
+                                         qtbm, zczyxqz, relId, type, deviceRecordKey)
                 values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.uuid},
@@ -25,6 +25,8 @@
              #{item.auditTime},
              #{item.remark},
              #{item.auditUser},
+
+
              #{item.status},
              #{item.thirdSysFk},
              #{item.code},
@@ -41,7 +43,8 @@
                     , #{item.name}, #{item.spec}, #{item.registerNo}, #{item.cplb}
                     , #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh}
                     , #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model}
-                    , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type})
+                    , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type},
+             #{item.deviceRecordKey})
         </foreach>
     </insert>