转储功能微调

src/main/java/com/chinaitop/depot/storage/mapper/StorageDumpMapper.java

@@ -1,39 +1,40 @@
-package com.chinaitop.depot.storage.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import com.chinaitop.depot.storage.model.StorageDump;
-import com.chinaitop.depot.storage.model.StorageDumpExample;
-
-public interface StorageDumpMapper {
-    int countByExample(StorageDumpExample example);
-
-    int deleteByExample(StorageDumpExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(StorageDump record);
-
-    int insertSelective(StorageDump record);
-
-    List<StorageDump> selectByExample(StorageDumpExample example);
-
-    StorageDump selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(StorageDumpExample example);
-
-    int updateByExample(StorageDumpExample example);
-
-    int updateByPrimaryKeySelective(StorageDump record);
-
-    int updateByPrimaryKey(StorageDump record);
-
-    /**
-     * 查询验收通过的数据
-     * 
-     * @param orgId 单位ID
-     * @return
-     */
-    List<Map<String, Object>> selectYswData(Integer orgId);
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageDump;
+import com.chinaitop.depot.storage.model.StorageDumpExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageDumpMapper {
+    int countByExample(StorageDumpExample example);
+
+    int deleteByExample(StorageDumpExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageDump record);
+
+    int insertSelective(StorageDump record);
+
+    List<StorageDump> selectByExample(StorageDumpExample example);
+
+    StorageDump selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageDump record, @Param("example") StorageDumpExample example);
+
+    int updateByExample(@Param("record") StorageDump record, @Param("example") StorageDumpExample example);
+
+    int updateByPrimaryKeySelective(StorageDump record);
+
+    int updateByPrimaryKey(StorageDump record);
+
+    /**
+     * 查询验收通过的数据
+     * 
+     * @param orgId 单位ID
+     * @return
+     */
+    List<Map<String, Object>> selectYswData(Integer orgId);
 }

src/main/java/com/chinaitop/depot/storage/mapper/StorageDumpMapper.xml

@@ -19,9 +19,13 @@
     <result column="business_create_time" jdbcType="TIMESTAMP" property="businessCreateTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_person" jdbcType="VARCHAR" property="createPerson" />
+    <result column="ccshr" jdbcType="VARCHAR" property="ccshr" />
+    <result column="zjshr" jdbcType="VARCHAR" property="zjshr" />
+    <result column="tjshr" jdbcType="VARCHAR" property="tjshr" />
+    <result column="kjshr" jdbcType="VARCHAR" property="kjshr" />
+    <result column="ldshr" jdbcType="VARCHAR" property="ldshr" />
     <result column="is_upload" jdbcType="INTEGER" property="isUpload" />
     <result column="upload_time" jdbcType="TIMESTAMP" property="uploadTime" />
-    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -82,8 +86,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, ys_id, org_id, house_id, ware_id, lspz, y_lsxz, x_lsxz, lsdj, clsl, zjjg, ys_status, 
-    business_create_time, create_time, create_person, is_upload, upload_time, updatetime
+    id, ys_id, org_id, house_id, ware_id, lspz, y_lsxz, x_lsxz, lsdj, clsl, transfer_quantity, 
+    approval_no, zjjg, ys_status, business_create_time, create_time, create_person, ccshr, 
+    zjshr, tjshr, kjshr, ldshr, is_upload, upload_time
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageDumpExample" resultMap="BaseResultMap">
     select
@@ -119,17 +124,19 @@
     insert into storage_dump (id, ys_id, org_id, 
       house_id, ware_id, lspz, 
       y_lsxz, x_lsxz, lsdj, 
-      clsl, zjjg, ys_status, 
-      business_create_time, create_time, create_person, 
-      is_upload, upload_time, updatetime
-      )
+      clsl, transfer_quantity, approval_no, 
+      zjjg, ys_status, business_create_time, 
+      create_time, create_person, ccshr, 
+      zjshr, tjshr, kjshr, 
+      ldshr, is_upload, upload_time)
     values (#{id,jdbcType=INTEGER}, #{ysId,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, 
       #{houseId,jdbcType=VARCHAR}, #{wareId,jdbcType=VARCHAR}, #{lspz,jdbcType=INTEGER}, 
       #{yLsxz,jdbcType=INTEGER}, #{xLsxz,jdbcType=INTEGER}, #{lsdj,jdbcType=INTEGER}, 
-      #{clsl,jdbcType=DECIMAL}, #{zjjg,jdbcType=VARCHAR}, #{ysStatus,jdbcType=VARCHAR}, 
-      #{businessCreateTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{createPerson,jdbcType=VARCHAR}, 
-      #{isUpload,jdbcType=INTEGER}, #{uploadTime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}
-      )
+      #{clsl,jdbcType=DECIMAL}, #{transferQuantity,jdbcType=DECIMAL}, #{approvalNo,jdbcType=VARCHAR}, 
+      #{zjjg,jdbcType=VARCHAR}, #{ysStatus,jdbcType=VARCHAR}, #{businessCreateTime,jdbcType=TIMESTAMP}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{createPerson,jdbcType=VARCHAR}, #{ccshr,jdbcType=VARCHAR}, 
+      #{zjshr,jdbcType=VARCHAR}, #{tjshr,jdbcType=VARCHAR}, #{kjshr,jdbcType=VARCHAR}, 
+      #{ldshr,jdbcType=VARCHAR}, #{isUpload,jdbcType=INTEGER}, #{uploadTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageDump">
     insert into storage_dump
