From 22cc779aff6d1ff2174e2cd4cfcb64ebe22f698f Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 28 十一月 2023 13:28:41 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/materialsManage/src/main/resources/mapping/MinXingPlantMapper.xml |  160 +++++++++++++++++++++++++++-------------------------
 1 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/MinXingPlantMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/MinXingPlantMapper.xml
index d5583e6..66cddb8 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/MinXingPlantMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/MinXingPlantMapper.xml
@@ -3,83 +3,83 @@
 <mapper namespace="com.thhy.materials.modules.biz.mixingstationstorage.mapper.MinXingPlantMapper">
 
   <insert id="insert" >
-    insert into t_material_stock_record
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="id != null">
-            id,
-        </if>
-        <if test="type != null">
-            type,
-        </if>
-        <if test="opType != null">
-            op_Type,
-        </if>
-        <if test="materialName != null">
-            material_name,
-        </if>
-        <if test="materialValue != null">
-            material_value,
-        </if>
-        <if test="beforeStock != null">
-            before_stock,
-        </if>
-        <if test="afterStock != null">
-            after_stock,
-        </if>
-        <if test="remark != null">
-            remark,
-        </if>
-        <if test="pipeId != null">
-            pipe_id,
-        </if>
-        <if test="pipeNum != null">
-            pipe_num,
-        </if>
-        <if test="createDate != null">
-            create_date,
-        </if>
-        <if test="supplierName != null">
-            supplier_name,
-        </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-        <if test="id != null">
-            #{id},
-        </if>
-        <if test="type != null">
-            #{type},
-        </if>
-        <if test=" != null">
-            #{opType},
-        </if>
-        <if test="materialName != null">
-            #{materialName},
-        </if>
-        <if test="materialValue != null">
-            #{materialValue},
-        </if>
-        <if test="beforeStock != null">
-            #{beforeStock},
-        </if>
-        <if test="afterStock != null">
-            #{afterStock},
-        </if>
-        <if test="remark != null">
-            #{remark},
-        </if>
-        <if test="pipeId != null">
-            #{pipeId},
-        </if>
-        <if test="pipeNum != null">
-            #{pipeNum},
-        </if>
-        <if test="createDate != null">
-            #{createDate},
-        </if>
-        <if test="supplierName != null">
-            #{supplierName},
-        </if>
-    </trim>
+      insert into t_material_stock_record
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+          <if test="id != null">
+              id,
+          </if>
+          <if test="createDate != null">
+              create_date,
+          </if>
+          <if test="type != null">
+              type,
+          </if>
+          <if test="opType != null">
+              op_type,
+          </if>
+          <if test="dictId != null">
+              material_name,
+          </if>
+          <if test="materialValue != null">
+              material_value,
+          </if>
+          <if test="beforeStock != null">
+              before_stock,
+          </if>
+          <if test="afterStock != null">
+              after_stock,
+          </if>
+          <if test="companyId != null">
+              company_id,
+          </if>
+          <if test="remark != null">
+              remark,
+          </if>
+          <if test="createUser != null">
+              create_user,
+          </if>
+          <if test="supplierName != null">
+              supplier_name,
+          </if>
+      </trim>
+      <trim prefix="values (" suffix=")" suffixOverrides=",">
+          <if test="id != null">
+              #{id},
+          </if>
+          <if test="createDate != null">
+              #{createDate},
+          </if>
+          <if test="type != null">
+              #{type},
+          </if>
+          <if test="opType != null">
+              #{opType},
+          </if>
+          <if test="dictId != null">
+              #{dictId},
+          </if>
+          <if test="materialValue != null">
+              #{materialValue},
+          </if>
+          <if test="beforeStock != null">
+              #{beforeStock},
+          </if>
+          <if test="afterStock != null">
+              #{afterStock},
+          </if>
+          <if test="companyId != null">
+              #{companyId},
+          </if>
+          <if test="remark != null">
+              #{remark},
+          </if>
+          <if test="createUser != null">
+              #{createUser},
+          </if>
+          <if test="supplierName != null">
+              #{supplierName},
+          </if>
+      </trim>
   </insert>
 
   <select id="selectAllList" parameterType="com.thhy.materials.modules.biz.mixingstationstorage.dto.MinXingPlantDto" resultType="com.thhy.materials.modules.biz.mixingstationstorage.entity.MinXingPlantVo">
@@ -174,6 +174,9 @@
       <if test="createUser != null">
         create_user,
       </if>
+      <if test="supplierName != null">
+        supplier_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -209,6 +212,9 @@
       <if test="createUser != null">
         #{createUser},
       </if>
+      <if test="supplierName != null">
+        #{supplierName},
+      </if>
     </trim>
   </insert>
   <select id="selectInventoryRecordList" parameterType="com.thhy.materials.modules.biz.mixingstationstorage.dto.TMaterialStockRecordDto" resultType="com.thhy.materials.modules.biz.mixingstationstorage.entity.TMaterialStockRecordVo">

--
Gitblit v1.9.3