From b2fc479ab93dd4807e1c4759710ceacc37d361ae Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期四, 16 十一月 2023 13:23:24 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml | 30 +++++++++++++++---------------
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java | 3 ++-
2 files changed, 17 insertions(+), 16 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..2cf6e2c 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
@@ -4,14 +4,14 @@
<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,
- </if>
- <if test="nameOfOrigin != null">
- name_of_origin,
- </if>
+ <if test="id != null">
+ id,
+ </if>
+ <if test="nameOfOrigin != null">
+ name_of_origin,
+ </if>
<if test="tableNum != null">
table_num,
</if>
@@ -53,12 +53,12 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=VARCHAR},
- </if>
- <if test="nameOfOrigin != null">
- #{nameOfOrigin,jdbcType=VARCHAR},
- </if>
+ <if test="id != null">
+ #{id,jdbcType=VARCHAR},
+ </if>
+ <if test="nameOfOrigin != null">
+ #{nameOfOrigin,jdbcType=VARCHAR},
+ </if>
<if test="tableNum != null">
#{tableNum,jdbcType=INTEGER},
</if>
@@ -101,9 +101,9 @@
</trim>
on duplicate key update
<trim suffixOverrides=",">
- <if test="nameOfOrigin != null">
+ <if test="nameOfOrigin != null">
name_of_origin = #{nameOfOrigin,jdbcType=VARCHAR},
- </if>
+ </if>
<if test="tableNum != null">
table_num = #{tableNum,jdbcType=INTEGER},
</if>
--
Gitblit v1.9.3