表SalesContractProcessMX加hetongmll字段

src/main/java/com/huazheng/project/mssql/model/SalesContractProcessMX.java

@@ -30,6 +30,8 @@ public class SalesContractProcessMX implements Serializable {
 	
 	private String wuliaoh; // 物料号
 	
+	private String hetongmll; //合同毛利率
+	
 	private Vbap vbap;
 
 	private boolean exist; // 用于标记，不是字段

src/main/resources/devtools/table/mssql/t_SalesContractProcessMX.sql

@@ -13,3 +13,4 @@ alter table SalesContractProcessMX add column rowNum serial;
 alter table SalesContractProcessMX add column zongjia text;
 alter table SalesContractProcessMX add column maolibz text;
 alter table SalesContractProcessMX add column wuliaoh text;
+alter table SalesContractProcessMX add column hetongmll text;

src/main/resources/mapper/greenplum/GPMapper_greenplum.xml

@@ -233,14 +233,14 @@
     	select * from SalesContractProcessMX where id = #{id}
     </select>
     <insert id="insertSalesContractProcessMX" parameterType="com.huazheng.project.mssql.model.SalesContractProcessMX">
-    	insert into SalesContractProcessMX (id, chengben, sysIncident, zongjia, maolibz, wuliaoh, hashResult) values(#{id}, #{chengben}, #{sysIncident}, #{zongjia}, #{maolibz}, #{wuliaoh}, #{hashResult})
+    	insert into SalesContractProcessMX (id, chengben, sysIncident, zongjia, maolibz, wuliaoh, hetongmll, hashResult) values(#{id}, #{chengben}, #{sysIncident}, #{zongjia}, #{maolibz}, #{wuliaoh}, #{hetongmll}, #{hashResult})
     </insert>
     <delete id="deleteSalesContractProcessMX" parameterType="com.huazheng.project.mssql.model.SalesContractProcessMX">
     	delete from SalesContractProcessMX where id = #{id}
     </delete>
 	<update id="updateSalesContractProcessMX" parameterType="com.huazheng.project.mssql.model.SalesContractProcessMX">
     	update SalesContractProcessMX set 
-    		id = #{id}, chengben = #{chengben}, sysIncident = #{sysIncident}, zongjia = #{zongjia}, maolibz = #{maolibz}, wuliaoh = #{wuliaoh}, hashResult = #{hashResult}
+    		id = #{id}, chengben = #{chengben}, sysIncident = #{sysIncident}, zongjia = #{zongjia}, maolibz = #{maolibz}, wuliaoh = #{wuliaoh}, hetongmll = #{hetongmll}, hashResult = #{hashResult}
 		where id = #{id}
     </update>
 	<select id="selectSalesContractProcessMXCheck" parameterType="com.huazheng.project.mssql.model.SalesContractProcessMX" resultType="com.huazheng.project.mssql.model.SalesContractProcessMX">

src/main/resources/mapper/mssql/CrmMapper_mssql.xml

@@ -68,7 +68,7 @@
     </select>
     <!-- process中的关联查询 -->
     <select id="selectSalesContractProcessMX" parameterType="SalesContractProcess" resultType="SalesContractProcessMX">
-    	select id, chengben, SYS_INCIDENT as sysIncident, zongjia, maolibz, wuliaoh
+    	select id, chengben, SYS_INCIDENT as sysIncident, zongjia, maolibz, wuliaoh, convert(varchar(50),Round(hetongmll,2)) + '%' as hetongmll
     	from "Biz_销售合同流程_MX" 
     	where SYS_INCIDENT = #{sysIncident}
     </select>
@@ -134,7 +134,7 @@
     
     <select id="cascadeSalesContractProcessMXBySalesContractProcess" parameterType="SalesContractProcess" resultType="SalesContractProcessMX">
     	select top 20 
-    		id, chengben, SYS_INCIDENT as sysIncident, zongjia, maolibz, wuliaoh
+    		id, chengben, SYS_INCIDENT as sysIncident, zongjia, maolibz, wuliaoh, convert(varchar(50),Round(hetongmll,2)) + '%' as hetongmll
     	from "Biz_销售合同流程_MX" 
     	where SYS_INCIDENT = #{sysIncident}
     </select>
@@ -220,7 +220,7 @@
     </select>
     
     <select id="selectSalesContractProcessMXById" parameterType="SalesContractProcessMX" resultType="SalesContractProcessMX">
-    	select id, chengben, SYS_INCIDENT as sysIncident, zongjia, maolibz, wuliaoh
+    	select id, chengben, SYS_INCIDENT as sysIncident, zongjia, maolibz, wuliaoh, convert(varchar(50),Round(hetongmll,2)) + '%' as hetongmll
     	from "Biz_销售合同流程_MX" 
     	where id = #{id}
     </select>