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

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/Make.java

@@ -36,12 +36,6 @@ public class Make extends CommonBaseEntity implements Serializable {
 
     private String ma_whname;
 
-    private Date ma_recorddate;
-
-    private Integer ma_recordid;
-
-    private String ma_recorder;
-
     private Double ma_price;
 
     private Double ma_total;

applications/storage/storage-server/src/main/resources/mapper/MakeMapper.xml

@@ -17,9 +17,6 @@
     <result column="ma_whid" property="ma_whid" jdbcType="INTEGER" />
     <result column="ma_whcode" property="ma_whcode" jdbcType="VARCHAR" />
     <result column="ma_whname" property="ma_whname" jdbcType="VARCHAR" />
-    <result column="ma_recorddate" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="ma_recordid" property="ma_recordid" jdbcType="INTEGER" />
-    <result column="ma_recorder" property="ma_recorder" jdbcType="VARCHAR" />
     <result column="ma_price" property="ma_price" jdbcType="DOUBLE" />
     <result column="ma_total" property="ma_total" jdbcType="DOUBLE" />
     <result column="ma_auditman" property="ma_auditman" jdbcType="DOUBLE" />
@@ -40,10 +37,6 @@
 
 
 
-
-
-
-
   <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <id column="pi_id" jdbcType="INTEGER" property="id" />
     <result column="pi_inoutno" jdbcType="VARCHAR" property="pi_inoutno" />
@@ -86,15 +79,9 @@
   </resultMap>
 
 
-
-
-
-
-
   <sql id="Base_Column_List" >
     ma_id, ma_code, ma_status, ma_statuscode, ma_type, ma_prodid, ma_prodcode, ma_proddetail, 
-    ma_prodspec, ma_version, ma_produnit, ma_qty, ma_whid, ma_whcode, ma_whname, ma_recorddate,
-    ma_recordid, ma_recorder, ma_price, ma_total,ma_auditman,ma_auditdate, companyId, updaterId,updaterName,updateTime,creatorid,creatorName,createtime, ma_text1,
+    ma_prodspec, ma_version, ma_produnit, ma_qty, ma_whid, ma_whcode, ma_whname,ma_price, ma_total,ma_auditman,ma_auditdate, companyId, updaterId,updaterName,updateTime,creatorid,creatorName,createtime, ma_text1,
     ma_text2, ma_text3, ma_text4, ma_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -115,8 +102,7 @@
       ma_statuscode, ma_type, ma_prodid, 
       ma_prodcode, ma_proddetail, ma_prodspec, 
       ma_version, ma_produnit, ma_qty, 
-      ma_whid, ma_whcode, ma_whname, ma_recorddate,
-      ma_recordid, ma_recorder, ma_price, 
+      ma_whid, ma_whcode, ma_whname, ma_price,
       ma_total, ma_auditman,ma_auditdate,companyId, updaterId,
       updateTime, ma_text1, ma_text2, 
       ma_text3, ma_text4, ma_text5
@@ -125,8 +111,7 @@
       #{ma_statuscode,jdbcType=VARCHAR}, #{ma_type,jdbcType=VARCHAR}, #{ma_prodid,jdbcType=INTEGER}, 
       #{ma_prodcode,jdbcType=VARCHAR}, #{ma_proddetail,jdbcType=VARCHAR}, #{ma_prodspec,jdbcType=VARCHAR}, 
       #{ma_version,jdbcType=VARCHAR}, #{ma_produnit,jdbcType=VARCHAR}, #{ma_qty,jdbcType=DOUBLE}, 
-      #{ma_whid,jdbcType=INTEGER}, #{ma_whcode,jdbcType=VARCHAR}, #{ma_whname,jdbcType=VARCHAR}, #{ma_recorddate,jdbcType=TIMESTAMP},
-      #{ma_recordid,jdbcType=INTEGER}, #{ma_recorder,jdbcType=VARCHAR}, #{ma_price,jdbcType=DOUBLE}, 
+      #{ma_whid,jdbcType=INTEGER}, #{ma_whcode,jdbcType=VARCHAR}, #{ma_whname,jdbcType=VARCHAR}, #{ma_price,jdbcType=DOUBLE},
       #{ma_total,jdbcType=DOUBLE}, #{ma_auditman,jdbcType=VARCHAR},#{ma_auditdate.jdbcType=TIMESTAMP},#{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{ma_text1,jdbcType=VARCHAR}, #{ma_text2,jdbcType=VARCHAR}, 
       #{ma_text3,jdbcType=VARCHAR}, #{ma_text4,jdbcType=VARCHAR}, #{ma_text5,jdbcType=VARCHAR}
@@ -181,15 +166,6 @@
       <if test="ma_whname != null">
         ma_whname,
       </if>
-      <if test="ma_recorddate != null">
-        ma_recorddate,
-      </if>
-      <if test="ma_recordid != null">
-        ma_recordid,
-      </if>
-      <if test="ma_recorder != null">
-        ma_recorder,
-      </if>
       <if test="ma_price != null">
         ma_price,
       </if>
@@ -283,15 +259,6 @@
       <if test="ma_whname != null">
         #{ma_whname,jdbcType=VARCHAR},
       </if>
-      <if test="ma_recorddate != null">
-        #{ma_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ma_recordid != null">
-        #{ma_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ma_recorder != null">
-        #{ma_recorder,jdbcType=VARCHAR},
-      </if>
       <if test="ma_price != null">
         #{ma_price,jdbcType=DOUBLE},
       </if>
@@ -387,15 +354,6 @@
       <if test="ma_whname != null" >
         ma_whname = #{ma_whname,jdbcType=VARCHAR},
       </if>
-      <if test="ma_recorddate != null" >
-        ma_recorddate = #{ma_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ma_recordid != null" >
-        ma_recordid = #{ma_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ma_recorder != null" >
-        ma_recorder = #{ma_recorder,jdbcType=VARCHAR},
-      </if>
       <if test="ma_price != null" >
         ma_price = #{ma_price,jdbcType=DOUBLE},
       </if>
@@ -408,9 +366,6 @@
       <if test="ma_auditdate !=null">
         ma_auditdate =  #{ma_auditdate,jdbcType=TIMESTAMP},
       </if>
-
-
-
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -454,14 +409,10 @@
       ma_whid = #{ma_whid,jdbcType=INTEGER},
       ma_whcode = #{ma_whcode,jdbcType=VARCHAR},
       ma_whname = #{ma_whname,jdbcType=VARCHAR},
-      ma_recorddate = #{ma_recorddate,jdbcType=TIMESTAMP},
-      ma_recordid = #{ma_recordid,jdbcType=INTEGER},
-      ma_recorder = #{ma_recorder,jdbcType=VARCHAR},
       ma_price = #{ma_price,jdbcType=DOUBLE},
       ma_total = #{ma_total,jdbcType=DOUBLE},
       ma_auditman = #{ma_auditman,jdbcType=VARCHAR},
       ma_auditdate = #{ma_auditdate,jdbcType=TIMESTAMP},
-
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},

