From 742a2f40e5dfd42bee8f1fcdcb2f9098fbb73ccb Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 16 十一月 2023 10:22:32 +0800
Subject: [PATCH] 20231116_qiuyh_料仓大屏

---
 hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml                                                          |    2 +-
 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
index f909e53..c57870e 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
@@ -36,8 +36,9 @@
 		if(StringUtils.isNotBlank(id)){
 			suMaterialWarehouseEntity.setUpdateTime(new Date());
 			suMaterialWarehouseEntity.setUpdateUser(userId);
+		}else {
+			suMaterialWarehouseEntity.setId(UUIDUtils.create());
 		}
-		suMaterialWarehouseEntity.setId(UUIDUtils.create());
 		suMaterialWarehouseEntity.setCreateUser(userId);
 		suMaterialWarehouseEntity.setCompanyId(companyId);
 		suMaterialWarehouseMapper.insertAndUpdate(suMaterialWarehouseEntity);
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
index ffb5048..c5e0131 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
@@ -4,7 +4,7 @@
 
 
   <insert id="insertAndUpdate">
-    insert ignore into t_su_material_warehouse_record
+    insert into t_su_material_warehouse_record
     <trim prefix="(" suffix=")" suffixOverrides=",">
         <if test="id != null">
             id,

--
Gitblit v1.9.3