From 5619aa362c6f5760a369ebf6e17ed233ca4ef980 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 22 May 2023 19:02:49 +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

---
 .../controller/inv/InvProductController.java  | 22 +++++++++----------
 .../thrsys/impl/ThrProductsServiceImpl.java   |  3 +++
 .../mybatis/mapper/basic/UdiRlSupDao.xml      |  2 --
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
index 8c01df363..1283fc3a8 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
@@ -145,17 +145,17 @@ public class InvProductController extends BaseController {
             });
         }
 
-        //根据单据日期排序
-        list.sort((o1, o2) -> {
-            long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime();
-            long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime();
-            if (o1OrderTime > o2OrderTime) {
-                return 1;
-            } else if (o1OrderTime < o2OrderTime) {
-                return -1;
-            }
-            return 0;
-        });
+//        //根据单据日期排序
+//        list.sort((o1, o2) -> {
+//            long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime();
+//            long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime();
+//            if (o1OrderTime > o2OrderTime) {
+//                return 1;
+//            } else if (o1OrderTime < o2OrderTime) {
+//                return -1;
+//            }
+//            return 0;
+//        });
 
         PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
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 7156d9de9..2aad2798e 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
@@ -3,6 +3,7 @@ package com.glxp.api.service.thrsys.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -185,6 +186,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         BeanUtil.copyProperties(item, thrProductsEntity);
                         thrProductsEntity.setCreateTime(new Date());
                         thrProductsEntity.setUpdateTime(new Date());
+                        thrProductsEntity.setId(IdUtil.getSnowflakeNextId());
+                        thrProductsDao.insertThrProducts(thrProductsEntity);
                     } else {
                         boolean isChange = verifyDataChange(thrProductsEntity, item);
                         if (isChange) {
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 5a6074221..3d7c6806e 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -51,8 +51,6 @@
         basic_udirel.overStockNum,
         basic_udirel.recentDateTime,
         basic_udirel.isDateBy,
-
-
         bht.name             classifyName,
         basic_products.id as PRId,
         basic_products.originUuid,