@@ -185,15 +192,27 @@
       <if test="createPerson != null">
         create_person,
       </if>
+      <if test="ccshr != null">
+        ccshr,
+      </if>
+      <if test="zjshr != null">
+        zjshr,
+      </if>
+      <if test="tjshr != null">
+        tjshr,
+      </if>
+      <if test="kjshr != null">
+        kjshr,
+      </if>
+      <if test="ldshr != null">
+        ldshr,
+      </if>
       <if test="isUpload != null">
         is_upload,
       </if>
       <if test="uploadTime != null">
         upload_time,
       </if>
-      <if test="updatetime != null">
-        updatetime,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -247,15 +266,27 @@
       <if test="createPerson != null">
         #{createPerson,jdbcType=VARCHAR},
       </if>
+      <if test="ccshr != null">
+        #{ccshr,jdbcType=VARCHAR},
+      </if>
+      <if test="zjshr != null">
+        #{zjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="tjshr != null">
+        #{tjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="kjshr != null">
+        #{kjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="ldshr != null">
+        #{ldshr,jdbcType=VARCHAR},
+      </if>
       <if test="isUpload != null">
         #{isUpload,jdbcType=INTEGER},
       </if>
       <if test="uploadTime != null">
         #{uploadTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updatetime != null">
-        #{updatetime,jdbcType=TIMESTAMP},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageDumpExample" resultType="java.lang.Integer">
@@ -297,6 +328,12 @@
       <if test="record.clsl != null">
         clsl = #{record.clsl,jdbcType=DECIMAL},
       </if>
+      <if test="record.transferQuantity != null">
+        transfer_quantity = #{record.transferQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="record.approvalNo != null">
+        approval_no = #{record.approvalNo,jdbcType=VARCHAR},
+      </if>
       <if test="record.zjjg != null">
         zjjg = #{record.zjjg,jdbcType=VARCHAR},
       </if>
@@ -312,15 +349,27 @@
       <if test="record.createPerson != null">
         create_person = #{record.createPerson,jdbcType=VARCHAR},
       </if>
+      <if test="record.ccshr != null">
+        ccshr = #{record.ccshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zjshr != null">
+        zjshr = #{record.zjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tjshr != null">
+        tjshr = #{record.tjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.kjshr != null">
+        kjshr = #{record.kjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ldshr != null">
+        ldshr = #{record.ldshr,jdbcType=VARCHAR},
+      </if>
       <if test="record.isUpload != null">
         is_upload = #{record.isUpload,jdbcType=INTEGER},
       </if>
       <if test="record.uploadTime != null">
         upload_time = #{record.uploadTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.updatetime != null">
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -338,14 +387,20 @@
       x_lsxz = #{record.xLsxz,jdbcType=INTEGER},
       lsdj = #{record.lsdj,jdbcType=INTEGER},
       clsl = #{record.clsl,jdbcType=DECIMAL},