applications/storage/storage-server/src/main/resources/mapper/MakematerialMapper.xml

@@ -150,9 +150,9 @@
       <if test="mm_whcode != null" >
         #{mm_whcode,jdbcType=VARCHAR},
       </if>
-        <if test="mm_whname != null" >
-            #{mm_whname,jdbcType=VARCHAR},
-        </if>
+      <if test="mm_whname != null" >
+          #{mm_whname,jdbcType=VARCHAR},
+      </if>
       <if test="mm_price != null" >
         #{mm_price,jdbcType=DOUBLE},
       </if>
@@ -203,9 +203,9 @@
       <if test="mm_whcode != null" >
         mm_whcode = #{mm_whcode,jdbcType=VARCHAR},
       </if>
-        <if test="mm_whname != null" >
-            mm_whname = #{mm_whname,jdbcType=VARCHAR},
-        </if>
+      <if test="mm_whname != null" >
+          mm_whname = #{mm_whname,jdbcType=VARCHAR},
+      </if>
       <if test="mm_price != null" >
         mm_price = #{mm_price,jdbcType=DOUBLE},
       </if>
@@ -303,9 +303,9 @@
         <if test="item.mm_whcode != null" >
           mm_whcode = #{item.mm_whcode,jdbcType=VARCHAR},
         </if>
-          <if test="item.mm_whname != null" >
-              mm_whname = #{item.mm_whname,jdbcType=VARCHAR},
-          </if>
+        <if test="item.mm_whname != null" >
+            mm_whname = #{item.mm_whname,jdbcType=VARCHAR},
+        </if>
         <if test="item.mm_price != null" >
           mm_price = #{item.mm_price,jdbcType=DOUBLE},
         </if>