From 20514d1e76636289a8d10a8bc761a3e98e7b86a6 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 4 Apr 2025 17:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderCodeManController.java  |  4 ++--
 .../collect/IoCollectOrderCodeManService.java     | 10 +++++-----
 .../java/com/glxp/api/task/SyncHeartService.java  |  9 +++------
 src/main/resources/schemas/schema_v2.4.sql        | 15 ++++++++++++++-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
index 4fdf21b2c..2d8ea3721 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
@@ -76,7 +76,7 @@ public class IoCollectOrderCodeManController extends BaseController {
      * @return
      */
     @PostMapping("/udiwms/ioSplit/collect/order/tagCode")
-    @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_ADD_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.code"},waitTime = 1,leaseTime = 5, timeOutMsg = "扫码重复提交")
+    @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_ADD_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.code"}, waitTime = 1, leaseTime = 6, timeOutMsg = "扫码重复提交")
     public BaseResponse prescribeTagCode(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust,
                                          BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -133,7 +133,7 @@ public class IoCollectOrderCodeManController extends BaseController {
      * @return
      */
     @PostMapping("/udiwms/ioSplit/collect/order/batchAddCode")
-    @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_BATCH_CODE, key = {"#addTagCodeReqeust.prescribeNum", "#addTagCodeReqeust.codeList", "#addTagCodeReqeust.code"}, timeOutMsg = "重复扫码")
+    @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_BATCH_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.codeList", "#addTagCodeReqeust.code"}, leaseTime = 6, timeOutMsg = "扫码重复提交")
     public BaseResponse batchAddCode(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust,
                                      BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
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 934ae72ac..4eb966027 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -151,11 +151,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(workPlace.getWorkplaceId(), addTagCodeReqeust.getBusType());
         IoCollectOrderBiz collectOrderBiz = null;
         IoCollectOrder collectOrder = null;
-       try {
-           Thread.sleep(3*1000);
-       } catch (InterruptedException e) {
-           throw new RuntimeException(e);
-       }
+//       try {
+//           Thread.sleep(3*1000);
+//       } catch (InterruptedException e) {
+//           throw new RuntimeException(e);
+//       }
         //1.校验UDI码完整性
         String code = addTagCodeReqeust.getCode();
         if (StringUtils.isBlank(code)) throw new JsonException(ResultEnum.DATA_ERROR.getMessage());
diff --git a/src/main/java/com/glxp/api/task/SyncHeartService.java b/src/main/java/com/glxp/api/task/SyncHeartService.java
index 76be7328a..1c5f42d99 100644
--- a/src/main/java/com/glxp/api/task/SyncHeartService.java
+++ b/src/main/java/com/glxp/api/task/SyncHeartService.java
@@ -51,7 +51,7 @@ public class SyncHeartService {
             if (curTime1 - lastTime1 > timeInterval1) {
                 Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> {
                     try {
-                    heartService.pushData(syncDataSetEntity, null, i);
+                        heartService.pushData(syncDataSetEntity, null, i);
                     } catch (Exception e) {
                         log.error(ExceptionUtils.getStackTrace(e));
                         e.printStackTrace();
@@ -78,11 +78,8 @@ public class SyncHeartService {
         });
     }
 
-    public void pushOrder() {
-        SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
-        if (!syncDataSetEntity.isDownstreamEnable()) {
-            return;
-        }
+    public void pushOrder(SyncDataSetEntity syncDataSetEntity) {
+
         //定时上传最近更新单据数据至上游轮询时间
         long timeInterval2 = syncDataSetEntity.getOrderSyncTime() * 6 * 1000L;
         long curTime2 = System.currentTimeMillis();
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 06306085c..637d8ab53 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -5281,6 +5281,8 @@ CALL Pro_Temp_ColumnWork('basic_corp', 'aliEntId',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''阿里供应商ID''',
                          1);
 
+
+
 CALL Modify_index('io_order', 'action,invCode', 'idex_order_query', 'BTREE');
 CALL Modify_index('io_order', 'mainAction', 'idex_order_query_mainAction', 'BTREE');
 
@@ -5552,4 +5554,15 @@ CREATE TABLE IF NOT EXISTS `inv_product_record`  (
                                         INDEX `idx_productId`(`productId` ASC) USING BTREE,
                                         INDEX `idx_orderId`(`orderId` ASC) USING BTREE,
                                         INDEX `idx_createTime`(`createTime` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '库存流水表' ROW_FORMAT = DYNAMIC;
\ No newline at end of file
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '库存流水表' ROW_FORMAT = DYNAMIC;
+
+
+CALL Pro_Temp_ColumnWork('io_collect_order_origin', 'summaryNo',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''汇总单号''',
+                         1);
+CALL Pro_Temp_ColumnWork('io_collect_order', 'summaryNo',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''汇总单号''',
+                         1);
+CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'summaryNo',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''汇总单号''',
+                         1);
\ No newline at end of file