From 27cc68ff98a4037194cda23341f7f25e7be72065 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 14 Dec 2023 11:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=80=BB=E5=BA=93=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E4=B8=8A=E7=BA=A7=E5=BA=93=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/basic/UdiRelevanceEntity.java  | 12 ++++
 .../api/res/basic/UdiRelevanceResponse.java   | 12 ++++
 .../auth/impl/InvWarehouseServiceImpl.java    |  2 +-
 .../thrsys/impl/ThrProductsServiceImpl.java   |  7 +-
 src/main/resources/schemas/schema_v2.4.sql    | 69 +++++++++++++++----
 5 files changed, 88 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
index 0f1b1c7cf..6159afb03 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
@@ -172,4 +172,16 @@ public class UdiRelevanceEntity {
     @TableField(value = "certIdFk")
     private String certIdFk;
 
+    /**
+     * 上传状态  0:未上传；1:已上传；
+     */
+    @TableField(value = "uploadFlag")
+    private Integer uploadFlag;
+
+    /**
+     * 上传日志信息
+     */
+    @TableField(value = "uploadMsg")
+    private String uploadMsg;
+
 }
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index 9dc56988c..e362dafcc 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
@@ -1,5 +1,6 @@
 package com.glxp.api.res.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -128,6 +129,17 @@ public class UdiRelevanceResponse {
     private Long deId;
 
 
+    /**
+     * 上传状态  0:未上传；1:已上传；
+     */
+    private Integer uploadFlag;
+
+    /**
+     * 上传日志信息
+     */
+    private String uploadMsg;
+
+
     private Integer bpcrid;
 
     private String hslbName;
diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
index d650fcb04..5104b239d 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
@@ -296,7 +296,7 @@ public class InvWarehouseServiceImpl extends ServiceImpl<InvWarehouseDao, InvWar
             if (StrUtil.isEmpty(invWarehouseEntity.getParentCode()))
                 return invWarehouseEntity;
             else return findByInvSubByCode(invWarehouseEntity.getParentCode());
-        } else {
+        } else  if (IntUtil.value(noInvType) == 2) {
             while (StrUtil.isNotEmpty(invWarehouseEntity.getParentCode())) {
                 invWarehouseEntity = invWarehouseDao.selectOne(
                         new QueryWrapper<InvWarehouseEntity>().eq("code", invWarehouseEntity.getParentCode()).last("limit 1"));
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
index 9479ac69f..ad1ac7c28 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
@@ -367,13 +367,18 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         postRelProductRequest.setUdiRelevanceResponse(udiRelevanceResponse);
         //上传第三方产品信息
         BaseResponse baseResponse = erpBasicClient.postRelProduct(postRelProductRequest);
+        UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(udiRelevanceResponse.getId());
         if (baseResponse.getCode() != 20000) {
+            udiRelevanceEntity.setUploadFlag(2);
+            udiRelevanceEntity.setUploadMsg(baseResponse.getMessage());
+            udiRelevanceDao.updateById(udiRelevanceEntity);
             return ResultVOUtils.error(500, "上传失败！" + baseResponse.getMessage());
         } else {
             String thirdCode = (String) baseResponse.getData();
-            UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(udiRelevanceResponse.getId());
             udiRelevanceEntity.setThirdId(thirdCode);
             udiRelevanceEntity.setMainId(thirdCode);
+            udiRelevanceEntity.setUploadFlag(1);
+            udiRelevanceEntity.setUploadMsg("上传成功！" + thirdCode);
             udiRelevanceDao.updateById(udiRelevanceEntity);
             spGetHttpClient.postBasicRl(udiRelevanceEntity);
         }
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 83f0a0867..05ae321fd 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -100,15 +100,60 @@ CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterBatchNo', 'varchar(255)'
 CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterDate', 'varchar(255)', 1);
 
 
-UPDATE `auth_menu` SET `menu_name` = '耗材字典维护', `parent_id` = 1644, `order_num` = 1, `path` = 'maintain', `component` = 'basic/product/product', `query_param` = '{\"vueRouteSource\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = 'basic:product:maintain', `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-01-11 17:02:20', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1646;
-UPDATE `auth_menu` SET `menu_name` = '产品信息导出', `parent_id` = 1616, `order_num` = 2, `path` = 'basic/product/product', `component` = 'basic/product/product', `query_param` = '{\"vueRouteSource\":2}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = 'thirdSys:product:export', `icon` = '', `create_by` = '超级用户', `create_time` = '2022-12-28 11:30:58', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1618;
-
-
-CREATE TABLE IF NOT EXISTS `thr_product_type`  (
-                                     `id` int NOT NULL,
-                                     `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '类别编码',
-                                     `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '类别名称',
-                                     `thirdSys` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '第三系统标识',
-                                     `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
-                                     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+UPDATE `auth_menu`
+SET `menu_name`   = '耗材字典维护',
+    `parent_id`   = 1644,
+    `order_num`   = 1,
+    `path`        = 'maintain',
+    `component`   = 'basic/product/product',
+    `query_param` = '{\"vueRouteSource\":1}',
+    `is_frame`    = 1,
+    `is_cache`    = 0,
+    `menu_type`   = 'C',
+    `visible`     = '0',
+    `status`      = '0',
+    `perms`       = 'basic:product:maintain',
+    `icon`        = NULL,
+    `create_by`   = '超级用户',
+    `create_time` = '2023-01-11 17:02:20',
+    `update_by`   = NULL,
+    `update_time` = NULL,
+    `remark`      = NULL
+WHERE `menu_id` = 1646;
+UPDATE `auth_menu`
+SET `menu_name`   = '产品信息导出',
+    `parent_id`   = 1616,
+    `order_num`   = 2,
+    `path`        = 'basic/product/product',
+    `component`   = 'basic/product/product',
+    `query_param` = '{\"vueRouteSource\":2}',
+    `is_frame`    = 1,
+    `is_cache`    = 0,
+    `menu_type`   = 'C',
+    `visible`     = '0',
+    `status`      = '0',
+    `perms`       = 'thirdSys:product:export',
+    `icon`        = '',
+    `create_by`   = '超级用户',
+    `create_time` = '2022-12-28 11:30:58',
+    `update_by`   = NULL,
+    `update_time` = NULL,
+    `remark`      = NULL
+WHERE `menu_id` = 1618;
+
+
+CREATE TABLE IF NOT EXISTS `thr_product_type`
+(
+    `id`       int                                                           NOT NULL,
+    `code`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '类别编码',
+    `name`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '类别名称',
+    `thirdSys` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '第三系统标识',
+    `remark`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+
+CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadFlag', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadMsg', 'varchar(1024)', 1);