+      transfer_quantity = #{record.transferQuantity,jdbcType=DECIMAL},
+      approval_no = #{record.approvalNo,jdbcType=VARCHAR},
       zjjg = #{record.zjjg,jdbcType=VARCHAR},
       ys_status = #{record.ysStatus,jdbcType=VARCHAR},
       business_create_time = #{record.businessCreateTime,jdbcType=TIMESTAMP},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       create_person = #{record.createPerson,jdbcType=VARCHAR},
+      ccshr = #{record.ccshr,jdbcType=VARCHAR},
+      zjshr = #{record.zjshr,jdbcType=VARCHAR},
+      tjshr = #{record.tjshr,jdbcType=VARCHAR},
+      kjshr = #{record.kjshr,jdbcType=VARCHAR},
+      ldshr = #{record.ldshr,jdbcType=VARCHAR},
       is_upload = #{record.isUpload,jdbcType=INTEGER},
       upload_time = #{record.uploadTime,jdbcType=TIMESTAMP},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -380,6 +435,12 @@
       <if test="clsl != null">
         clsl = #{clsl,jdbcType=DECIMAL},
       </if>
+      <if test="transferQuantity != null">
+        transfer_quantity = #{transferQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="approvalNo != null">
+        approval_no = #{approvalNo,jdbcType=VARCHAR},
+      </if>
       <if test="zjjg != null">
         zjjg = #{zjjg,jdbcType=VARCHAR},
       </if>
@@ -395,15 +456,27 @@
       <if test="createPerson != null">
         create_person = #{createPerson,jdbcType=VARCHAR},
       </if>
+      <if test="ccshr != null">
+        ccshr = #{ccshr,jdbcType=VARCHAR},
+      </if>
+      <if test="zjshr != null">
+        zjshr = #{zjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="tjshr != null">
+        tjshr = #{tjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="kjshr != null">
+        kjshr = #{kjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="ldshr != null">
+        ldshr = #{ldshr,jdbcType=VARCHAR},
+      </if>
       <if test="isUpload != null">
         is_upload = #{isUpload,jdbcType=INTEGER},
       </if>
       <if test="uploadTime != null">
         upload_time = #{uploadTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updatetime != null">
-        updatetime = #{updatetime,jdbcType=TIMESTAMP},
-      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -418,16 +491,23 @@
       x_lsxz = #{xLsxz,jdbcType=INTEGER},
       lsdj = #{lsdj,jdbcType=INTEGER},
       clsl = #{clsl,jdbcType=DECIMAL},
+      transfer_quantity = #{transferQuantity,jdbcType=DECIMAL},
+      approval_no = #{approvalNo,jdbcType=VARCHAR},
       zjjg = #{zjjg,jdbcType=VARCHAR},
       ys_status = #{ysStatus,jdbcType=VARCHAR},
       business_create_time = #{businessCreateTime,jdbcType=TIMESTAMP},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       create_person = #{createPerson,jdbcType=VARCHAR},
+      ccshr = #{ccshr,jdbcType=VARCHAR},
+      zjshr = #{zjshr,jdbcType=VARCHAR},
+      tjshr = #{tjshr,jdbcType=VARCHAR},
+      kjshr = #{kjshr,jdbcType=VARCHAR},
+      ldshr = #{ldshr,jdbcType=VARCHAR},
       is_upload = #{isUpload,jdbcType=INTEGER},
-      upload_time = #{uploadTime,jdbcType=TIMESTAMP},
-      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+      upload_time = #{uploadTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
   <!-- 查询验收过通过的数据 -->
   <select id="selectYswData" parameterType="java.util.Map" resultType="java.util.Map">
     SELECT datas.* FROM 

src/main/java/com/chinaitop/depot/storage/model/StorageDump.java

