Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-11-16 b2fc479ab93dd4807e1c4759710ceacc37d361ae

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 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);

 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>