Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -20,7 +20,7 @@
     <result column="sa_recorderid" property="sa_recorderid" jdbcType="INTEGER" />
     <result column="sa_recorder" property="sa_recorder" jdbcType="VARCHAR" />
     <result column="sa_recorddate" property="sa_recorddate" jdbcType="TIMESTAMP" />
-    <result column="companyid" property="companyId" jdbcType="INTEGER" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="sa_text1" property="sa_text1" jdbcType="VARCHAR" />
@@ -32,7 +32,7 @@
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
     sa_remark, sa_status, sa_statuscode, sa_sendstatuscode, sa_sendstatus, sa_printstatus, 
-    sa_printstatuscode, sa_recorderid, sa_recorder, sa_recorddate, companyid, updaterId, 
+    sa_printstatuscode, sa_recorderid, sa_recorder, sa_recorddate, companyId, updaterId, 
     updateTime, sa_text1, sa_text2, sa_text3, sa_text4, sa_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -52,7 +52,7 @@
       sa_status, sa_statuscode, sa_sendstatuscode, 
       sa_sendstatus, sa_printstatus, sa_printstatuscode, 
       sa_recorderid, sa_recorder, sa_recorddate, 
-      companyid, updaterId, updateTime, 
+      companyId, updaterId, updateTime, 
       sa_text1, sa_text2, sa_text3, 
       sa_text4, sa_text5)
     values (#{sa_id,jdbcType=INTEGER}, #{sa_code,jdbcType=VARCHAR}, #{sa_custid,jdbcType=INTEGER}, 
@@ -61,11 +61,14 @@
       #{sa_status,jdbcType=VARCHAR}, #{sa_statuscode,jdbcType=VARCHAR}, #{sa_sendstatuscode,jdbcType=VARCHAR}, 
       #{sa_sendstatus,jdbcType=VARCHAR}, #{sa_printstatus,jdbcType=VARCHAR}, #{sa_printstatuscode,jdbcType=VARCHAR}, 
       #{sa_recorderid,jdbcType=INTEGER}, #{sa_recorder,jdbcType=VARCHAR}, #{sa_recorddate,jdbcType=TIMESTAMP}, 
-      #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{sa_text1,jdbcType=VARCHAR}, #{sa_text2,jdbcType=VARCHAR}, #{sa_text3,jdbcType=VARCHAR}, 
       #{sa_text4,jdbcType=VARCHAR}, #{sa_text5,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.sale.po.Sale" >
+    <selectKey  resultType="java.lang.Long" keyProperty="id">
+      SELECT LAST_INSERT_ID() AS ID
+    </selectKey>
     insert into sale
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="sa_code != null" >
@@ -119,8 +122,8 @@
       <if test="sa_recorddate != null" >
         sa_recorddate,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
       <if test="updaterId != null" >
         updaterId,
@@ -196,8 +199,8 @@
       <if test="sa_recorddate != null" >
         #{sa_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
@@ -277,7 +280,7 @@
         sa_recorddate = #{sa_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="companyId != null" >
-        companyid = #{companyId,jdbcType=INTEGER},
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -322,7 +325,7 @@
       sa_recorderid = #{sa_recorderid,jdbcType=INTEGER},
       sa_recorder = #{sa_recorder,jdbcType=VARCHAR},
       sa_recorddate = #{sa_recorddate,jdbcType=TIMESTAMP},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},
       sa_text1 = #{sa_text1,jdbcType=VARCHAR},

applications/sale/sale-server/src/main/resources/mapper/SaledetailMapper.xml

@@ -277,33 +277,6 @@
     </set>
     where sd_id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.sale.po.SaleDetail" >
-    update saledetail
-    set sd_said = #{sd_said,jdbcType=INTEGER},
-      sd_detno = #{sd_detno,jdbcType=INTEGER},
-      sd_prodid = #{sd_prodid,jdbcType=INTEGER},
-      sd_prodcode = #{sd_prodcode,jdbcType=VARCHAR},
-      sd_qty = #{sd_qty,jdbcType=DOUBLE},
-      sd_price = #{sd_price,jdbcType=DOUBLE},
-      sd_total = #{sd_total,jdbcType=DOUBLE},
-      sd_taxrate = #{sd_taxrate,jdbcType=DOUBLE},
-      sd_netprice = #{sd_netprice,jdbcType=DOUBLE},
-      sd_nettotal = #{sd_nettotal,jdbcType=DOUBLE},
-      sd_delivery = #{sd_delivery,jdbcType=TIMESTAMP},
-      sd_sendqty = #{sd_sendqty,jdbcType=DOUBLE},
-      sd_pdqty = #{sd_pdqty,jdbcType=DOUBLE},
-      sd_remark = #{sd_remark,jdbcType=VARCHAR},
-      companyId = #{companyId,jdbcType=INTEGER},
-      updaterId = #{updaterId,jdbcType=INTEGER},
-      updateTime = #{updateTime,jdbcType=TIMESTAMP},
-      sd_text1 = #{sd_text1,jdbcType=VARCHAR},
-      sd_text2 = #{sd_text2,jdbcType=VARCHAR},
-      sd_text3 = #{sd_text3,jdbcType=VARCHAR},
-      sd_text4 = #{sd_text4,jdbcType=VARCHAR},
-      sd_text5 = #{sd_text5,jdbcType=VARCHAR}
-    where sd_id = #{id,jdbcType=INTEGER}
-  </update>
-
   <insert id="batchInsert" parameterType="java.util.List" >
     insert into saledetail (sd_said, sd_detno,
     sd_prodid, sd_prodcode, sd_qty,
@@ -316,24 +289,24 @@
     values
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       (
-      (#{item.sd_said,jdbcType=INTEGER}, #{item.sd_detno,jdbcType=INTEGER},
+      #{item.sd_said,jdbcType=INTEGER}, #{item.sd_detno,jdbcType=INTEGER},
       #{item.sd_prodid,jdbcType=INTEGER}, #{item.sd_prodcode,jdbcType=VARCHAR}, #{item.sd_qty,jdbcType=DOUBLE},
       #{item.sd_price,jdbcType=DOUBLE}, #{item.sd_total,jdbcType=DOUBLE}, #{item.sd_taxrate,jdbcType=DOUBLE},
       #{item.sd_netprice,jdbcType=DOUBLE}, #{item.sd_nettotal,jdbcType=DOUBLE}, #{item.sd_delivery,jdbcType=TIMESTAMP},
       #{item.sd_sendqty,jdbcType=DOUBLE}, #{item.sd_pdqty,jdbcType=DOUBLE}, #{item.sd_remark,jdbcType=VARCHAR},
       #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER}, #{item.updateTime,jdbcType=TIMESTAMP},
       #{item.sd_text1,jdbcType=VARCHAR}, #{item.sd_text2,jdbcType=VARCHAR}, #{item.sd_text3,jdbcType=VARCHAR},
-      #{item.sd_text4,jdbcType=VARCHAR}, #{item.sd_text5,jdbcType=VARCHAR})
+      #{item.sd_text4,jdbcType=VARCHAR}, #{item.sd_text5,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>
   <update id="batchUpdate" parameterType="com.usoftchina.saas.sale.po.SaleDetail" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update saledetail <set>
-      set sd_said = #{item.sd_said,jdbcType=INTEGER},
-      sd_detno = #{item.sd_detno,jdbcType=INTEGER},
-      sd_prodid = #{item.sd_prodid,jdbcType=INTEGER},
-      sd_prodcode = #{item.sd_prodcode,jdbcType=VARCHAR},
+       sd_said = #{item.sd_said},
+      sd_detno = #{item.sd_detno},
+      sd_prodid = #{item.sd_prodid},
+      sd_prodcode = #{item.sd_prodcode},
       sd_qty = #{item.sd_qty,jdbcType=DOUBLE},
       sd_price = #{item.sd_price,jdbcType=DOUBLE},
       sd_total = #{item.sd_total,jdbcType=DOUBLE},

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -102,8 +102,8 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
         // 只有一个从表时从表字段改为items
         if(detailCount == 1) {
-            params.items = params.item1;
-            delete params.item1;
+            params.items = params.items1;
+            delete params.items1;
         }
 
         me.BaseUtil.request({
@@ -172,8 +172,8 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
         // 只有一个从表时从表字段改为items
         if(detailCount == 1) {
-            params.items = params.item1;
-            delete params.item1;
+            params.items = params.items1;
+            delete params.items1;
         }
 
         me.BaseUtil.request({