@@ -23,7 +23,7 @@ public class StorageDump {
     private Integer lsdj;
 
     private BigDecimal clsl;
-    
+
     private BigDecimal transferQuantity;
 
     private String approvalNo;
@@ -38,6 +38,16 @@ public class StorageDump {
 
     private String createPerson;
 
+    private String ccshr;
+
+    private String zjshr;
+
+    private String tjshr;
+
+    private String kjshr;
+
+    private String ldshr;
+
     private Integer isUpload;
 
     private Date uploadTime;
@@ -203,22 +213,38 @@ public class StorageDump {
     public void setClsl(BigDecimal clsl) {
         this.clsl = clsl;
     }
-    
+
+    /**
+     * 划转数量(单位：公斤)
+     * @return transfer_quantity 划转数量(单位：公斤)
+     */
     public BigDecimal getTransferQuantity() {
-		return transferQuantity;
-	}
+        return transferQuantity;
+    }
 
-	public void setTransferQuantity(BigDecimal transferQuantity) {
-		this.transferQuantity = transferQuantity;
-	}
+    /**
+     * 划转数量(单位：公斤)
+     * @param transferQuantity 划转数量(单位：公斤)
+     */
+    public void setTransferQuantity(BigDecimal transferQuantity) {
+        this.transferQuantity = transferQuantity;
+    }
 
-	public String getApprovalNo() {
-		return approvalNo;
-	}
+    /**
+     * 批准文号
+     * @return approval_no 批准文号
+     */
+    public String getApprovalNo() {
+        return approvalNo;
+    }
 
-	public void setApprovalNo(String approvalNo) {
-		this.approvalNo = approvalNo;
-	}
+    /**
+     * 批准文号
+     * @param approvalNo 批准文号
+     */
+    public void setApprovalNo(String approvalNo) {
+        this.approvalNo = approvalNo == null ? null : approvalNo.trim();
+    }
 
     /**
      * 质检结果
@@ -301,6 +327,86 @@ public class StorageDump {
     }
 
     /**
+     * 仓储审核人
+     * @return ccshr 仓储审核人
+     */
+    public String getCcshr() {
+        return ccshr;
+    }
+
+    /**
+     * 仓储审核人
+     * @param ccshr 仓储审核人
+     */
+    public void setCcshr(String ccshr) {
+        this.ccshr = ccshr == null ? null : ccshr.trim();
+    }
+
+    /**
+     * 质检审核人
+     * @return zjshr 质检审核人
+     */
+    public String getZjshr() {
+        return zjshr;
+    }
+
+    /**
+     * 质检审核人
+     * @param zjshr 质检审核人
+     */
+    public void setZjshr(String zjshr) {
+        this.zjshr = zjshr == null ? null : zjshr.trim();
+    }
+
+    /**
+     * 统计审核人
+     * @return tjshr 统计审核人
+     */
+    public String getTjshr() {
+        return tjshr;
+    }
+
+    /**
+     * 统计审核人
+     * @param tjshr 统计审核人
+     */
+    public void setTjshr(String tjshr) {
+        this.tjshr = tjshr == null ? null : tjshr.trim();
+    }
+
+    /**
+     * 会计审核人
+     * @return kjshr 会计审核人
+     */
+    public String getKjshr() {
+        return kjshr;
+    }
+
+    /**
+     * 会计审核人
+     * @param kjshr 会计审核人
+     */
+    public void setKjshr(String kjshr) {
+        this.kjshr = kjshr == null ? null : kjshr.trim();
+    }
+
+    /**
+     * 领导审核人
+     * @return ldshr 领导审核人
+     */
+    public String getLdshr() {
+        return ldshr;
+    }
+
+    /**
+     * 领导审核人
+     * @param ldshr 领导审核人
+     */
+    public void setLdshr(String ldshr) {
+        this.ldshr = ldshr == null ? null : ldshr.trim();
+    }
+
+    /**
      * 上传状态(1上传成功,0需上传修改,null未上传)
      * @return is_upload 上传状态(1上传成功,0需上传修改,null未上传)
      */

src/main/java/com/chinaitop/depot/storage/service/impl/StorageDumpServiceImpl.java

@@ -1,19 +1,11 @@
 package com.chinaitop.depot.storage.service.impl;
 
-import java.io.BufferedInputStream;
-import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import javax.annotation.Resource;
-import javax.xml.namespace.QName;
 
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
-import org.apache.cxf.service.model.BindingInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.depot.storage.mapper.StorageDumpMapper;
@@ -21,8 +13,6 @@ import com.chinaitop.depot.storage.model.StorageDump;
 import com.chinaitop.depot.storage.model.StorageDumpExample;
 import com.chinaitop.depot.storage.service.StorageDumpService;
 
-import net.sf.json.JSONObject;
-
 @Service
 public class StorageDumpServiceImpl implements StorageDumpService {