From f643343b2acbaef9d81dc02c8115152f06ddb7ea Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 20 Apr 2023 13:47:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/service/inout/IoAddInoutService.java    | 3 ++-
 src/main/java/com/glxp/api/task/AsyncHeartTask.java           | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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 b43771e8..65c0cbca 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -338,7 +338,8 @@ public class IoAddInoutService {
         IoOrderEntity order = orderService.findByBillNo(orderId);
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(order.getAction());
         if (StrUtil.isBlank(bussinessTypeEntity.getSupplementOrderType())) {
-            return ResultVOUtils.error(ResultEnum.valueOf("此类型单据不可补单"));
+//            return ResultVOUtils.error(ResultEnum.valueOf("此类型单据不可补单"));
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK, "此类型单据不可补单");
         }
         IoOrderEntity supplementOrder = new IoOrderEntity();
         BeanUtil.copyProperties(order, supplementOrder);
diff --git a/src/main/java/com/glxp/api/task/AsyncHeartTask.java b/src/main/java/com/glxp/api/task/AsyncHeartTask.java
index a8a87613..bd25cc5f 100644
--- a/src/main/java/com/glxp/api/task/AsyncHeartTask.java
+++ b/src/main/java/com/glxp/api/task/AsyncHeartTask.java
@@ -19,8 +19,8 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
 public class AsyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(AsyncHeartTask.class);

From 90473b884117895a59b2e7473a22487087d7916c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 20 Apr 2023 14:28:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20UDI=E7=A0=81=E8=A1=A5?=
 =?UTF-8?q?=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/entity/basic/UdiEntity.java      | 1 -
 .../java/com/glxp/api/res/inout/IoCodeLostResponse.java     | 1 -
 .../com/glxp/api/service/inout/IoCheckInoutService.java     | 6 ++++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/UdiEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiEntity.java
index af3d42ec..9365bd7a 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiEntity.java
@@ -11,7 +11,6 @@ public class UdiEntity {
     private String expireDate;
     private String serialNo;
     private String udi;
-
     public String getBatchNo() {
         return batchNo;
     }
diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java
index cd5238c8..665e876c 100644
--- a/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java
@@ -47,7 +47,6 @@ public class IoCodeLostResponse {
     private String cpmctymc;
    //规格型号
     private String ggxh;
-
     public static final String COL_ID = "id";
 
     public static final String COL_CODE = "code";
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index bc67a0a0..612f1d2a 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -187,9 +187,11 @@ public class IoCheckInoutService {
             UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode());
 
             IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode());
-            if (codeLostEntity == null)
+            if (codeLostEntity == null)  {
                 codeLostEntity = new IoCodeLostEntity();
-
+                codeLostEntity.setNameCode(udiEntity.getUdi());
+                codeLostEntity.setCode(codeEntity.getCode());
+            }
             //校验是否写入缺失表
             boolean isTrue = false;
             if (udiEntity != null) {