代码合并,冲突解决

applications/commons/commons-server/src/main/resources/application.yml

@@ -45,7 +45,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8920
   tomcat:

applications/document/document-server/src/main/resources/application.yml

@@ -47,8 +47,8 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-#      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.31:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+#      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.31:8510/eureka/
 server:
   port: 9480
   tomcat:

applications/money/money-dto/pom.xml

@@ -24,6 +24,10 @@
             <artifactId>springfox-swagger2</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-servlet</artifactId>
+        </dependency>
     </dependencies>
 
 

applications/money/money-server/src/main/docker/Dockerfile

@@ -0,0 +1,6 @@
+FROM frolvlad/alpine-oraclejdk8:slim
+VOLUME /tmp
+ADD money-server-1.0.0-SNAPSHOT.jar app.jar
+RUN sh -c 'touch /app.jar'
+ENV JAVA_OPTS=""
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/VerificationController.java

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.controller;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.dto.VerificationFormDTO;
 import com.usoftchina.saas.money.dto.VerificationListDTO;
 import com.usoftchina.saas.money.dto.VerificationReqDTO;
@@ -34,8 +35,8 @@ public class VerificationController {
      * @return
      */
     @RequestMapping("/list")
-    public Result<PageInfo<VerificationList>> getListData(PageRequest page, VerificationReqDTO req) {
-        PageInfo<VerificationListDTO> listData = verificationService.getListData(page, req);
+    public Result<PageInfo<VerificationList>> getListData(PageRequest page, ListReqDTO req) {
+        PageInfo<VerificationList> listData = verificationService.getListData(page, req);
         return Result.success(listData);
     }
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationListMapper.java

@@ -1,8 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
-import com.usoftchina.saas.money.dto.VerificationListDTO;
-import com.usoftchina.saas.money.dto.VerificationReqDTO;
 import com.usoftchina.saas.money.po.VerificationList;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,6 +10,6 @@ import java.util.List;
  * @createtime 2018-10-22 20:12
  */
 public interface VerificationListMapper {
-    List<VerificationListDTO> selectVerificationListByCondition(VerificationReqDTO reqDTO);
-    List<VerificationListDTO> selectVerificationBycondition(VerificationReqDTO reqDTO);
+    List<VerificationList> selectVerificationListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    List<VerificationList> selectVerificationBycondition(@Param("con") String con,@Param("companyId") Long companyId);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetMapper.java

@@ -38,4 +38,6 @@ public interface VerificationdetMapper extends CommonBaseMapper<Verificationdet>
     void batchUpdate(List<Verificationdet> list);
 
     int deleteByParentPrimaryKey(Long vd_vcid);
+
+    List<Verificationdet> selectByFK(Long vc_id);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetailMapper.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.money.po.Verificationdet;
 import com.usoftchina.saas.money.po.Verificationdetail;
 import java.util.List;
 
@@ -40,4 +41,6 @@ public interface VerificationdetailMapper extends CommonBaseMapper<Verificationd
     void batchUpdate(List<Verificationdetail> list);
 
     int deleteByParentPrimaryKey(Long vcd_vcid);
+
+    List<Verificationdetail> selectByFK(Long vc_id);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Verification.java

@@ -302,4 +302,24 @@ public class Verification extends CommonBaseEntity implements Serializable {
     public void setVc_text5(String vc_text5) {
         this.vc_text5 = vc_text5 == null ? null : vc_text5.trim();
     }
+
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VerificationList.java

@@ -134,4 +134,5 @@ public class VerificationList extends CommonBaseEntity implements Serializable {
     private String vcd_text4;
 
     private String vcd_text5;
+
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/VerificationService.java

@@ -2,9 +2,11 @@ package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.dto.VerificationFormDTO;
 import com.usoftchina.saas.money.dto.VerificationListDTO;
 import com.usoftchina.saas.money.dto.VerificationReqDTO;
+import com.usoftchina.saas.money.po.VerificationList;
 import com.usoftchina.saas.page.PageRequest;
 
 /**
@@ -18,7 +20,7 @@ public interface VerificationService {
      * @param page,req
      * @return
      */
-    PageInfo<VerificationListDTO> getListData(PageRequest page, VerificationReqDTO req);
+    PageInfo<VerificationList> getListData(PageRequest page, ListReqDTO req);
     /**
      * 获取核销表单
      *

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.Operation;
 import com.usoftchina.saas.commons.service.MaxnumberService;
@@ -45,7 +46,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
 
 
     @Override
-    public PageInfo<VerificationListDTO> getListData(PageRequest page, VerificationReqDTO req) {
+    public PageInfo<VerificationList> getListData(PageRequest page, ListReqDTO req) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -54,14 +55,19 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
         //查询数据
-        List<VerificationListDTO> lists = new ArrayList<VerificationListDTO>();
+        List<VerificationList> lists = new ArrayList<VerificationList>();
+        Long companyId = BaseContextHolder.getCompanyId();
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
         if (null == req || StringUtils.isEmpty(req.getMode()) || "MAIN".equals(req.getMode())) {
-            lists = verificationListMapper.selectVerificationListByCondition(req);
+            lists = verificationListMapper.selectVerificationListByCondition(con, companyId);
         } else {
-            lists = verificationListMapper.selectVerificationBycondition(req);
+            lists = verificationListMapper.selectVerificationBycondition(con, companyId);
         }
         //取分页信息
-        PageInfo<VerificationListDTO> pageInfo = new PageInfo<VerificationListDTO>(lists);
+        PageInfo<VerificationList> pageInfo = new PageInfo<VerificationList>(lists);
         return pageInfo;
     }
 
@@ -74,25 +80,18 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
     public VerificationFormDTO getFormData(Long id) {
         VerificationFormDTO  verificationFormDTO = new VerificationFormDTO();
         //查询主表
-        Verification verification = getMapper().selectByPrimaryKey(id);
+        Verification verification = getMapper().selectByPrimaryKey(Integer.valueOf(String.valueOf(id)));
         VerificationDTO main = BeanMapper.map(verification,VerificationDTO.class);
-        //查询两个从表
-        VerificationdetExample verificationdetExample = new VerificationdetExample();
-        VerificationdetailExample verificationdetailExample = new VerificationdetailExample();
-        //明细1
-        VerificationdetExample.Criteria cta = verificationdetExample.createCriteria();
-        cta.andVd_idEqualTo(id.intValue());
-        List<Verificationdet> verificationdet = verificationdetMapper.selectByExample(verificationdetExample);
-        List<VerificationdetDTO> items1 = BeanMapper.mapList(verificationdet,VerificationdetDTO.class);
-        //明细2
-        VerificationdetailExample.Criteria cta2 = verificationdetailExample.createCriteria();
-        cta2.andVcd_vcidEqualTo(id.intValue());
-        List<Verificationdetail> verificationdetail = verificationdetailMapper.selectByExample(verificationdetailExample);
-        List<VerificationdetailDTO> items2 = BeanMapper.mapList(verificationdetail,VerificationdetailDTO.class);
 
+        List<Verificationdet> verificationdet = verificationdetMapper.selectByFK(id);
+        List<VerificationdetDTO> items1 = BeanMapper.mapList(verificationdet, VerificationdetDTO.class);
+
+        List<Verificationdetail> verificationdetail = verificationdetailMapper.selectByFK(id);
+        List<VerificationdetailDTO> items2 = BeanMapper.mapList(verificationdetail, VerificationdetailDTO.class);
         verificationFormDTO.setMain(main);
         verificationFormDTO.setItems1(items1);
         verificationFormDTO.setItems2(items2);
+
         return  verificationFormDTO;
     }
 

applications/money/money-server/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
       name: admin
       password: select111***
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
@@ -44,7 +44,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@localhost:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8920
   tomcat:

applications/money/money-server/src/main/resources/config/application-docker.yml

@@ -0,0 +1,10 @@
+eureka:
+  instance:
+    hostname: saas-money-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
+spring:
+  rabbitmq:
+    virtual-host: docker

applications/money/money-server/src/main/resources/mapper/VerificationListMapper.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.money.mapper.VerificationListMapper" >
-    <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Verification" >
+    <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.VerificationList" >
         <id column="vc_id" property="vc_id" jdbcType="INTEGER" />
         <result column="vc_code" property="vc_code" jdbcType="VARCHAR" />
         <result column="vc_kind" property="vc_kind" jdbcType="VARCHAR" />
@@ -25,19 +25,49 @@
         <result column="vc_status" property="vc_status" jdbcType="INTEGER" />
         <result column="vc_statuscode" property="vc_statuscode" jdbcType="DECIMAL" />
         <result column="vc_remark" property="vc_remark" jdbcType="VARCHAR" />
-        <result column="companyid" property="companyid" jdbcType="INTEGER" />
-        <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-        <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
         <result column="vc_text1" property="vc_text1" jdbcType="VARCHAR" />
         <result column="vc_text2" property="vc_text2" jdbcType="VARCHAR" />
         <result column="vc_text3" property="vc_text3" jdbcType="VARCHAR" />
         <result column="vc_text4" property="vc_text4" jdbcType="VARCHAR" />
         <result column="vc_text5" property="vc_text5" jdbcType="VARCHAR" />
+        <result column="companyId" property="companyId" jdbcType="BIGINT" />
+        <result column="updatemanid" property="updaterId" jdbcType="INTEGER" />
+        <result column="updaterTime" property="updaterTime" jdbcType="TIMESTAMP" />
+        <result column="vd_id" property="vd_id" jdbcType="INTEGER" />
+        <result column="vd_vcid" property="vd_vcid" jdbcType="INTEGER" />
+        <result column="vd_detno" property="vd_detno" jdbcType="INTEGER" />
+        <result column="vd_ym" property="vd_ym" jdbcType="INTEGER" />
+        <result column="vd_slid" property="vd_slid" jdbcType="INTEGER" />
+        <result column="vd_slcode" property="vd_slcode" jdbcType="VARCHAR" />
+        <result column="vd_slkind" property="vd_slkind" jdbcType="VARCHAR" />
+        <result column="vd_amount" property="vd_amount" jdbcType="DOUBLE" />
+        <result column="vd_nowbalance" property="vd_nowbalance" jdbcType="DOUBLE" />
+        <result column="vd_remark" property="vd_remark" jdbcType="VARCHAR" />
+
     </resultMap>
-    <select id="selectPurchaseListByCondition" parameterType="com.usoftchina.saas.money.dto.VerificationReqDTO" resultMap="BaseResultMap">
+    <select id="selectVerificationListByCondition"  resultMap="BaseResultMap">
         select  *  from verification left join verificationdet on vc_id=vd_vcid left join verificationdetail on vc_id=vcd_vcid
         <where>
-            order by pu_id,pd_detno
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId!=null">
+                and verification.companyId=#{companyId}
+            </if>
+            order by vc_id
         </where>
     </select>
+
+    <select id="selectVerificationBycondition"  resultMap="BaseResultMap">
+        select  *  from Verification
+        <where>
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId != null">
+                and  verification.companyId = #{companyId}
+            </if>
+        </where>
+        order by vc_id
+    </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/VerificationMapper.xml

@@ -26,9 +26,9 @@
     <result column="vc_status" property="vc_status" jdbcType="INTEGER" />
     <result column="vc_statuscode" property="vc_statuscode" jdbcType="DECIMAL" />
     <result column="vc_remark" property="vc_remark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="vc_text1" property="vc_text1" jdbcType="VARCHAR" />
     <result column="vc_text2" property="vc_text2" jdbcType="VARCHAR" />
     <result column="vc_text3" property="vc_text3" jdbcType="VARCHAR" />
@@ -97,7 +97,7 @@
     vc_id, vc_code, vc_kind, vc_date, vc_vendid, vc_vendcode, vc_vendname, vc_custid, 
     vc_custcode, vc_custname, vc_turnvendid, vc_turnvendcode, vc_turnvendname, vc_turncustid, 
     vc_turncustcode, vc_turncustname, vc_amount1, vc_amount2, vc_recorderid, vc_recorder, 
-    vc_recorddate, vc_status, vc_statuscode, vc_remark, companyid, updaterId, updatedate, 
+    vc_recorddate, vc_status, vc_statuscode, vc_remark, companyId, updaterId, updateTime,
     vc_text1, vc_text2, vc_text3, vc_text4, vc_text5
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.money.po.VerificationExample" >
@@ -139,7 +139,7 @@
       vc_turncustname, vc_amount1, vc_amount2, 
       vc_recorderid, vc_recorder, vc_recorddate, 
       vc_status, vc_statuscode, vc_remark, 
-      companyid, updaterId, updatedate, 
+      companyId, updaterId, updateTime,
       vc_text1, vc_text2, vc_text3, 
       vc_text4, vc_text5)
     values (#{vc_id,jdbcType=INTEGER}, #{vc_code,jdbcType=VARCHAR}, #{vc_kind,jdbcType=VARCHAR}, 
@@ -150,7 +150,7 @@
       #{vc_turncustname,jdbcType=VARCHAR}, #{vc_amount1,jdbcType=DOUBLE}, #{vc_amount2,jdbcType=DOUBLE}, 
       #{vc_recorderid,jdbcType=INTEGER}, #{vc_recorder,jdbcType=VARCHAR}, #{vc_recorddate,jdbcType=TIMESTAMP}, 
       #{vc_status,jdbcType=INTEGER}, #{vc_statuscode,jdbcType=DECIMAL}, #{vc_remark,jdbcType=VARCHAR}, 
-      #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
+      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
       #{vc_text1,jdbcType=VARCHAR}, #{vc_text2,jdbcType=VARCHAR}, #{vc_text3,jdbcType=VARCHAR}, 
       #{vc_text4,jdbcType=VARCHAR}, #{vc_text5,jdbcType=VARCHAR})
   </insert>
@@ -229,14 +229,14 @@
       <if test="vc_remark != null" >
         vc_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
+      <if test="updateTime != null" >
+        updateTime,
       </if>
       <if test="vc_text1 != null" >
         vc_text1,
@@ -327,14 +327,14 @@
       <if test="vc_remark != null" >
         #{vc_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_text1 != null" >
         #{vc_text1,jdbcType=VARCHAR},
@@ -434,14 +434,14 @@
       <if test="record.vc_remark != null" >
         vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null" >
         updaterId = #{record.updaterId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatedate != null" >
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vc_text1 != null" >
         vc_text1 = #{record.vc_text1,jdbcType=VARCHAR},
@@ -489,9 +489,9 @@
       vc_status = #{record.vc_status,jdbcType=INTEGER},
       vc_statuscode = #{record.vc_statuscode,jdbcType=DECIMAL},
       vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+    companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       vc_text1 = #{record.vc_text1,jdbcType=VARCHAR},
       vc_text2 = #{record.vc_text2,jdbcType=VARCHAR},
       vc_text3 = #{record.vc_text3,jdbcType=VARCHAR},
@@ -573,14 +573,14 @@
       <if test="vc_remark != null" >
         vc_remark = #{vc_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_text1 != null" >
         vc_text1 = #{vc_text1,jdbcType=VARCHAR},
@@ -625,9 +625,9 @@
       vc_status = #{vc_status,jdbcType=INTEGER},
       vc_statuscode = #{vc_statuscode,jdbcType=DECIMAL},
       vc_remark = #{vc_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
       vc_text1 = #{vc_text1,jdbcType=VARCHAR},
       vc_text2 = #{vc_text2,jdbcType=VARCHAR},
       vc_text3 = #{vc_text3,jdbcType=VARCHAR},

applications/money/money-server/src/main/resources/mapper/VerificationdetMapper.xml

@@ -13,9 +13,9 @@
     <result column="vd_amount" property="vd_amount" jdbcType="DOUBLE" />
     <result column="vd_nowbalance" property="vd_nowbalance" jdbcType="DOUBLE" />
     <result column="vd_remark" property="vd_remark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="vd_text1" property="vd_text1" jdbcType="VARCHAR" />
     <result column="vd_text2" property="vd_text2" jdbcType="VARCHAR" />
     <result column="vd_text3" property="vd_text3" jdbcType="VARCHAR" />
@@ -40,8 +40,8 @@
                 </when>
                 <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
+                  <foreach collection="criterion.value" item="listitem" open="(" close=")" separator="," >
+                    #{listitem}
                   </foreach>
                 </when>
               </choose>
@@ -69,8 +69,8 @@
                 </when>
                 <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
+                  <foreach collection="criterion.value" item="listitem" open="(" close=")" separator="," >
+                    #{listitem}
                   </foreach>
                 </when>
               </choose>
@@ -82,7 +82,7 @@
   </sql>
   <sql id="Base_Column_List" >
     vd_id, vd_vcid, vd_detno, vd_ym, vd_slid, vd_slcode, vd_slkind, vd_sldate, vd_amount, 
-    vd_nowbalance, vd_remark, companyid, updaterId, updatedate, vd_text1, vd_text2, vd_text3, 
+    vd_nowbalance, vd_remark, companyId, updaterId, updateTime, vd_text1, vd_text2, vd_text3, 
     vd_text4, vd_text5
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.money.po.VerificationdetExample" >
@@ -119,15 +119,15 @@
     insert into verificationdet (vd_id, vd_vcid, vd_detno, 
       vd_ym, vd_slid, vd_slcode, 
       vd_slkind, vd_sldate, vd_amount, 
-      vd_nowbalance, vd_remark, companyid, 
-      updaterId, updatedate, vd_text1, 
+      vd_nowbalance, vd_remark, companyId, 
+      updaterId, updateTime, vd_text1, 
       vd_text2, vd_text3, vd_text4, 
       vd_text5)
     values (#{vd_id,jdbcType=INTEGER}, #{vd_vcid,jdbcType=INTEGER}, #{vd_detno,jdbcType=INTEGER}, 
       #{vd_ym,jdbcType=INTEGER}, #{vd_slid,jdbcType=INTEGER}, #{vd_slcode,jdbcType=VARCHAR}, 
       #{vd_slkind,jdbcType=VARCHAR}, #{vd_sldate,jdbcType=TIMESTAMP}, #{vd_amount,jdbcType=DOUBLE}, 
-      #{vd_nowbalance,jdbcType=DOUBLE}, #{vd_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
-      #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{vd_text1,jdbcType=VARCHAR}, 
+      #{vd_nowbalance,jdbcType=DOUBLE}, #{vd_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, 
+      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{vd_text1,jdbcType=VARCHAR}, 
       #{vd_text2,jdbcType=VARCHAR}, #{vd_text3,jdbcType=VARCHAR}, #{vd_text4,jdbcType=VARCHAR}, 
       #{vd_text5,jdbcType=VARCHAR})
   </insert>
@@ -167,14 +167,14 @@
       <if test="vd_remark != null" >
         vd_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
+      <if test="updateTime != null" >
+        updateTime,
       </if>
       <if test="vd_text1 != null" >
         vd_text1,
@@ -226,14 +226,14 @@
       <if test="vd_remark != null" >
         #{vd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vd_text1 != null" >
         #{vd_text1,jdbcType=VARCHAR},
@@ -294,14 +294,14 @@
       <if test="record.vd_remark != null" >
         vd_remark = #{record.vd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null" >
         updaterId = #{record.updaterId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatedate != null" >
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vd_text1 != null" >
         vd_text1 = #{record.vd_text1,jdbcType=VARCHAR},
@@ -336,9 +336,9 @@
       vd_amount = #{record.vd_amount,jdbcType=DOUBLE},
       vd_nowbalance = #{record.vd_nowbalance,jdbcType=DOUBLE},
       vd_remark = #{record.vd_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       vd_text1 = #{record.vd_text1,jdbcType=VARCHAR},
       vd_text2 = #{record.vd_text2,jdbcType=VARCHAR},
       vd_text3 = #{record.vd_text3,jdbcType=VARCHAR},
@@ -381,14 +381,14 @@
       <if test="vd_remark != null" >
         vd_remark = #{vd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vd_text1 != null" >
         vd_text1 = #{vd_text1,jdbcType=VARCHAR},
@@ -420,9 +420,9 @@
       vd_amount = #{vd_amount,jdbcType=DOUBLE},
       vd_nowbalance = #{vd_nowbalance,jdbcType=DOUBLE},
       vd_remark = #{vd_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
       vd_text1 = #{vd_text1,jdbcType=VARCHAR},
       vd_text2 = #{vd_text2,jdbcType=VARCHAR},
       vd_text3 = #{vd_text3,jdbcType=VARCHAR},
@@ -434,48 +434,52 @@
     insert into verificationdet
     (
     vd_id,vd_vcid,vd_detno,vd_ym,vd_slid,vd_slcode,vd_slkind,vd_sldate,
-    vd_amount,vd_nowbalance,vd_remark,companyid,updaterId,updatedate,
+    vd_amount,vd_nowbalance,vd_remark,companyId,updaterId,updateTime,
     vd_text1,vd_text2,vd_text3,vd_text4,vd_text5
     )
     values
-    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+    <foreach collection="list" item="items1" index="index" open="" close="" separator=",">
       (
-      #{item.vd_id,jdbcType=INTEGER},#{item.vd_vcid,jdbcType=INTEGER},#{item.vd_detno,jdbcType=INTEGER},#{item.vd_ym,jdbcType=INTEGER},#{item.vd_slid,jdbcType=INTEGER},
-      #{item.vd_slcode,jdbcType=VARCHAR},#{item.vd_slkind,jdbcType=VARCHAR},#{item.vd_sldate,jdbcType=DATE},#{item.vd_amount,jdbcType=DOUBLE},
-      #{item.vd_nowbalance,jdbcType=DOUBLE},#{item.vd_remark,jdbcType=VARCHAR},#{item.companyid,jdbcType=INTEGER},#{item.updaterId,jdbcType=INTEGER},#{item.updatedate,jdbcType=DATE},
-      #{item.vd_text1,jdbcType=VARCHAR},#{item.vd_text2,jdbcType=VARCHAR},#{item.vd_text3,jdbcType=VARCHAR},#{item.vd_text4,jdbcType=VARCHAR},
-      #{item.vd_text5,jdbcType=VARCHAR}
+      #{items1.vd_id,jdbcType=INTEGER},#{items1.vd_vcid,jdbcType=INTEGER},#{items1.vd_detno,jdbcType=INTEGER},#{items1.vd_ym,jdbcType=INTEGER},#{items1.vd_slid,jdbcType=INTEGER},
+      #{items1.vd_slcode,jdbcType=VARCHAR},#{items1.vd_slkind,jdbcType=VARCHAR},#{items1.vd_sldate,jdbcType=DATE},#{items1.vd_amount,jdbcType=DOUBLE},
+      #{items1.vd_nowbalance,jdbcType=DOUBLE},#{items1.vd_remark,jdbcType=VARCHAR},#{items1.companyId,jdbcType=INTEGER},#{items1.updaterId,jdbcType=INTEGER},#{items1.updateTime,jdbcType=DATE},
+      #{items1.vd_text1,jdbcType=VARCHAR},#{items1.vd_text2,jdbcType=VARCHAR},#{items1.vd_text3,jdbcType=VARCHAR},#{items1.vd_text4,jdbcType=VARCHAR},
+      #{items1.vd_text5,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>
   <update id="batchUpdate" parameterType="com.usoftchina.saas.money.po.Verificationdet" >
-    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+    <foreach collection="list" item="items1" index="index" open="" close="" separator=";">
       update Verificationdet <set>
-      vd_id = #{item.vd_id},
-      vd_vcid = #{item.vd_vcid},
-      vd_detno = #{item.vd_detno},
-      vd_ym = #{item.vd_ym},
-      vd_slid = #{item.vd_slid},
-      vd_slcode = #{item.vd_slcode},
-      vd_slkind = #{item.vd_slkind},
-      vd_sldate = #{item.vd_sldate},
-      vd_amount = #{item.vd_amount},
-      vd_nowbalance = #{item.vd_nowbalance},
-      vd_remark = #{item.vd_remark},
-      companyid = #{item.companyid},
-      updaterId = #{item.updaterId},
-      updatedate = #{item.updatedate},
-      vd_text1 = #{item.vd_text1},
-      vd_text2 = #{item.vd_text2},
-      vd_text3= #{item.vd_text3},
-      vd_text4= #{item.vd_text4},
-      vd_text5= #{item.vd_text5}
+      vd_id = #{items1.vd_id},
+      vd_vcid = #{items1.vd_vcid},
+      vd_detno = #{items1.vd_detno},
+      vd_ym = #{items1.vd_ym},
+      vd_slid = #{items1.vd_slid},
+      vd_slcode = #{items1.vd_slcode},
+      vd_slkind = #{items1.vd_slkind},
+      vd_sldate = #{items1.vd_sldate},
+      vd_amount = #{items1.vd_amount},
+      vd_nowbalance = #{items1.vd_nowbalance},
+      vd_remark = #{items1.vd_remark},
+      companyId = #{items1.companyId},
+      updaterId = #{items1.updaterId},
+      updateTime = #{items1.updateTime},
+      vd_text1 = #{items1.vd_text1},
+      vd_text2 = #{items1.vd_text2},
+      vd_text3= #{items1.vd_text3},
+      vd_text4= #{items1.vd_text4},
+      vd_text5= #{items1.vd_text5}
     </set>
-      where vd_vcid = #{item.id,jdbcType=INTEGER}
+      where vd_vcid = #{items1.id,jdbcType=INTEGER}
     </foreach>
   </update>
   <delete id="deleteByParentPrimaryKey" parameterType="java.lang.Long" >
     delete from verificationdet
     where vd_id = #{vd_vcid,jdbcType=INTEGER}
   </delete>
+  <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
+    select * from verificationdet
+      where vd_vcid=#{vc_id} order by vd_id
+  </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/VerificationdetailMapper.xml

@@ -13,9 +13,9 @@
     <result column="vcd_amount" property="vcd_amount" jdbcType="DOUBLE" />
     <result column="vcd_nowbalance" property="vcd_nowbalance" jdbcType="DOUBLE" />
     <result column="vcd_remark" property="vcd_remark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="vcd_text1" property="vcd_text1" jdbcType="VARCHAR" />
     <result column="vcd_text2" property="vcd_text2" jdbcType="VARCHAR" />
     <result column="vcd_text3" property="vcd_text3" jdbcType="VARCHAR" />
@@ -81,8 +81,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    vcd_id, vcd_vcid, vcd_detno, vcd_ym, vcd_slid, vcd_slcode, vcd_slkind, vcd_sldate, 
-    vcd_amount, vcd_nowbalance, vcd_remark, companyid, updaterId, updatedate, vcd_text1, 
+    vcd_id, vcd_vcid, vcd_detno, vcd_ym, vcd_slid, vcd_slcode, vcd_slkind, vcd_sldate,
+    vcd_amount, vcd_nowbalance, vcd_remark, companyId, updaterId, updateTime, vcd_text1,
     vcd_text2, vcd_text3, vcd_text4, vcd_text5
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.money.po.VerificationdetailExample" >
@@ -100,7 +100,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from verificationdetail
     where vcd_id = #{vcd_id,jdbcType=INTEGER}
@@ -116,19 +116,19 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Verificationdetail" >
-    insert into verificationdetail (vcd_id, vcd_vcid, vcd_detno, 
-      vcd_ym, vcd_slid, vcd_slcode, 
-      vcd_slkind, vcd_sldate, vcd_amount, 
-      vcd_nowbalance, vcd_remark, companyid, 
-      updaterId, updatedate, vcd_text1, 
-      vcd_text2, vcd_text3, vcd_text4, 
+    insert into verificationdetail (vcd_id, vcd_vcid, vcd_detno,
+      vcd_ym, vcd_slid, vcd_slcode,
+      vcd_slkind, vcd_sldate, vcd_amount,
+      vcd_nowbalance, vcd_remark, companyId,
+      updaterId, updateTime, vcd_text1,
+      vcd_text2, vcd_text3, vcd_text4,
       vcd_text5)
-    values (#{vcd_id,jdbcType=INTEGER}, #{vcd_vcid,jdbcType=INTEGER}, #{vcd_detno,jdbcType=INTEGER}, 
-      #{vcd_ym,jdbcType=INTEGER}, #{vcd_slid,jdbcType=INTEGER}, #{vcd_slcode,jdbcType=VARCHAR}, 
-      #{vcd_slkind,jdbcType=VARCHAR}, #{vcd_sldate,jdbcType=TIMESTAMP}, #{vcd_amount,jdbcType=DOUBLE}, 
-      #{vcd_nowbalance,jdbcType=DOUBLE}, #{vcd_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
-      #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{vcd_text1,jdbcType=VARCHAR}, 
-      #{vcd_text2,jdbcType=VARCHAR}, #{vcd_text3,jdbcType=VARCHAR}, #{vcd_text4,jdbcType=VARCHAR}, 
+    values (#{vcd_id,jdbcType=INTEGER}, #{vcd_vcid,jdbcType=INTEGER}, #{vcd_detno,jdbcType=INTEGER},
+      #{vcd_ym,jdbcType=INTEGER}, #{vcd_slid,jdbcType=INTEGER}, #{vcd_slcode,jdbcType=VARCHAR},
+      #{vcd_slkind,jdbcType=VARCHAR}, #{vcd_sldate,jdbcType=TIMESTAMP}, #{vcd_amount,jdbcType=DOUBLE},
+      #{vcd_nowbalance,jdbcType=DOUBLE}, #{vcd_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
+      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{vcd_text1,jdbcType=VARCHAR},
+      #{vcd_text2,jdbcType=VARCHAR}, #{vcd_text3,jdbcType=VARCHAR}, #{vcd_text4,jdbcType=VARCHAR},
       #{vcd_text5,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Verificationdetail" >
@@ -167,14 +167,14 @@
       <if test="vcd_remark != null" >
         vcd_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
+      <if test="updateTime != null" >
+        updateTime,
       </if>
       <if test="vcd_text1 != null" >
         vcd_text1,
@@ -226,14 +226,14 @@
       <if test="vcd_remark != null" >
         #{vcd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vcd_text1 != null" >
         #{vcd_text1,jdbcType=VARCHAR},
@@ -294,14 +294,14 @@
       <if test="record.vcd_remark != null" >
         vcd_remark = #{record.vcd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null" >
         updaterId = #{record.updaterId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatedate != null" >
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vcd_text1 != null" >
         vcd_text1 = #{record.vcd_text1,jdbcType=VARCHAR},
@@ -336,9 +336,9 @@
       vcd_amount = #{record.vcd_amount,jdbcType=DOUBLE},
       vcd_nowbalance = #{record.vcd_nowbalance,jdbcType=DOUBLE},
       vcd_remark = #{record.vcd_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       vcd_text1 = #{record.vcd_text1,jdbcType=VARCHAR},
       vcd_text2 = #{record.vcd_text2,jdbcType=VARCHAR},
       vcd_text3 = #{record.vcd_text3,jdbcType=VARCHAR},
@@ -381,14 +381,14 @@
       <if test="vcd_remark != null" >
         vcd_remark = #{vcd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vcd_text1 != null" >
         vcd_text1 = #{vcd_text1,jdbcType=VARCHAR},
@@ -420,9 +420,9 @@
       vcd_amount = #{vcd_amount,jdbcType=DOUBLE},
       vcd_nowbalance = #{vcd_nowbalance,jdbcType=DOUBLE},
       vcd_remark = #{vcd_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
       vcd_text1 = #{vcd_text1,jdbcType=VARCHAR},
       vcd_text2 = #{vcd_text2,jdbcType=VARCHAR},
       vcd_text3 = #{vcd_text3,jdbcType=VARCHAR},
@@ -434,48 +434,52 @@
     insert into verificationdetail
     (
     vcd_id,vcd_vcid,vcd_detno,vcd_ym,vcd_slid,vcd_slcode,vcd_slkind,vcd_sldate,
-    vcd_amount,vcd_nowbalance,vcd_remark,companyid,updaterId,updatedate,vcd_text1,
+    vcd_amount,vcd_nowbalance,vcd_remark,companyId,updaterId,updateTime,vcd_text1,
     vcd_text2,vcd_text3,vcd_text4,vcd_text5
     )
     values
-    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+    <foreach collection="list" item="items2" index="index" open="" close="" separator=",">
       (
-      #{item.vcd_id,jdbcType=INTEGER},#{item.vcd_vcid,jdbcType=INTEGER},#{item.vcd_detno,jdbcType=INTEGER},#{item.vcd_ym,jdbcType=INTEGER},#{item.vcd_slid,jdbcType=INTEGER},
-      #{item.vcd_slcode,jdbcType=VARCHAR},#{item.vcd_slkind,jdbcType=VARCHAR},#{item.vcd_sldate,jdbcType=DATE},#{item.vcd_amount,jdbcType=DOUBLE},
-      #{item.vcd_nowbalance,jdbcType=DOUBLE},#{item.vcd_remark,jdbcType=VARCHAR},#{item.companyid,jdbcType=INTEGER},#{item.updaterId,jdbcType=INTEGER},#{item.updatedate,jdbcType=DATE},
-      #{item.vcd_text1,jdbcType=VARCHAR},#{item.vcd_text2,jdbcType=VARCHAR},#{item.vcd_text3,jdbcType=VARCHAR},#{item.vcd_text4,jdbcType=VARCHAR},
-      #{item.vcd_text5,jdbcType=VARCHAR}
+      #{items2.vcd_id,jdbcType=INTEGER},#{items2.vcd_vcid,jdbcType=INTEGER},#{items2.vcd_detno,jdbcType=INTEGER},#{items2.vcd_ym,jdbcType=INTEGER},#{items2.vcd_slid,jdbcType=INTEGER},
+      #{items2.vcd_slcode,jdbcType=VARCHAR},#{items2.vcd_slkind,jdbcType=VARCHAR},#{items2.vcd_sldate,jdbcType=DATE},#{items2.vcd_amount,jdbcType=DOUBLE},
+      #{items2.vcd_nowbalance,jdbcType=DOUBLE},#{items2.vcd_remark,jdbcType=VARCHAR},#{items2.companyId,jdbcType=INTEGER},#{items2.updaterId,jdbcType=INTEGER},#{items2.updateTime,jdbcType=DATE},
+      #{items2.vcd_text1,jdbcType=VARCHAR},#{items2.vcd_text2,jdbcType=VARCHAR},#{items2.vcd_text3,jdbcType=VARCHAR},#{items2.vcd_text4,jdbcType=VARCHAR},
+      #{items2.vcd_text5,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>
   <update id="batchUpdate" parameterType="com.usoftchina.saas.money.po.Verificationdetail" >
-    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+    <foreach collection="list" item="items2" index="index" open="" close="" separator=";">
       update verificationdetail <set>
-      vcd_id = #{item.vcd_id},
-      vcd_vcid = #{item.vcd_vcid},
-      vcd_detno = #{item.vcd_detno},
-      vcd_ym = #{item.vcd_ym},
-      vcd_slid = #{item.vcd_slid},
-      vcd_slcode = #{item.vcd_slcode},
-      vcd_slkind = #{item.vcd_slkind},
-      vcd_sldate = #{item.vcd_sldate},
-      vcd_amount = #{item.vcd_amount},
-      vcd_nowbalance = #{item.vcd_nowbalance},
-      vcd_remark = #{item.vcd_remark},
-      companyid = #{item.companyid},
-      updaterId = #{item.updaterId},
-      updatedate = #{item.updatedate},
-      vcd_text1 = #{item.vcd_text1},
-      vcd_text2 = #{item.vcd_text2},
-      vcd_text3= #{item.vcd_text3},
-      vcd_text4= #{item.vcd_text4},
-      vcd_text5= #{item.vcd_text5}
+      vcd_id = #{items2.vcd_id},
+      vcd_vcid = #{items2.vcd_vcid},
+      vcd_detno = #{items2.vcd_detno},
+      vcd_ym = #{items2.vcd_ym},
+      vcd_slid = #{items2.vcd_slid},
+      vcd_slcode = #{items2.vcd_slcode},
+      vcd_slkind = #{items2.vcd_slkind},
+      vcd_sldate = #{items2.vcd_sldate},
+      vcd_amount = #{items2.vcd_amount},
+      vcd_nowbalance = #{items2.vcd_nowbalance},
+      vcd_remark = #{items2.vcd_remark},
+      companyId = #{items2.companyId},
+      updaterId = #{items2.updaterId},
+      updateTime = #{items2.updateTime},
+      vcd_text1 = #{items2.vcd_text1},
+      vcd_text2 = #{items2.vcd_text2},
+      vcd_text3= #{items2.vcd_text3},
+      vcd_text4= #{items2.vcd_text4},
+      vcd_text5= #{items2.vcd_text5}
     </set>
-      where vcd_vcid = #{item.id,jdbcType=INTEGER}
+      where vcd_vcid = #{items2.id,jdbcType=INTEGER}
     </foreach>
   </update>
   <delete id="deleteByParentPrimaryKey" parameterType="java.lang.Long" >
     delete from verificationdetail
     where vd_id = #{vcd_vcid,jdbcType=INTEGER}
   </delete>
+  <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
+    select * from verificationdetail
+      where vcd_vcid=#{vc_id} order by vcd_id
+  </select>
 </mapper>

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/ProdIODetailMapper.java

@@ -2,7 +2,6 @@ package com.usoftchina.saas.purchase.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.purchase.po.ProdIODetail;
-import com.usoftchina.saas.purchase.po.ProdIODetailExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/ProdInOutMapper.java

@@ -2,7 +2,6 @@ package com.usoftchina.saas.purchase.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.purchase.po.ProdInOut;
-import com.usoftchina.saas.purchase.po.ProdInOutExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       name: admin
       password: select111***
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8800
   tomcat:

applications/purchase/purchase-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -75,64 +75,6 @@
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.ProdIODetail">
     <result column="pd_remark" jdbcType="LONGVARCHAR" property="pd_remark" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
     pd_id, pd_piid, pd_inoutno, pd_piclass, pd_pdno, pd_ordercode, pd_orderdetno, pd_prodid, 
     pd_prodcode, pd_unit, pd_inqty, pd_outqty, pd_orderprice, pd_sendprice, pd_price, 
@@ -143,33 +85,6 @@
   <sql id="Blob_Column_List">
     pd_remark
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.purchase.po.ProdIODetailExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from prodiodetail
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.purchase.po.ProdIODetailExample" resultMap="BaseResultMap">
-    select
-        *
-    from prodiodetail a left join product b on a.pd_prodid = b.pr_id and a.companyid = b.companyid
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
@@ -182,12 +97,6 @@
     delete from prodiodetail
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.purchase.po.ProdIODetailExample">
-    delete from prodiodetail
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail">
     insert into prodiodetail (pd_id, pd_piid, pd_inoutno, 
       pd_piclass, pd_pdno, pd_ordercode, 
@@ -463,232 +372,6 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.purchase.po.ProdIODetailExample" resultType="java.lang.Long">
-    select count(*) from prodiodetail
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update prodiodetail
-    <set>
-      <if test="record.pd_id != null">
-        pd_id = #{record.pd_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_piid != null">
-        pd_piid = #{record.pd_piid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_inoutno != null">
-        pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_piclass != null">
-        pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_pdno != null">
-        pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_ordercode != null">
-        pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_orderdetno != null">
-        pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_prodid != null">
-        pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_prodcode != null">
-        pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_unit != null">
-        pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_inqty != null">
-        pd_inqty = #{record.pd_inqty,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_outqty != null">
-        pd_outqty = #{record.pd_outqty,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_orderprice != null">
-        pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_sendprice != null">
-        pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_price != null">
-        pd_price = #{record.pd_price,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_total != null">
-        pd_total = #{record.pd_total,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_taxrate != null">
-        pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_netprice != null">
-        pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_nettotal != null">
-        pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_whid != null">
-        pd_whid = #{record.pd_whid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_whcode != null">
-        pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_whname != null">
-        pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_inwhid != null">
-        pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_inwhcode != null">
-        pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_inwhname != null">
-        pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_orderid != null">
-        pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_sdid != null">
-        pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_status != null">
-        pd_status = #{record.pd_status,jdbcType=INTEGER},
-      </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterid != null">
-        updaterid = #{record.updaterid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatetime != null">
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pd_text1 != null">
-        pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_text2 != null">
-        pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_text3 != null">
-        pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_text4 != null">
-        pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_text5 != null">
-        pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_ym != null">
-        pd_ym = #{record.pd_ym,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_yqty != null">
-        pd_yqty = #{record.pd_yqty,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_remark != null">
-        pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.pd_ioid != null">
-        pd_ioid = #{record.pd_ioid,jdbcType=INTEGER},
-      </if>
-
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update prodiodetail
-    set pd_id = #{record.pd_id,jdbcType=INTEGER},
-      pd_piid = #{record.pd_piid,jdbcType=INTEGER},
-      pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
-      pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
-      pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
-      pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
-      pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
-      pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
-      pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
-      pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
-      pd_inqty = #{record.pd_inqty,jdbcType=DOUBLE},
-      pd_outqty = #{record.pd_outqty,jdbcType=DOUBLE},
-      pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
-      pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
-      pd_price = #{record.pd_price,jdbcType=DOUBLE},
-      pd_total = #{record.pd_total,jdbcType=DOUBLE},
-      pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
-      pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
-      pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
-      pd_whid = #{record.pd_whid,jdbcType=INTEGER},
-      pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
-      pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
-      pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
-      pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
-      pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
-      pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
-      pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
-      pd_status = #{record.pd_status,jdbcType=INTEGER},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
-      pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
-      pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
-      pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
-      pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
-      pd_ym = #{record.pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{record.pd_yqty,jdbcType=DOUBLE},
-      pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
-      pd_ioid = #{record.pd_ioid,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update prodiodetail
-    set pd_id = #{record.pd_id,jdbcType=INTEGER},
-      pd_piid = #{record.pd_piid,jdbcType=INTEGER},
-      pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
-      pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
-      pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
-      pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
-      pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
-      pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
-      pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
-      pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
-      pd_inqty = #{record.pd_inqty,jdbcType=DOUBLE},
-      pd_outqty = #{record.pd_outqty,jdbcType=DOUBLE},
-      pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
-      pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
-      pd_price = #{record.pd_price,jdbcType=DOUBLE},
-      pd_total = #{record.pd_total,jdbcType=DOUBLE},
-      pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
-      pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
-      pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
-      pd_whid = #{record.pd_whid,jdbcType=INTEGER},
-      pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
-      pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
-      pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
-      pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
-      pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
-      pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
-      pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
-      pd_status = #{record.pd_status,jdbcType=INTEGER},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
-      pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
-      pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
-      pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
-      pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
-      pd_ym = #{record.pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{record.pd_yqty,jdbcType=DOUBLE},
-      pd_ioid = #{record.pd_ioid,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail">
     update prodiodetail
     <set>
@@ -897,7 +580,6 @@
       pd_ioid = #{pd_ioid,jdbcType=INTEGER}
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
-
   <insert id="batchInsert" parameterType="java.util.List" >
     insert into prodiodetail
     (
@@ -924,7 +606,6 @@
       )
     </foreach>
   </insert>
-
   <insert id="batchInsert1" parameterType="java.util.List" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       insert into prodiodetail
@@ -1169,15 +850,6 @@
 
     </foreach>
   </insert>
-
-
-
-
-
-
-
-
-
   <update id="batchUpdate" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update prodiodetail <set>

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -39,64 +39,9 @@
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
+
+
+
   <sql id="Base_Column_List">
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
     pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_recordmanid, 
@@ -106,36 +51,6 @@
   <sql id="Blob_Column_List">
     pi_address
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.purchase.po.ProdInOutExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.purchase.po.ProdInOutExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
@@ -148,12 +63,7 @@
     delete from prodinout
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.purchase.po.ProdInOutExample">
-    delete from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
+
   <insert id="insert" parameterType="com.usoftchina.saas.purchase.po.ProdInOut">
     insert into prodinout (pi_id, pi_inoutno, pi_class, 
       pi_date, pi_vendid, pi_vendcode, 
@@ -370,188 +280,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.purchase.po.ProdInOutExample" resultType="java.lang.Long">
-    select count(*) from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update prodinout
-    <set>
-      <if test="record.pi_id != null">
-        pi_id = #{record.pi_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_inoutno != null">
-        pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_class != null">
-        pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_date != null">
-        pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_vendid != null">
-        pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_vendcode != null">
-        pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_vendname != null">
-        pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_custid != null">
-        pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_custcode != null">
-        pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_custname != null">
-        pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_puid != null">
-        pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_pucode != null">
-        pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_said != null">
-        pi_said = #{record.pi_said,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_sacode != null">
-        pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_total != null">
-        pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pi_recordmanid != null">
-        pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_recordman != null">
-        pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_recorddate != null">
-        pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_status != null">
-        pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_statuscode != null">
-        pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_printstatus != null">
-        pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_printstatuscode != null">
-        pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterid != null">
-        updaterid = #{record.updaterid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatetime != null">
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_text1 != null">
-        pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text2 != null">
-        pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text3 != null">
-        pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text4 != null">
-        pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text5 != null">
-        pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_address != null">
-        pi_address = #{record.pi_address,jdbcType=LONGVARCHAR},
-      </if>
 
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update prodinout
-    set pi_id = #{record.pi_id,jdbcType=INTEGER},
-      pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{record.pi_said,jdbcType=INTEGER},
-      pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
-      pi_address = #{record.pi_address,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update prodinout
-    set pi_id = #{record.pi_id,jdbcType=INTEGER},
-      pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{record.pi_said,jdbcType=INTEGER},
-      pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR}
-
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.purchase.po.ProdInOut">
     update prodinout
     <set>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdIODetailMapper.java

@@ -1,8 +1,6 @@
 package com.usoftchina.saas.sale.mapper;
 
-import com.usoftchina.saas.base.mapper.CommonBaseMapper;
-import com.usoftchina.saas.storage.entities.ProdIODetail;
-import org.apache.ibatis.annotations.Param;
+import com.usoftchina.saas.storage.po.ProdIODetail;
 
 import java.util.List;
 

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdInOutMapper.java

@@ -1,6 +1,6 @@
 package com.usoftchina.saas.sale.mapper;
 
-import com.usoftchina.saas.storage.entities.ProdInOut;
+import com.usoftchina.saas.storage.po.ProdInOut;
 
 
 

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -1,12 +1,7 @@
 package com.usoftchina.saas.sale.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.netflix.discovery.converters.Auto;
-import com.usoftchina.saas.base.Result;
-import com.usoftchina.saas.commons.api.MaxnumberService;
-import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
@@ -14,7 +9,6 @@ import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.exception.ExceptionCode;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.sale.dto.SaleDTO;
 import com.usoftchina.saas.sale.dto.SaleDetailDTO;
@@ -24,19 +18,17 @@ import com.usoftchina.saas.sale.po.Sale;
 import com.usoftchina.saas.sale.po.SaleDetail;
 import com.usoftchina.saas.sale.po.SaleList;
 import com.usoftchina.saas.sale.service.SaleService;
-import com.usoftchina.saas.storage.entities.ProdIODetail;
-import com.usoftchina.saas.storage.entities.ProdInOut;
+import com.usoftchina.saas.storage.po.ProdIODetail;
+import com.usoftchina.saas.storage.po.ProdInOut;
 import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Random;
 
 /**
  * @author: guq

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usoftchina.saas.sale.mapper.ProdIODetailMapper">
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdIODetail">
     <id column="pd_id" jdbcType="INTEGER" property="id" />
     <result column="pd_piid" jdbcType="INTEGER" property="pd_piid" />
     <result column="pd_inoutno" jdbcType="VARCHAR" property="pd_inoutno" />
@@ -72,7 +72,7 @@
       <result column="pr_text4" property="pr_text4"/>
     </association>
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdIODetail">
     <result column="pd_remark" jdbcType="LONGVARCHAR" property="pd_remark" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -155,7 +155,7 @@
     delete from prodiodetail
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     insert into prodiodetail (pd_id, pd_piid, pd_inoutno, 
       pd_piclass, pd_pdno, pd_ordercode, 
       pd_orderdetno, pd_prodid, pd_prodcode, 
@@ -186,7 +186,7 @@
       #{pd_ioid,jdbcType=INTEGER}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
@@ -430,7 +430,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodiodetail
     <set>
       <if test="pd_piid != null">
@@ -553,7 +553,7 @@
     </set>
     where pd_id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodiodetail
     set pd_piid = #{pd_piid,jdbcType=INTEGER},
       pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
@@ -596,7 +596,7 @@
       pd_ioid = #{pd_ioid,jdbcType=INTEGER}
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodiodetail
     set pd_piid = #{pd_piid,jdbcType=INTEGER},
       pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
@@ -919,7 +919,7 @@
 
 
 
-  <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.entities.ProdInOut" >
+  <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.po.ProdInOut" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update prodiodetail <set>
       <if test="item.pd_piid !=null">

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usoftchina.saas.sale.mapper.ProdInOutMapper">
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdInOut">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdInOut">
     <id column="pi_id" jdbcType="INTEGER" property="id" />
     <result column="pi_inoutno" jdbcType="VARCHAR" property="pi_inoutno" />
     <result column="pi_class" jdbcType="VARCHAR" property="pi_class" />
@@ -33,7 +33,7 @@
     <result column="pi_text4" jdbcType="VARCHAR" property="pi_text4" />
     <result column="pi_text5" jdbcType="VARCHAR" property="pi_text5" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.entities.ProdInOut">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -115,7 +115,7 @@
     delete from prodinout
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     insert into prodinout (pi_id, pi_inoutno, pi_class, 
       pi_date, pi_vendid, pi_vendcode, 
       pi_vendname, pi_custid, pi_custcode, 
@@ -139,7 +139,7 @@
       #{pi_text3,jdbcType=VARCHAR}, #{pi_text4,jdbcType=VARCHAR}, #{pi_text5,jdbcType=VARCHAR}, 
       #{pi_address,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
@@ -332,7 +332,7 @@
     </trim>
   </insert>
 
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     <set>
       <if test="pi_inoutno != null">
@@ -429,7 +429,7 @@
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     set pi_inoutno = #{pi_inoutno,jdbcType=VARCHAR},
       pi_class = #{pi_class,jdbcType=VARCHAR},
@@ -464,7 +464,7 @@
 
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     set pi_inoutno = #{pi_inoutno,jdbcType=VARCHAR},
       pi_class = #{pi_class,jdbcType=VARCHAR},

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

@@ -30,9 +30,9 @@ public class ProdIODetailDTO extends CommonBaseEntity implements Serializable {
 
     private String pd_unit;
 
-    private Integer pd_inqty;
+    private Double pd_inqty;
 
-    private Integer pd_outqty;
+    private Double pd_outqty;
 
     private Double pd_orderprice;
 
@@ -78,7 +78,7 @@ public class ProdIODetailDTO extends CommonBaseEntity implements Serializable {
 
     private Integer pd_ym;
 
-    private Integer pd_yqty;
+    private Double pd_yqty;
 
     private String pd_remark;
 

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

@@ -85,9 +85,9 @@ public class ProdInOutListDTO extends CommonBaseEntity implements Serializable {
 
     private String pd_unit;
 
-    private Integer pd_inqty;
+    private Double pd_inqty;
 
-    private Integer pd_outqty;
+    private Double pd_outqty;
 
     private Double pd_orderprice;
 
@@ -133,7 +133,7 @@ public class ProdInOutListDTO extends CommonBaseEntity implements Serializable {
 
     private Integer pd_ym;
 
-    private Integer pd_yqty;
+    private Double pd_yqty;
 
     private String pd_remark;
 

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

@@ -1,28 +0,0 @@
-package com.usoftchina.saas.storage.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by zdw
- * 2018-10-17 13:46.
- */
-@Data
-public class ProdInOutReqDTO implements Serializable {
-    /**
-     * 开始日期
-     */
-    private Date begin;
-    /**
-     * 截止日期
-     */
-    private Date end;
-    private String status;
-    private String keyword;
-    //区分是否为关联列表
-    private String mode;
-
-
-}

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdIODetailExample.java

@@ -1,2631 +0,0 @@
-package com.usoftchina.saas.storage.entities;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class ProdIODetailExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public ProdIODetailExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andPd_idIsNull() {
-            addCriterion("pd_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idIsNotNull() {
-            addCriterion("pd_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idEqualTo(Integer value) {
-            addCriterion("pd_id =", value, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idNotEqualTo(Integer value) {
-            addCriterion("pd_id <>", value, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idGreaterThan(Integer value) {
-            addCriterion("pd_id >", value, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_id >=", value, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idLessThan(Integer value) {
-            addCriterion("pd_id <", value, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_id <=", value, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idIn(List<Integer> values) {
-            addCriterion("pd_id in", values, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idNotIn(List<Integer> values) {
-            addCriterion("pd_id not in", values, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idBetween(Integer value1, Integer value2) {
-            addCriterion("pd_id between", value1, value2, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_idNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_id not between", value1, value2, "pd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidIsNull() {
-            addCriterion("pd_piid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidIsNotNull() {
-            addCriterion("pd_piid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidEqualTo(Integer value) {
-            addCriterion("pd_piid =", value, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidNotEqualTo(Integer value) {
-            addCriterion("pd_piid <>", value, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidGreaterThan(Integer value) {
-            addCriterion("pd_piid >", value, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_piid >=", value, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidLessThan(Integer value) {
-            addCriterion("pd_piid <", value, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_piid <=", value, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidIn(List<Integer> values) {
-            addCriterion("pd_piid in", values, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidNotIn(List<Integer> values) {
-            addCriterion("pd_piid not in", values, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidBetween(Integer value1, Integer value2) {
-            addCriterion("pd_piid between", value1, value2, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_piid not between", value1, value2, "pd_piid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoIsNull() {
-            addCriterion("pd_inoutno is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoIsNotNull() {
-            addCriterion("pd_inoutno is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoEqualTo(String value) {
-            addCriterion("pd_inoutno =", value, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoNotEqualTo(String value) {
-            addCriterion("pd_inoutno <>", value, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoGreaterThan(String value) {
-            addCriterion("pd_inoutno >", value, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_inoutno >=", value, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoLessThan(String value) {
-            addCriterion("pd_inoutno <", value, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoLessThanOrEqualTo(String value) {
-            addCriterion("pd_inoutno <=", value, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoLike(String value) {
-            addCriterion("pd_inoutno like", value, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoNotLike(String value) {
-            addCriterion("pd_inoutno not like", value, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoIn(List<String> values) {
-            addCriterion("pd_inoutno in", values, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoNotIn(List<String> values) {
-            addCriterion("pd_inoutno not in", values, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoBetween(String value1, String value2) {
-            addCriterion("pd_inoutno between", value1, value2, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inoutnoNotBetween(String value1, String value2) {
-            addCriterion("pd_inoutno not between", value1, value2, "pd_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassIsNull() {
-            addCriterion("pd_piclass is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassIsNotNull() {
-            addCriterion("pd_piclass is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassEqualTo(String value) {
-            addCriterion("pd_piclass =", value, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassNotEqualTo(String value) {
-            addCriterion("pd_piclass <>", value, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassGreaterThan(String value) {
-            addCriterion("pd_piclass >", value, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_piclass >=", value, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassLessThan(String value) {
-            addCriterion("pd_piclass <", value, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassLessThanOrEqualTo(String value) {
-            addCriterion("pd_piclass <=", value, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassLike(String value) {
-            addCriterion("pd_piclass like", value, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassNotLike(String value) {
-            addCriterion("pd_piclass not like", value, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassIn(List<String> values) {
-            addCriterion("pd_piclass in", values, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassNotIn(List<String> values) {
-            addCriterion("pd_piclass not in", values, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassBetween(String value1, String value2) {
-            addCriterion("pd_piclass between", value1, value2, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_piclassNotBetween(String value1, String value2) {
-            addCriterion("pd_piclass not between", value1, value2, "pd_piclass");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoIsNull() {
-            addCriterion("pd_pdno is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoIsNotNull() {
-            addCriterion("pd_pdno is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoEqualTo(Integer value) {
-            addCriterion("pd_pdno =", value, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoNotEqualTo(Integer value) {
-            addCriterion("pd_pdno <>", value, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoGreaterThan(Integer value) {
-            addCriterion("pd_pdno >", value, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_pdno >=", value, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoLessThan(Integer value) {
-            addCriterion("pd_pdno <", value, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_pdno <=", value, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoIn(List<Integer> values) {
-            addCriterion("pd_pdno in", values, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoNotIn(List<Integer> values) {
-            addCriterion("pd_pdno not in", values, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoBetween(Integer value1, Integer value2) {
-            addCriterion("pd_pdno between", value1, value2, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_pdnoNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_pdno not between", value1, value2, "pd_pdno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeIsNull() {
-            addCriterion("pd_ordercode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeIsNotNull() {
-            addCriterion("pd_ordercode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeEqualTo(String value) {
-            addCriterion("pd_ordercode =", value, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeNotEqualTo(String value) {
-            addCriterion("pd_ordercode <>", value, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeGreaterThan(String value) {
-            addCriterion("pd_ordercode >", value, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_ordercode >=", value, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeLessThan(String value) {
-            addCriterion("pd_ordercode <", value, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeLessThanOrEqualTo(String value) {
-            addCriterion("pd_ordercode <=", value, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeLike(String value) {
-            addCriterion("pd_ordercode like", value, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeNotLike(String value) {
-            addCriterion("pd_ordercode not like", value, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeIn(List<String> values) {
-            addCriterion("pd_ordercode in", values, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeNotIn(List<String> values) {
-            addCriterion("pd_ordercode not in", values, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeBetween(String value1, String value2) {
-            addCriterion("pd_ordercode between", value1, value2, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ordercodeNotBetween(String value1, String value2) {
-            addCriterion("pd_ordercode not between", value1, value2, "pd_ordercode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoIsNull() {
-            addCriterion("pd_orderdetno is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoIsNotNull() {
-            addCriterion("pd_orderdetno is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoEqualTo(Integer value) {
-            addCriterion("pd_orderdetno =", value, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoNotEqualTo(Integer value) {
-            addCriterion("pd_orderdetno <>", value, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoGreaterThan(Integer value) {
-            addCriterion("pd_orderdetno >", value, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_orderdetno >=", value, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoLessThan(Integer value) {
-            addCriterion("pd_orderdetno <", value, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_orderdetno <=", value, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoIn(List<Integer> values) {
-            addCriterion("pd_orderdetno in", values, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoNotIn(List<Integer> values) {
-            addCriterion("pd_orderdetno not in", values, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoBetween(Integer value1, Integer value2) {
-            addCriterion("pd_orderdetno between", value1, value2, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderdetnoNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_orderdetno not between", value1, value2, "pd_orderdetno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidIsNull() {
-            addCriterion("pd_prodid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidIsNotNull() {
-            addCriterion("pd_prodid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidEqualTo(Integer value) {
-            addCriterion("pd_prodid =", value, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidNotEqualTo(Integer value) {
-            addCriterion("pd_prodid <>", value, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidGreaterThan(Integer value) {
-            addCriterion("pd_prodid >", value, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_prodid >=", value, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidLessThan(Integer value) {
-            addCriterion("pd_prodid <", value, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_prodid <=", value, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidIn(List<Integer> values) {
-            addCriterion("pd_prodid in", values, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidNotIn(List<Integer> values) {
-            addCriterion("pd_prodid not in", values, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidBetween(Integer value1, Integer value2) {
-            addCriterion("pd_prodid between", value1, value2, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_prodid not between", value1, value2, "pd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeIsNull() {
-            addCriterion("pd_prodcode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeIsNotNull() {
-            addCriterion("pd_prodcode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeEqualTo(String value) {
-            addCriterion("pd_prodcode =", value, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeNotEqualTo(String value) {
-            addCriterion("pd_prodcode <>", value, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeGreaterThan(String value) {
-            addCriterion("pd_prodcode >", value, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_prodcode >=", value, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeLessThan(String value) {
-            addCriterion("pd_prodcode <", value, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeLessThanOrEqualTo(String value) {
-            addCriterion("pd_prodcode <=", value, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeLike(String value) {
-            addCriterion("pd_prodcode like", value, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeNotLike(String value) {
-            addCriterion("pd_prodcode not like", value, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeIn(List<String> values) {
-            addCriterion("pd_prodcode in", values, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeNotIn(List<String> values) {
-            addCriterion("pd_prodcode not in", values, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeBetween(String value1, String value2) {
-            addCriterion("pd_prodcode between", value1, value2, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_prodcodeNotBetween(String value1, String value2) {
-            addCriterion("pd_prodcode not between", value1, value2, "pd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitIsNull() {
-            addCriterion("pd_unit is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitIsNotNull() {
-            addCriterion("pd_unit is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitEqualTo(String value) {
-            addCriterion("pd_unit =", value, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitNotEqualTo(String value) {
-            addCriterion("pd_unit <>", value, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitGreaterThan(String value) {
-            addCriterion("pd_unit >", value, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_unit >=", value, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitLessThan(String value) {
-            addCriterion("pd_unit <", value, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitLessThanOrEqualTo(String value) {
-            addCriterion("pd_unit <=", value, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitLike(String value) {
-            addCriterion("pd_unit like", value, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitNotLike(String value) {
-            addCriterion("pd_unit not like", value, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitIn(List<String> values) {
-            addCriterion("pd_unit in", values, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitNotIn(List<String> values) {
-            addCriterion("pd_unit not in", values, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitBetween(String value1, String value2) {
-            addCriterion("pd_unit between", value1, value2, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_unitNotBetween(String value1, String value2) {
-            addCriterion("pd_unit not between", value1, value2, "pd_unit");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyIsNull() {
-            addCriterion("pd_inqty is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyIsNotNull() {
-            addCriterion("pd_inqty is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyEqualTo(Integer value) {
-            addCriterion("pd_inqty =", value, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyNotEqualTo(Integer value) {
-            addCriterion("pd_inqty <>", value, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyGreaterThan(Integer value) {
-            addCriterion("pd_inqty >", value, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_inqty >=", value, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyLessThan(Integer value) {
-            addCriterion("pd_inqty <", value, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_inqty <=", value, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyIn(List<Integer> values) {
-            addCriterion("pd_inqty in", values, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyNotIn(List<Integer> values) {
-            addCriterion("pd_inqty not in", values, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyBetween(Integer value1, Integer value2) {
-            addCriterion("pd_inqty between", value1, value2, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inqtyNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_inqty not between", value1, value2, "pd_inqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyIsNull() {
-            addCriterion("pd_outqty is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyIsNotNull() {
-            addCriterion("pd_outqty is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyEqualTo(Integer value) {
-            addCriterion("pd_outqty =", value, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyNotEqualTo(Integer value) {
-            addCriterion("pd_outqty <>", value, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyGreaterThan(Integer value) {
-            addCriterion("pd_outqty >", value, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_outqty >=", value, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyLessThan(Integer value) {
-            addCriterion("pd_outqty <", value, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_outqty <=", value, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyIn(List<Integer> values) {
-            addCriterion("pd_outqty in", values, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyNotIn(List<Integer> values) {
-            addCriterion("pd_outqty not in", values, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyBetween(Integer value1, Integer value2) {
-            addCriterion("pd_outqty between", value1, value2, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_outqtyNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_outqty not between", value1, value2, "pd_outqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceIsNull() {
-            addCriterion("pd_orderprice is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceIsNotNull() {
-            addCriterion("pd_orderprice is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceEqualTo(Double value) {
-            addCriterion("pd_orderprice =", value, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceNotEqualTo(Double value) {
-            addCriterion("pd_orderprice <>", value, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceGreaterThan(Double value) {
-            addCriterion("pd_orderprice >", value, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceGreaterThanOrEqualTo(Double value) {
-            addCriterion("pd_orderprice >=", value, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceLessThan(Double value) {
-            addCriterion("pd_orderprice <", value, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceLessThanOrEqualTo(Double value) {
-            addCriterion("pd_orderprice <=", value, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceIn(List<Double> values) {
-            addCriterion("pd_orderprice in", values, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceNotIn(List<Double> values) {
-            addCriterion("pd_orderprice not in", values, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceBetween(Double value1, Double value2) {
-            addCriterion("pd_orderprice between", value1, value2, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderpriceNotBetween(Double value1, Double value2) {
-            addCriterion("pd_orderprice not between", value1, value2, "pd_orderprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceIsNull() {
-            addCriterion("pd_sendprice is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceIsNotNull() {
-            addCriterion("pd_sendprice is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceEqualTo(Double value) {
-            addCriterion("pd_sendprice =", value, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceNotEqualTo(Double value) {
-            addCriterion("pd_sendprice <>", value, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceGreaterThan(Double value) {
-            addCriterion("pd_sendprice >", value, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceGreaterThanOrEqualTo(Double value) {
-            addCriterion("pd_sendprice >=", value, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceLessThan(Double value) {
-            addCriterion("pd_sendprice <", value, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceLessThanOrEqualTo(Double value) {
-            addCriterion("pd_sendprice <=", value, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceIn(List<Double> values) {
-            addCriterion("pd_sendprice in", values, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceNotIn(List<Double> values) {
-            addCriterion("pd_sendprice not in", values, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceBetween(Double value1, Double value2) {
-            addCriterion("pd_sendprice between", value1, value2, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sendpriceNotBetween(Double value1, Double value2) {
-            addCriterion("pd_sendprice not between", value1, value2, "pd_sendprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceIsNull() {
-            addCriterion("pd_price is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceIsNotNull() {
-            addCriterion("pd_price is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceEqualTo(Double value) {
-            addCriterion("pd_price =", value, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceNotEqualTo(Double value) {
-            addCriterion("pd_price <>", value, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceGreaterThan(Double value) {
-            addCriterion("pd_price >", value, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceGreaterThanOrEqualTo(Double value) {
-            addCriterion("pd_price >=", value, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceLessThan(Double value) {
-            addCriterion("pd_price <", value, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceLessThanOrEqualTo(Double value) {
-            addCriterion("pd_price <=", value, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceIn(List<Double> values) {
-            addCriterion("pd_price in", values, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceNotIn(List<Double> values) {
-            addCriterion("pd_price not in", values, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceBetween(Double value1, Double value2) {
-            addCriterion("pd_price between", value1, value2, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_priceNotBetween(Double value1, Double value2) {
-            addCriterion("pd_price not between", value1, value2, "pd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalIsNull() {
-            addCriterion("pd_total is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalIsNotNull() {
-            addCriterion("pd_total is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalEqualTo(String value) {
-            addCriterion("pd_total =", value, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalNotEqualTo(String value) {
-            addCriterion("pd_total <>", value, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalGreaterThan(String value) {
-            addCriterion("pd_total >", value, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_total >=", value, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalLessThan(String value) {
-            addCriterion("pd_total <", value, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalLessThanOrEqualTo(String value) {
-            addCriterion("pd_total <=", value, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalLike(String value) {
-            addCriterion("pd_total like", value, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalNotLike(String value) {
-            addCriterion("pd_total not like", value, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalIn(List<String> values) {
-            addCriterion("pd_total in", values, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalNotIn(List<String> values) {
-            addCriterion("pd_total not in", values, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalBetween(String value1, String value2) {
-            addCriterion("pd_total between", value1, value2, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_totalNotBetween(String value1, String value2) {
-            addCriterion("pd_total not between", value1, value2, "pd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateIsNull() {
-            addCriterion("pd_taxrate is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateIsNotNull() {
-            addCriterion("pd_taxrate is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateEqualTo(Double value) {
-            addCriterion("pd_taxrate =", value, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateNotEqualTo(Double value) {
-            addCriterion("pd_taxrate <>", value, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateGreaterThan(Double value) {
-            addCriterion("pd_taxrate >", value, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateGreaterThanOrEqualTo(Double value) {
-            addCriterion("pd_taxrate >=", value, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateLessThan(Double value) {
-            addCriterion("pd_taxrate <", value, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateLessThanOrEqualTo(Double value) {
-            addCriterion("pd_taxrate <=", value, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateIn(List<Double> values) {
-            addCriterion("pd_taxrate in", values, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateNotIn(List<Double> values) {
-            addCriterion("pd_taxrate not in", values, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateBetween(Double value1, Double value2) {
-            addCriterion("pd_taxrate between", value1, value2, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_taxrateNotBetween(Double value1, Double value2) {
-            addCriterion("pd_taxrate not between", value1, value2, "pd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceIsNull() {
-            addCriterion("pd_netprice is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceIsNotNull() {
-            addCriterion("pd_netprice is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceEqualTo(Double value) {
-            addCriterion("pd_netprice =", value, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceNotEqualTo(Double value) {
-            addCriterion("pd_netprice <>", value, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceGreaterThan(Double value) {
-            addCriterion("pd_netprice >", value, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceGreaterThanOrEqualTo(Double value) {
-            addCriterion("pd_netprice >=", value, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceLessThan(Double value) {
-            addCriterion("pd_netprice <", value, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceLessThanOrEqualTo(Double value) {
-            addCriterion("pd_netprice <=", value, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceIn(List<Double> values) {
-            addCriterion("pd_netprice in", values, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceNotIn(List<Double> values) {
-            addCriterion("pd_netprice not in", values, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceBetween(Double value1, Double value2) {
-            addCriterion("pd_netprice between", value1, value2, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_netpriceNotBetween(Double value1, Double value2) {
-            addCriterion("pd_netprice not between", value1, value2, "pd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalIsNull() {
-            addCriterion("pd_nettotal is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalIsNotNull() {
-            addCriterion("pd_nettotal is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalEqualTo(Double value) {
-            addCriterion("pd_nettotal =", value, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalNotEqualTo(Double value) {
-            addCriterion("pd_nettotal <>", value, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalGreaterThan(Double value) {
-            addCriterion("pd_nettotal >", value, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalGreaterThanOrEqualTo(Double value) {
-            addCriterion("pd_nettotal >=", value, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalLessThan(Double value) {
-            addCriterion("pd_nettotal <", value, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalLessThanOrEqualTo(Double value) {
-            addCriterion("pd_nettotal <=", value, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalIn(List<Double> values) {
-            addCriterion("pd_nettotal in", values, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalNotIn(List<Double> values) {
-            addCriterion("pd_nettotal not in", values, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalBetween(Double value1, Double value2) {
-            addCriterion("pd_nettotal between", value1, value2, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_nettotalNotBetween(Double value1, Double value2) {
-            addCriterion("pd_nettotal not between", value1, value2, "pd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidIsNull() {
-            addCriterion("pd_whid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidIsNotNull() {
-            addCriterion("pd_whid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidEqualTo(Integer value) {
-            addCriterion("pd_whid =", value, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidNotEqualTo(Integer value) {
-            addCriterion("pd_whid <>", value, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidGreaterThan(Integer value) {
-            addCriterion("pd_whid >", value, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_whid >=", value, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidLessThan(Integer value) {
-            addCriterion("pd_whid <", value, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_whid <=", value, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidIn(List<Integer> values) {
-            addCriterion("pd_whid in", values, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidNotIn(List<Integer> values) {
-            addCriterion("pd_whid not in", values, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidBetween(Integer value1, Integer value2) {
-            addCriterion("pd_whid between", value1, value2, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_whid not between", value1, value2, "pd_whid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeIsNull() {
-            addCriterion("pd_whcode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeIsNotNull() {
-            addCriterion("pd_whcode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeEqualTo(String value) {
-            addCriterion("pd_whcode =", value, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeNotEqualTo(String value) {
-            addCriterion("pd_whcode <>", value, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeGreaterThan(String value) {
-            addCriterion("pd_whcode >", value, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_whcode >=", value, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeLessThan(String value) {
-            addCriterion("pd_whcode <", value, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeLessThanOrEqualTo(String value) {
-            addCriterion("pd_whcode <=", value, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeLike(String value) {
-            addCriterion("pd_whcode like", value, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeNotLike(String value) {
-            addCriterion("pd_whcode not like", value, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeIn(List<String> values) {
-            addCriterion("pd_whcode in", values, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeNotIn(List<String> values) {
-            addCriterion("pd_whcode not in", values, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeBetween(String value1, String value2) {
-            addCriterion("pd_whcode between", value1, value2, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whcodeNotBetween(String value1, String value2) {
-            addCriterion("pd_whcode not between", value1, value2, "pd_whcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameIsNull() {
-            addCriterion("pd_whname is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameIsNotNull() {
-            addCriterion("pd_whname is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameEqualTo(String value) {
-            addCriterion("pd_whname =", value, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameNotEqualTo(String value) {
-            addCriterion("pd_whname <>", value, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameGreaterThan(String value) {
-            addCriterion("pd_whname >", value, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_whname >=", value, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameLessThan(String value) {
-            addCriterion("pd_whname <", value, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameLessThanOrEqualTo(String value) {
-            addCriterion("pd_whname <=", value, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameLike(String value) {
-            addCriterion("pd_whname like", value, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameNotLike(String value) {
-            addCriterion("pd_whname not like", value, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameIn(List<String> values) {
-            addCriterion("pd_whname in", values, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameNotIn(List<String> values) {
-            addCriterion("pd_whname not in", values, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameBetween(String value1, String value2) {
-            addCriterion("pd_whname between", value1, value2, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_whnameNotBetween(String value1, String value2) {
-            addCriterion("pd_whname not between", value1, value2, "pd_whname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidIsNull() {
-            addCriterion("pd_inwhid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidIsNotNull() {
-            addCriterion("pd_inwhid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidEqualTo(Integer value) {
-            addCriterion("pd_inwhid =", value, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidNotEqualTo(Integer value) {
-            addCriterion("pd_inwhid <>", value, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidGreaterThan(Integer value) {
-            addCriterion("pd_inwhid >", value, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_inwhid >=", value, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidLessThan(Integer value) {
-            addCriterion("pd_inwhid <", value, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_inwhid <=", value, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidIn(List<Integer> values) {
-            addCriterion("pd_inwhid in", values, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidNotIn(List<Integer> values) {
-            addCriterion("pd_inwhid not in", values, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidBetween(Integer value1, Integer value2) {
-            addCriterion("pd_inwhid between", value1, value2, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_inwhid not between", value1, value2, "pd_inwhid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeIsNull() {
-            addCriterion("pd_inwhcode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeIsNotNull() {
-            addCriterion("pd_inwhcode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeEqualTo(String value) {
-            addCriterion("pd_inwhcode =", value, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeNotEqualTo(String value) {
-            addCriterion("pd_inwhcode <>", value, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeGreaterThan(String value) {
-            addCriterion("pd_inwhcode >", value, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_inwhcode >=", value, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeLessThan(String value) {
-            addCriterion("pd_inwhcode <", value, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeLessThanOrEqualTo(String value) {
-            addCriterion("pd_inwhcode <=", value, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeLike(String value) {
-            addCriterion("pd_inwhcode like", value, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeNotLike(String value) {
-            addCriterion("pd_inwhcode not like", value, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeIn(List<String> values) {
-            addCriterion("pd_inwhcode in", values, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeNotIn(List<String> values) {
-            addCriterion("pd_inwhcode not in", values, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeBetween(String value1, String value2) {
-            addCriterion("pd_inwhcode between", value1, value2, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhcodeNotBetween(String value1, String value2) {
-            addCriterion("pd_inwhcode not between", value1, value2, "pd_inwhcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameIsNull() {
-            addCriterion("pd_inwhname is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameIsNotNull() {
-            addCriterion("pd_inwhname is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameEqualTo(String value) {
-            addCriterion("pd_inwhname =", value, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameNotEqualTo(String value) {
-            addCriterion("pd_inwhname <>", value, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameGreaterThan(String value) {
-            addCriterion("pd_inwhname >", value, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameGreaterThanOrEqualTo(String value) {
-            addCriterion("pd_inwhname >=", value, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameLessThan(String value) {
-            addCriterion("pd_inwhname <", value, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameLessThanOrEqualTo(String value) {
-            addCriterion("pd_inwhname <=", value, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameLike(String value) {
-            addCriterion("pd_inwhname like", value, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameNotLike(String value) {
-            addCriterion("pd_inwhname not like", value, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameIn(List<String> values) {
-            addCriterion("pd_inwhname in", values, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameNotIn(List<String> values) {
-            addCriterion("pd_inwhname not in", values, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameBetween(String value1, String value2) {
-            addCriterion("pd_inwhname between", value1, value2, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_inwhnameNotBetween(String value1, String value2) {
-            addCriterion("pd_inwhname not between", value1, value2, "pd_inwhname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidIsNull() {
-            addCriterion("pd_orderid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidIsNotNull() {
-            addCriterion("pd_orderid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidEqualTo(Integer value) {
-            addCriterion("pd_orderid =", value, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidNotEqualTo(Integer value) {
-            addCriterion("pd_orderid <>", value, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidGreaterThan(Integer value) {
-            addCriterion("pd_orderid >", value, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_orderid >=", value, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidLessThan(Integer value) {
-            addCriterion("pd_orderid <", value, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_orderid <=", value, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidIn(List<Integer> values) {
-            addCriterion("pd_orderid in", values, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidNotIn(List<Integer> values) {
-            addCriterion("pd_orderid not in", values, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidBetween(Integer value1, Integer value2) {
-            addCriterion("pd_orderid between", value1, value2, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_orderidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_orderid not between", value1, value2, "pd_orderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidIsNull() {
-            addCriterion("pd_sdid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidIsNotNull() {
-            addCriterion("pd_sdid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidEqualTo(Integer value) {
-            addCriterion("pd_sdid =", value, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidNotEqualTo(Integer value) {
-            addCriterion("pd_sdid <>", value, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidGreaterThan(Integer value) {
-            addCriterion("pd_sdid >", value, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_sdid >=", value, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidLessThan(Integer value) {
-            addCriterion("pd_sdid <", value, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_sdid <=", value, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidIn(List<Integer> values) {
-            addCriterion("pd_sdid in", values, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidNotIn(List<Integer> values) {
-            addCriterion("pd_sdid not in", values, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidBetween(Integer value1, Integer value2) {
-            addCriterion("pd_sdid between", value1, value2, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_sdidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_sdid not between", value1, value2, "pd_sdid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusIsNull() {
-            addCriterion("pd_status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusIsNotNull() {
-            addCriterion("pd_status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusEqualTo(Integer value) {
-            addCriterion("pd_status =", value, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusNotEqualTo(Integer value) {
-            addCriterion("pd_status <>", value, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusGreaterThan(Integer value) {
-            addCriterion("pd_status >", value, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_status >=", value, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusLessThan(Integer value) {
-            addCriterion("pd_status <", value, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_status <=", value, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusIn(List<Integer> values) {
-            addCriterion("pd_status in", values, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusNotIn(List<Integer> values) {
-            addCriterion("pd_status not in", values, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusBetween(Integer value1, Integer value2) {
-            addCriterion("pd_status between", value1, value2, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_statusNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_status not between", value1, value2, "pd_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIsNull() {
-            addCriterion("companyid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIsNotNull() {
-            addCriterion("companyid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidEqualTo(Integer value) {
-            addCriterion("companyid =", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotEqualTo(Integer value) {
-            addCriterion("companyid <>", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidGreaterThan(Integer value) {
-            addCriterion("companyid >", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("companyid >=", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidLessThan(Integer value) {
-            addCriterion("companyid <", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidLessThanOrEqualTo(Integer value) {
-            addCriterion("companyid <=", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIn(List<Integer> values) {
-            addCriterion("companyid in", values, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotIn(List<Integer> values) {
-            addCriterion("companyid not in", values, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidBetween(Integer value1, Integer value2) {
-            addCriterion("companyid between", value1, value2, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotBetween(Integer value1, Integer value2) {
-            addCriterion("companyid not between", value1, value2, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridIsNull() {
-            addCriterion("updaterid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridIsNotNull() {
-            addCriterion("updaterid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridEqualTo(Integer value) {
-            addCriterion("updaterid =", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridNotEqualTo(Integer value) {
-            addCriterion("updaterid <>", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridGreaterThan(Integer value) {
-            addCriterion("updaterid >", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridGreaterThanOrEqualTo(Integer value) {
-            addCriterion("updaterid >=", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridLessThan(Integer value) {
-            addCriterion("updaterid <", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridLessThanOrEqualTo(Integer value) {
-            addCriterion("updaterid <=", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridIn(List<Integer> values) {
-            addCriterion("updaterid in", values, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridNotIn(List<Integer> values) {
-            addCriterion("updaterid not in", values, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridBetween(Integer value1, Integer value2) {
-            addCriterion("updaterid between", value1, value2, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridNotBetween(Integer value1, Integer value2) {
-            addCriterion("updaterid not between", value1, value2, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIsNull() {
-            addCriterion("updatetime is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIsNotNull() {
-            addCriterion("updatetime is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeEqualTo(Date value) {
-            addCriterion("updatetime =", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotEqualTo(Date value) {
-            addCriterion("updatetime <>", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeGreaterThan(Date value) {
-            addCriterion("updatetime >", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("updatetime >=", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeLessThan(Date value) {
-            addCriterion("updatetime <", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
-            addCriterion("updatetime <=", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIn(List<Date> values) {
-            addCriterion("updatetime in", values, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotIn(List<Date> values) {
-            addCriterion("updatetime not in", values, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
-            addCriterion("updatetime between", value1, value2, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
-            addCriterion("updatetime not between", value1, value2, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1IsNull() {
-            addCriterion("pd_text1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1IsNotNull() {
-            addCriterion("pd_text1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1EqualTo(String value) {
-            addCriterion("pd_text1 =", value, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1NotEqualTo(String value) {
-            addCriterion("pd_text1 <>", value, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1GreaterThan(String value) {
-            addCriterion("pd_text1 >", value, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1GreaterThanOrEqualTo(String value) {
-            addCriterion("pd_text1 >=", value, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1LessThan(String value) {
-            addCriterion("pd_text1 <", value, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1LessThanOrEqualTo(String value) {
-            addCriterion("pd_text1 <=", value, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1Like(String value) {
-            addCriterion("pd_text1 like", value, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1NotLike(String value) {
-            addCriterion("pd_text1 not like", value, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1In(List<String> values) {
-            addCriterion("pd_text1 in", values, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1NotIn(List<String> values) {
-            addCriterion("pd_text1 not in", values, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1Between(String value1, String value2) {
-            addCriterion("pd_text1 between", value1, value2, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text1NotBetween(String value1, String value2) {
-            addCriterion("pd_text1 not between", value1, value2, "pd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2IsNull() {
-            addCriterion("pd_text2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2IsNotNull() {
-            addCriterion("pd_text2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2EqualTo(String value) {
-            addCriterion("pd_text2 =", value, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2NotEqualTo(String value) {
-            addCriterion("pd_text2 <>", value, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2GreaterThan(String value) {
-            addCriterion("pd_text2 >", value, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2GreaterThanOrEqualTo(String value) {
-            addCriterion("pd_text2 >=", value, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2LessThan(String value) {
-            addCriterion("pd_text2 <", value, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2LessThanOrEqualTo(String value) {
-            addCriterion("pd_text2 <=", value, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2Like(String value) {
-            addCriterion("pd_text2 like", value, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2NotLike(String value) {
-            addCriterion("pd_text2 not like", value, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2In(List<String> values) {
-            addCriterion("pd_text2 in", values, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2NotIn(List<String> values) {
-            addCriterion("pd_text2 not in", values, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2Between(String value1, String value2) {
-            addCriterion("pd_text2 between", value1, value2, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text2NotBetween(String value1, String value2) {
-            addCriterion("pd_text2 not between", value1, value2, "pd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3IsNull() {
-            addCriterion("pd_text3 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3IsNotNull() {
-            addCriterion("pd_text3 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3EqualTo(String value) {
-            addCriterion("pd_text3 =", value, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3NotEqualTo(String value) {
-            addCriterion("pd_text3 <>", value, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3GreaterThan(String value) {
-            addCriterion("pd_text3 >", value, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3GreaterThanOrEqualTo(String value) {
-            addCriterion("pd_text3 >=", value, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3LessThan(String value) {
-            addCriterion("pd_text3 <", value, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3LessThanOrEqualTo(String value) {
-            addCriterion("pd_text3 <=", value, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3Like(String value) {
-            addCriterion("pd_text3 like", value, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3NotLike(String value) {
-            addCriterion("pd_text3 not like", value, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3In(List<String> values) {
-            addCriterion("pd_text3 in", values, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3NotIn(List<String> values) {
-            addCriterion("pd_text3 not in", values, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3Between(String value1, String value2) {
-            addCriterion("pd_text3 between", value1, value2, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text3NotBetween(String value1, String value2) {
-            addCriterion("pd_text3 not between", value1, value2, "pd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4IsNull() {
-            addCriterion("pd_text4 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4IsNotNull() {
-            addCriterion("pd_text4 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4EqualTo(String value) {
-            addCriterion("pd_text4 =", value, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4NotEqualTo(String value) {
-            addCriterion("pd_text4 <>", value, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4GreaterThan(String value) {
-            addCriterion("pd_text4 >", value, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4GreaterThanOrEqualTo(String value) {
-            addCriterion("pd_text4 >=", value, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4LessThan(String value) {
-            addCriterion("pd_text4 <", value, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4LessThanOrEqualTo(String value) {
-            addCriterion("pd_text4 <=", value, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4Like(String value) {
-            addCriterion("pd_text4 like", value, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4NotLike(String value) {
-            addCriterion("pd_text4 not like", value, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4In(List<String> values) {
-            addCriterion("pd_text4 in", values, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4NotIn(List<String> values) {
-            addCriterion("pd_text4 not in", values, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4Between(String value1, String value2) {
-            addCriterion("pd_text4 between", value1, value2, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text4NotBetween(String value1, String value2) {
-            addCriterion("pd_text4 not between", value1, value2, "pd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5IsNull() {
-            addCriterion("pd_text5 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5IsNotNull() {
-            addCriterion("pd_text5 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5EqualTo(String value) {
-            addCriterion("pd_text5 =", value, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5NotEqualTo(String value) {
-            addCriterion("pd_text5 <>", value, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5GreaterThan(String value) {
-            addCriterion("pd_text5 >", value, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5GreaterThanOrEqualTo(String value) {
-            addCriterion("pd_text5 >=", value, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5LessThan(String value) {
-            addCriterion("pd_text5 <", value, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5LessThanOrEqualTo(String value) {
-            addCriterion("pd_text5 <=", value, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5Like(String value) {
-            addCriterion("pd_text5 like", value, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5NotLike(String value) {
-            addCriterion("pd_text5 not like", value, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5In(List<String> values) {
-            addCriterion("pd_text5 in", values, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5NotIn(List<String> values) {
-            addCriterion("pd_text5 not in", values, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5Between(String value1, String value2) {
-            addCriterion("pd_text5 between", value1, value2, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_text5NotBetween(String value1, String value2) {
-            addCriterion("pd_text5 not between", value1, value2, "pd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymIsNull() {
-            addCriterion("pd_ym is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymIsNotNull() {
-            addCriterion("pd_ym is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymEqualTo(Integer value) {
-            addCriterion("pd_ym =", value, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymNotEqualTo(Integer value) {
-            addCriterion("pd_ym <>", value, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymGreaterThan(Integer value) {
-            addCriterion("pd_ym >", value, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pd_ym >=", value, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymLessThan(Integer value) {
-            addCriterion("pd_ym <", value, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymLessThanOrEqualTo(Integer value) {
-            addCriterion("pd_ym <=", value, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymIn(List<Integer> values) {
-            addCriterion("pd_ym in", values, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymNotIn(List<Integer> values) {
-            addCriterion("pd_ym not in", values, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymBetween(Integer value1, Integer value2) {
-            addCriterion("pd_ym between", value1, value2, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_ymNotBetween(Integer value1, Integer value2) {
-            addCriterion("pd_ym not between", value1, value2, "pd_ym");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyIsNull() {
-            addCriterion("pd_yqty is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyIsNotNull() {
-            addCriterion("pd_yqty is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyEqualTo(Double value) {
-            addCriterion("pd_yqty =", value, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyNotEqualTo(Double value) {
-            addCriterion("pd_yqty <>", value, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyGreaterThan(Double value) {
-            addCriterion("pd_yqty >", value, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyGreaterThanOrEqualTo(Double value) {
-            addCriterion("pd_yqty >=", value, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyLessThan(Double value) {
-            addCriterion("pd_yqty <", value, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyLessThanOrEqualTo(Double value) {
-            addCriterion("pd_yqty <=", value, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyIn(List<Double> values) {
-            addCriterion("pd_yqty in", values, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyNotIn(List<Double> values) {
-            addCriterion("pd_yqty not in", values, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyBetween(Double value1, Double value2) {
-            addCriterion("pd_yqty between", value1, value2, "pd_yqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andPd_yqtyNotBetween(Double value1, Double value2) {
-            addCriterion("pd_yqty not between", value1, value2, "pd_yqty");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdInOutExample.java

@@ -1,2182 +0,0 @@
-package com.usoftchina.saas.storage.entities;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class ProdInOutExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public ProdInOutExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andPi_idIsNull() {
-            addCriterion("pi_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idIsNotNull() {
-            addCriterion("pi_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idEqualTo(Integer value) {
-            addCriterion("pi_id =", value, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idNotEqualTo(Integer value) {
-            addCriterion("pi_id <>", value, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idGreaterThan(Integer value) {
-            addCriterion("pi_id >", value, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pi_id >=", value, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idLessThan(Integer value) {
-            addCriterion("pi_id <", value, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idLessThanOrEqualTo(Integer value) {
-            addCriterion("pi_id <=", value, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idIn(List<Integer> values) {
-            addCriterion("pi_id in", values, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idNotIn(List<Integer> values) {
-            addCriterion("pi_id not in", values, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idBetween(Integer value1, Integer value2) {
-            addCriterion("pi_id between", value1, value2, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_idNotBetween(Integer value1, Integer value2) {
-            addCriterion("pi_id not between", value1, value2, "pi_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoIsNull() {
-            addCriterion("pi_inoutno is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoIsNotNull() {
-            addCriterion("pi_inoutno is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoEqualTo(String value) {
-            addCriterion("pi_inoutno =", value, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoNotEqualTo(String value) {
-            addCriterion("pi_inoutno <>", value, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoGreaterThan(String value) {
-            addCriterion("pi_inoutno >", value, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_inoutno >=", value, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoLessThan(String value) {
-            addCriterion("pi_inoutno <", value, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoLessThanOrEqualTo(String value) {
-            addCriterion("pi_inoutno <=", value, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoLike(String value) {
-            addCriterion("pi_inoutno like", value, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoNotLike(String value) {
-            addCriterion("pi_inoutno not like", value, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoIn(List<String> values) {
-            addCriterion("pi_inoutno in", values, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoNotIn(List<String> values) {
-            addCriterion("pi_inoutno not in", values, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoBetween(String value1, String value2) {
-            addCriterion("pi_inoutno between", value1, value2, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_inoutnoNotBetween(String value1, String value2) {
-            addCriterion("pi_inoutno not between", value1, value2, "pi_inoutno");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classIsNull() {
-            addCriterion("pi_class is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classIsNotNull() {
-            addCriterion("pi_class is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classEqualTo(String value) {
-            addCriterion("pi_class =", value, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classNotEqualTo(String value) {
-            addCriterion("pi_class <>", value, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classGreaterThan(String value) {
-            addCriterion("pi_class >", value, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_class >=", value, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classLessThan(String value) {
-            addCriterion("pi_class <", value, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classLessThanOrEqualTo(String value) {
-            addCriterion("pi_class <=", value, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classLike(String value) {
-            addCriterion("pi_class like", value, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classNotLike(String value) {
-            addCriterion("pi_class not like", value, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classIn(List<String> values) {
-            addCriterion("pi_class in", values, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classNotIn(List<String> values) {
-            addCriterion("pi_class not in", values, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classBetween(String value1, String value2) {
-            addCriterion("pi_class between", value1, value2, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_classNotBetween(String value1, String value2) {
-            addCriterion("pi_class not between", value1, value2, "pi_class");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateIsNull() {
-            addCriterion("pi_date is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateIsNotNull() {
-            addCriterion("pi_date is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateEqualTo(Date value) {
-            addCriterion("pi_date =", value, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateNotEqualTo(Date value) {
-            addCriterion("pi_date <>", value, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateGreaterThan(Date value) {
-            addCriterion("pi_date >", value, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateGreaterThanOrEqualTo(Date value) {
-            addCriterion("pi_date >=", value, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateLessThan(Date value) {
-            addCriterion("pi_date <", value, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateLessThanOrEqualTo(Date value) {
-            addCriterion("pi_date <=", value, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateIn(List<Date> values) {
-            addCriterion("pi_date in", values, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateNotIn(List<Date> values) {
-            addCriterion("pi_date not in", values, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateBetween(Date value1, Date value2) {
-            addCriterion("pi_date between", value1, value2, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_dateNotBetween(Date value1, Date value2) {
-            addCriterion("pi_date not between", value1, value2, "pi_date");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidIsNull() {
-            addCriterion("pi_vendid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidIsNotNull() {
-            addCriterion("pi_vendid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidEqualTo(Integer value) {
-            addCriterion("pi_vendid =", value, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidNotEqualTo(Integer value) {
-            addCriterion("pi_vendid <>", value, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidGreaterThan(Integer value) {
-            addCriterion("pi_vendid >", value, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pi_vendid >=", value, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidLessThan(Integer value) {
-            addCriterion("pi_vendid <", value, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidLessThanOrEqualTo(Integer value) {
-            addCriterion("pi_vendid <=", value, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidIn(List<Integer> values) {
-            addCriterion("pi_vendid in", values, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidNotIn(List<Integer> values) {
-            addCriterion("pi_vendid not in", values, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidBetween(Integer value1, Integer value2) {
-            addCriterion("pi_vendid between", value1, value2, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pi_vendid not between", value1, value2, "pi_vendid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeIsNull() {
-            addCriterion("pi_vendcode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeIsNotNull() {
-            addCriterion("pi_vendcode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeEqualTo(String value) {
-            addCriterion("pi_vendcode =", value, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeNotEqualTo(String value) {
-            addCriterion("pi_vendcode <>", value, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeGreaterThan(String value) {
-            addCriterion("pi_vendcode >", value, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_vendcode >=", value, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeLessThan(String value) {
-            addCriterion("pi_vendcode <", value, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeLessThanOrEqualTo(String value) {
-            addCriterion("pi_vendcode <=", value, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeLike(String value) {
-            addCriterion("pi_vendcode like", value, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeNotLike(String value) {
-            addCriterion("pi_vendcode not like", value, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeIn(List<String> values) {
-            addCriterion("pi_vendcode in", values, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeNotIn(List<String> values) {
-            addCriterion("pi_vendcode not in", values, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeBetween(String value1, String value2) {
-            addCriterion("pi_vendcode between", value1, value2, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendcodeNotBetween(String value1, String value2) {
-            addCriterion("pi_vendcode not between", value1, value2, "pi_vendcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameIsNull() {
-            addCriterion("pi_vendname is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameIsNotNull() {
-            addCriterion("pi_vendname is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameEqualTo(String value) {
-            addCriterion("pi_vendname =", value, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameNotEqualTo(String value) {
-            addCriterion("pi_vendname <>", value, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameGreaterThan(String value) {
-            addCriterion("pi_vendname >", value, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_vendname >=", value, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameLessThan(String value) {
-            addCriterion("pi_vendname <", value, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameLessThanOrEqualTo(String value) {
-            addCriterion("pi_vendname <=", value, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameLike(String value) {
-            addCriterion("pi_vendname like", value, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameNotLike(String value) {
-            addCriterion("pi_vendname not like", value, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameIn(List<String> values) {
-            addCriterion("pi_vendname in", values, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameNotIn(List<String> values) {
-            addCriterion("pi_vendname not in", values, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameBetween(String value1, String value2) {
-            addCriterion("pi_vendname between", value1, value2, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_vendnameNotBetween(String value1, String value2) {
-            addCriterion("pi_vendname not between", value1, value2, "pi_vendname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidIsNull() {
-            addCriterion("pi_custid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidIsNotNull() {
-            addCriterion("pi_custid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidEqualTo(Integer value) {
-            addCriterion("pi_custid =", value, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidNotEqualTo(Integer value) {
-            addCriterion("pi_custid <>", value, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidGreaterThan(Integer value) {
-            addCriterion("pi_custid >", value, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pi_custid >=", value, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidLessThan(Integer value) {
-            addCriterion("pi_custid <", value, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidLessThanOrEqualTo(Integer value) {
-            addCriterion("pi_custid <=", value, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidIn(List<Integer> values) {
-            addCriterion("pi_custid in", values, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidNotIn(List<Integer> values) {
-            addCriterion("pi_custid not in", values, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidBetween(Integer value1, Integer value2) {
-            addCriterion("pi_custid between", value1, value2, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pi_custid not between", value1, value2, "pi_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeIsNull() {
-            addCriterion("pi_custcode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeIsNotNull() {
-            addCriterion("pi_custcode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeEqualTo(String value) {
-            addCriterion("pi_custcode =", value, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeNotEqualTo(String value) {
-            addCriterion("pi_custcode <>", value, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeGreaterThan(String value) {
-            addCriterion("pi_custcode >", value, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_custcode >=", value, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeLessThan(String value) {
-            addCriterion("pi_custcode <", value, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeLessThanOrEqualTo(String value) {
-            addCriterion("pi_custcode <=", value, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeLike(String value) {
-            addCriterion("pi_custcode like", value, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeNotLike(String value) {
-            addCriterion("pi_custcode not like", value, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeIn(List<String> values) {
-            addCriterion("pi_custcode in", values, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeNotIn(List<String> values) {
-            addCriterion("pi_custcode not in", values, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeBetween(String value1, String value2) {
-            addCriterion("pi_custcode between", value1, value2, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custcodeNotBetween(String value1, String value2) {
-            addCriterion("pi_custcode not between", value1, value2, "pi_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameIsNull() {
-            addCriterion("pi_custname is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameIsNotNull() {
-            addCriterion("pi_custname is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameEqualTo(String value) {
-            addCriterion("pi_custname =", value, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameNotEqualTo(String value) {
-            addCriterion("pi_custname <>", value, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameGreaterThan(String value) {
-            addCriterion("pi_custname >", value, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_custname >=", value, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameLessThan(String value) {
-            addCriterion("pi_custname <", value, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameLessThanOrEqualTo(String value) {
-            addCriterion("pi_custname <=", value, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameLike(String value) {
-            addCriterion("pi_custname like", value, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameNotLike(String value) {
-            addCriterion("pi_custname not like", value, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameIn(List<String> values) {
-            addCriterion("pi_custname in", values, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameNotIn(List<String> values) {
-            addCriterion("pi_custname not in", values, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameBetween(String value1, String value2) {
-            addCriterion("pi_custname between", value1, value2, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_custnameNotBetween(String value1, String value2) {
-            addCriterion("pi_custname not between", value1, value2, "pi_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidIsNull() {
-            addCriterion("pi_puid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidIsNotNull() {
-            addCriterion("pi_puid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidEqualTo(Integer value) {
-            addCriterion("pi_puid =", value, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidNotEqualTo(Integer value) {
-            addCriterion("pi_puid <>", value, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidGreaterThan(Integer value) {
-            addCriterion("pi_puid >", value, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pi_puid >=", value, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidLessThan(Integer value) {
-            addCriterion("pi_puid <", value, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidLessThanOrEqualTo(Integer value) {
-            addCriterion("pi_puid <=", value, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidIn(List<Integer> values) {
-            addCriterion("pi_puid in", values, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidNotIn(List<Integer> values) {
-            addCriterion("pi_puid not in", values, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidBetween(Integer value1, Integer value2) {
-            addCriterion("pi_puid between", value1, value2, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_puidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pi_puid not between", value1, value2, "pi_puid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeIsNull() {
-            addCriterion("pi_pucode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeIsNotNull() {
-            addCriterion("pi_pucode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeEqualTo(String value) {
-            addCriterion("pi_pucode =", value, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeNotEqualTo(String value) {
-            addCriterion("pi_pucode <>", value, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeGreaterThan(String value) {
-            addCriterion("pi_pucode >", value, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_pucode >=", value, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeLessThan(String value) {
-            addCriterion("pi_pucode <", value, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeLessThanOrEqualTo(String value) {
-            addCriterion("pi_pucode <=", value, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeLike(String value) {
-            addCriterion("pi_pucode like", value, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeNotLike(String value) {
-            addCriterion("pi_pucode not like", value, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeIn(List<String> values) {
-            addCriterion("pi_pucode in", values, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeNotIn(List<String> values) {
-            addCriterion("pi_pucode not in", values, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeBetween(String value1, String value2) {
-            addCriterion("pi_pucode between", value1, value2, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_pucodeNotBetween(String value1, String value2) {
-            addCriterion("pi_pucode not between", value1, value2, "pi_pucode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidIsNull() {
-            addCriterion("pi_said is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidIsNotNull() {
-            addCriterion("pi_said is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidEqualTo(Integer value) {
-            addCriterion("pi_said =", value, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidNotEqualTo(Integer value) {
-            addCriterion("pi_said <>", value, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidGreaterThan(Integer value) {
-            addCriterion("pi_said >", value, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pi_said >=", value, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidLessThan(Integer value) {
-            addCriterion("pi_said <", value, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidLessThanOrEqualTo(Integer value) {
-            addCriterion("pi_said <=", value, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidIn(List<Integer> values) {
-            addCriterion("pi_said in", values, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidNotIn(List<Integer> values) {
-            addCriterion("pi_said not in", values, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidBetween(Integer value1, Integer value2) {
-            addCriterion("pi_said between", value1, value2, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_saidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pi_said not between", value1, value2, "pi_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeIsNull() {
-            addCriterion("pi_sacode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeIsNotNull() {
-            addCriterion("pi_sacode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeEqualTo(String value) {
-            addCriterion("pi_sacode =", value, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeNotEqualTo(String value) {
-            addCriterion("pi_sacode <>", value, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeGreaterThan(String value) {
-            addCriterion("pi_sacode >", value, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_sacode >=", value, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeLessThan(String value) {
-            addCriterion("pi_sacode <", value, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeLessThanOrEqualTo(String value) {
-            addCriterion("pi_sacode <=", value, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeLike(String value) {
-            addCriterion("pi_sacode like", value, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeNotLike(String value) {
-            addCriterion("pi_sacode not like", value, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeIn(List<String> values) {
-            addCriterion("pi_sacode in", values, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeNotIn(List<String> values) {
-            addCriterion("pi_sacode not in", values, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeBetween(String value1, String value2) {
-            addCriterion("pi_sacode between", value1, value2, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_sacodeNotBetween(String value1, String value2) {
-            addCriterion("pi_sacode not between", value1, value2, "pi_sacode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalIsNull() {
-            addCriterion("pi_total is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalIsNotNull() {
-            addCriterion("pi_total is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalEqualTo(BigDecimal value) {
-            addCriterion("pi_total =", value, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalNotEqualTo(BigDecimal value) {
-            addCriterion("pi_total <>", value, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalGreaterThan(BigDecimal value) {
-            addCriterion("pi_total >", value, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("pi_total >=", value, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalLessThan(BigDecimal value) {
-            addCriterion("pi_total <", value, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("pi_total <=", value, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalIn(List<BigDecimal> values) {
-            addCriterion("pi_total in", values, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalNotIn(List<BigDecimal> values) {
-            addCriterion("pi_total not in", values, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("pi_total between", value1, value2, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_totalNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("pi_total not between", value1, value2, "pi_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidIsNull() {
-            addCriterion("pi_recordmanid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidIsNotNull() {
-            addCriterion("pi_recordmanid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidEqualTo(Integer value) {
-            addCriterion("pi_recordmanid =", value, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidNotEqualTo(Integer value) {
-            addCriterion("pi_recordmanid <>", value, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidGreaterThan(Integer value) {
-            addCriterion("pi_recordmanid >", value, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pi_recordmanid >=", value, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidLessThan(Integer value) {
-            addCriterion("pi_recordmanid <", value, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidLessThanOrEqualTo(Integer value) {
-            addCriterion("pi_recordmanid <=", value, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidIn(List<Integer> values) {
-            addCriterion("pi_recordmanid in", values, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidNotIn(List<Integer> values) {
-            addCriterion("pi_recordmanid not in", values, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidBetween(Integer value1, Integer value2) {
-            addCriterion("pi_recordmanid between", value1, value2, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pi_recordmanid not between", value1, value2, "pi_recordmanid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanIsNull() {
-            addCriterion("pi_recordman is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanIsNotNull() {
-            addCriterion("pi_recordman is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanEqualTo(String value) {
-            addCriterion("pi_recordman =", value, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanNotEqualTo(String value) {
-            addCriterion("pi_recordman <>", value, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanGreaterThan(String value) {
-            addCriterion("pi_recordman >", value, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_recordman >=", value, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanLessThan(String value) {
-            addCriterion("pi_recordman <", value, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanLessThanOrEqualTo(String value) {
-            addCriterion("pi_recordman <=", value, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanLike(String value) {
-            addCriterion("pi_recordman like", value, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanNotLike(String value) {
-            addCriterion("pi_recordman not like", value, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanIn(List<String> values) {
-            addCriterion("pi_recordman in", values, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanNotIn(List<String> values) {
-            addCriterion("pi_recordman not in", values, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanBetween(String value1, String value2) {
-            addCriterion("pi_recordman between", value1, value2, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recordmanNotBetween(String value1, String value2) {
-            addCriterion("pi_recordman not between", value1, value2, "pi_recordman");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateIsNull() {
-            addCriterion("pi_recorddate is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateIsNotNull() {
-            addCriterion("pi_recorddate is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateEqualTo(Date value) {
-            addCriterion("pi_recorddate =", value, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateNotEqualTo(Date value) {
-            addCriterion("pi_recorddate <>", value, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateGreaterThan(Date value) {
-            addCriterion("pi_recorddate >", value, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateGreaterThanOrEqualTo(Date value) {
-            addCriterion("pi_recorddate >=", value, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateLessThan(Date value) {
-            addCriterion("pi_recorddate <", value, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateLessThanOrEqualTo(Date value) {
-            addCriterion("pi_recorddate <=", value, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateIn(List<Date> values) {
-            addCriterion("pi_recorddate in", values, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateNotIn(List<Date> values) {
-            addCriterion("pi_recorddate not in", values, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateBetween(Date value1, Date value2) {
-            addCriterion("pi_recorddate between", value1, value2, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_recorddateNotBetween(Date value1, Date value2) {
-            addCriterion("pi_recorddate not between", value1, value2, "pi_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusIsNull() {
-            addCriterion("pi_status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusIsNotNull() {
-            addCriterion("pi_status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusEqualTo(String value) {
-            addCriterion("pi_status =", value, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusNotEqualTo(String value) {
-            addCriterion("pi_status <>", value, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusGreaterThan(String value) {
-            addCriterion("pi_status >", value, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_status >=", value, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusLessThan(String value) {
-            addCriterion("pi_status <", value, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusLessThanOrEqualTo(String value) {
-            addCriterion("pi_status <=", value, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusLike(String value) {
-            addCriterion("pi_status like", value, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusNotLike(String value) {
-            addCriterion("pi_status not like", value, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusIn(List<String> values) {
-            addCriterion("pi_status in", values, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusNotIn(List<String> values) {
-            addCriterion("pi_status not in", values, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusBetween(String value1, String value2) {
-            addCriterion("pi_status between", value1, value2, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statusNotBetween(String value1, String value2) {
-            addCriterion("pi_status not between", value1, value2, "pi_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeIsNull() {
-            addCriterion("pi_statuscode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeIsNotNull() {
-            addCriterion("pi_statuscode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeEqualTo(String value) {
-            addCriterion("pi_statuscode =", value, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeNotEqualTo(String value) {
-            addCriterion("pi_statuscode <>", value, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeGreaterThan(String value) {
-            addCriterion("pi_statuscode >", value, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_statuscode >=", value, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeLessThan(String value) {
-            addCriterion("pi_statuscode <", value, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeLessThanOrEqualTo(String value) {
-            addCriterion("pi_statuscode <=", value, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeLike(String value) {
-            addCriterion("pi_statuscode like", value, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeNotLike(String value) {
-            addCriterion("pi_statuscode not like", value, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeIn(List<String> values) {
-            addCriterion("pi_statuscode in", values, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeNotIn(List<String> values) {
-            addCriterion("pi_statuscode not in", values, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeBetween(String value1, String value2) {
-            addCriterion("pi_statuscode between", value1, value2, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_statuscodeNotBetween(String value1, String value2) {
-            addCriterion("pi_statuscode not between", value1, value2, "pi_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusIsNull() {
-            addCriterion("pi_printstatus is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusIsNotNull() {
-            addCriterion("pi_printstatus is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusEqualTo(String value) {
-            addCriterion("pi_printstatus =", value, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusNotEqualTo(String value) {
-            addCriterion("pi_printstatus <>", value, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusGreaterThan(String value) {
-            addCriterion("pi_printstatus >", value, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_printstatus >=", value, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusLessThan(String value) {
-            addCriterion("pi_printstatus <", value, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusLessThanOrEqualTo(String value) {
-            addCriterion("pi_printstatus <=", value, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusLike(String value) {
-            addCriterion("pi_printstatus like", value, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusNotLike(String value) {
-            addCriterion("pi_printstatus not like", value, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusIn(List<String> values) {
-            addCriterion("pi_printstatus in", values, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusNotIn(List<String> values) {
-            addCriterion("pi_printstatus not in", values, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusBetween(String value1, String value2) {
-            addCriterion("pi_printstatus between", value1, value2, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatusNotBetween(String value1, String value2) {
-            addCriterion("pi_printstatus not between", value1, value2, "pi_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeIsNull() {
-            addCriterion("pi_printstatuscode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeIsNotNull() {
-            addCriterion("pi_printstatuscode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeEqualTo(String value) {
-            addCriterion("pi_printstatuscode =", value, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeNotEqualTo(String value) {
-            addCriterion("pi_printstatuscode <>", value, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeGreaterThan(String value) {
-            addCriterion("pi_printstatuscode >", value, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeGreaterThanOrEqualTo(String value) {
-            addCriterion("pi_printstatuscode >=", value, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeLessThan(String value) {
-            addCriterion("pi_printstatuscode <", value, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeLessThanOrEqualTo(String value) {
-            addCriterion("pi_printstatuscode <=", value, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeLike(String value) {
-            addCriterion("pi_printstatuscode like", value, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeNotLike(String value) {
-            addCriterion("pi_printstatuscode not like", value, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeIn(List<String> values) {
-            addCriterion("pi_printstatuscode in", values, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeNotIn(List<String> values) {
-            addCriterion("pi_printstatuscode not in", values, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeBetween(String value1, String value2) {
-            addCriterion("pi_printstatuscode between", value1, value2, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_printstatuscodeNotBetween(String value1, String value2) {
-            addCriterion("pi_printstatuscode not between", value1, value2, "pi_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIsNull() {
-            addCriterion("companyid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIsNotNull() {
-            addCriterion("companyid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidEqualTo(Integer value) {
-            addCriterion("companyid =", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotEqualTo(Integer value) {
-            addCriterion("companyid <>", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidGreaterThan(Integer value) {
-            addCriterion("companyid >", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("companyid >=", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidLessThan(Integer value) {
-            addCriterion("companyid <", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidLessThanOrEqualTo(Integer value) {
-            addCriterion("companyid <=", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIn(List<Integer> values) {
-            addCriterion("companyid in", values, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotIn(List<Integer> values) {
-            addCriterion("companyid not in", values, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidBetween(Integer value1, Integer value2) {
-            addCriterion("companyid between", value1, value2, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotBetween(Integer value1, Integer value2) {
-            addCriterion("companyid not between", value1, value2, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridIsNull() {
-            addCriterion("updaterid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridIsNotNull() {
-            addCriterion("updaterid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridEqualTo(Integer value) {
-            addCriterion("updaterid =", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridNotEqualTo(Integer value) {
-            addCriterion("updaterid <>", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridGreaterThan(Integer value) {
-            addCriterion("updaterid >", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridGreaterThanOrEqualTo(Integer value) {
-            addCriterion("updaterid >=", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridLessThan(Integer value) {
-            addCriterion("updaterid <", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridLessThanOrEqualTo(Integer value) {
-            addCriterion("updaterid <=", value, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridIn(List<Integer> values) {
-            addCriterion("updaterid in", values, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridNotIn(List<Integer> values) {
-            addCriterion("updaterid not in", values, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridBetween(Integer value1, Integer value2) {
-            addCriterion("updaterid between", value1, value2, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateridNotBetween(Integer value1, Integer value2) {
-            addCriterion("updaterid not between", value1, value2, "updaterid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIsNull() {
-            addCriterion("updatetime is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIsNotNull() {
-            addCriterion("updatetime is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeEqualTo(Date value) {
-            addCriterion("updatetime =", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotEqualTo(Date value) {
-            addCriterion("updatetime <>", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeGreaterThan(Date value) {
-            addCriterion("updatetime >", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("updatetime >=", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeLessThan(Date value) {
-            addCriterion("updatetime <", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
-            addCriterion("updatetime <=", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIn(List<Date> values) {
-            addCriterion("updatetime in", values, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotIn(List<Date> values) {
-            addCriterion("updatetime not in", values, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
-            addCriterion("updatetime between", value1, value2, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
-            addCriterion("updatetime not between", value1, value2, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1IsNull() {
-            addCriterion("pi_text1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1IsNotNull() {
-            addCriterion("pi_text1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1EqualTo(String value) {
-            addCriterion("pi_text1 =", value, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1NotEqualTo(String value) {
-            addCriterion("pi_text1 <>", value, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1GreaterThan(String value) {
-            addCriterion("pi_text1 >", value, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1GreaterThanOrEqualTo(String value) {
-            addCriterion("pi_text1 >=", value, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1LessThan(String value) {
-            addCriterion("pi_text1 <", value, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1LessThanOrEqualTo(String value) {
-            addCriterion("pi_text1 <=", value, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1Like(String value) {
-            addCriterion("pi_text1 like", value, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1NotLike(String value) {
-            addCriterion("pi_text1 not like", value, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1In(List<String> values) {
-            addCriterion("pi_text1 in", values, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1NotIn(List<String> values) {
-            addCriterion("pi_text1 not in", values, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1Between(String value1, String value2) {
-            addCriterion("pi_text1 between", value1, value2, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text1NotBetween(String value1, String value2) {
-            addCriterion("pi_text1 not between", value1, value2, "pi_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2IsNull() {
-            addCriterion("pi_text2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2IsNotNull() {
-            addCriterion("pi_text2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2EqualTo(String value) {
-            addCriterion("pi_text2 =", value, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2NotEqualTo(String value) {
-            addCriterion("pi_text2 <>", value, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2GreaterThan(String value) {
-            addCriterion("pi_text2 >", value, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2GreaterThanOrEqualTo(String value) {
-            addCriterion("pi_text2 >=", value, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2LessThan(String value) {
-            addCriterion("pi_text2 <", value, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2LessThanOrEqualTo(String value) {
-            addCriterion("pi_text2 <=", value, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2Like(String value) {
-            addCriterion("pi_text2 like", value, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2NotLike(String value) {
-            addCriterion("pi_text2 not like", value, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2In(List<String> values) {
-            addCriterion("pi_text2 in", values, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2NotIn(List<String> values) {
-            addCriterion("pi_text2 not in", values, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2Between(String value1, String value2) {
-            addCriterion("pi_text2 between", value1, value2, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text2NotBetween(String value1, String value2) {
-            addCriterion("pi_text2 not between", value1, value2, "pi_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3IsNull() {
-            addCriterion("pi_text3 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3IsNotNull() {
-            addCriterion("pi_text3 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3EqualTo(String value) {
-            addCriterion("pi_text3 =", value, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3NotEqualTo(String value) {
-            addCriterion("pi_text3 <>", value, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3GreaterThan(String value) {
-            addCriterion("pi_text3 >", value, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3GreaterThanOrEqualTo(String value) {
-            addCriterion("pi_text3 >=", value, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3LessThan(String value) {
-            addCriterion("pi_text3 <", value, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3LessThanOrEqualTo(String value) {
-            addCriterion("pi_text3 <=", value, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3Like(String value) {
-            addCriterion("pi_text3 like", value, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3NotLike(String value) {
-            addCriterion("pi_text3 not like", value, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3In(List<String> values) {
-            addCriterion("pi_text3 in", values, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3NotIn(List<String> values) {
-            addCriterion("pi_text3 not in", values, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3Between(String value1, String value2) {
-            addCriterion("pi_text3 between", value1, value2, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text3NotBetween(String value1, String value2) {
-            addCriterion("pi_text3 not between", value1, value2, "pi_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4IsNull() {
-            addCriterion("pi_text4 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4IsNotNull() {
-            addCriterion("pi_text4 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4EqualTo(String value) {
-            addCriterion("pi_text4 =", value, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4NotEqualTo(String value) {
-            addCriterion("pi_text4 <>", value, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4GreaterThan(String value) {
-            addCriterion("pi_text4 >", value, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4GreaterThanOrEqualTo(String value) {
-            addCriterion("pi_text4 >=", value, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4LessThan(String value) {
-            addCriterion("pi_text4 <", value, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4LessThanOrEqualTo(String value) {
-            addCriterion("pi_text4 <=", value, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4Like(String value) {
-            addCriterion("pi_text4 like", value, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4NotLike(String value) {
-            addCriterion("pi_text4 not like", value, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4In(List<String> values) {
-            addCriterion("pi_text4 in", values, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4NotIn(List<String> values) {
-            addCriterion("pi_text4 not in", values, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4Between(String value1, String value2) {
-            addCriterion("pi_text4 between", value1, value2, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text4NotBetween(String value1, String value2) {
-            addCriterion("pi_text4 not between", value1, value2, "pi_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5IsNull() {
-            addCriterion("pi_text5 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5IsNotNull() {
-            addCriterion("pi_text5 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5EqualTo(String value) {
-            addCriterion("pi_text5 =", value, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5NotEqualTo(String value) {
-            addCriterion("pi_text5 <>", value, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5GreaterThan(String value) {
-            addCriterion("pi_text5 >", value, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5GreaterThanOrEqualTo(String value) {
-            addCriterion("pi_text5 >=", value, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5LessThan(String value) {
-            addCriterion("pi_text5 <", value, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5LessThanOrEqualTo(String value) {
-            addCriterion("pi_text5 <=", value, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5Like(String value) {
-            addCriterion("pi_text5 like", value, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5NotLike(String value) {
-            addCriterion("pi_text5 not like", value, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5In(List<String> values) {
-            addCriterion("pi_text5 in", values, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5NotIn(List<String> values) {
-            addCriterion("pi_text5 not in", values, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5Between(String value1, String value2) {
-            addCriterion("pi_text5 between", value1, value2, "pi_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andPi_text5NotBetween(String value1, String value2) {
-            addCriterion("pi_text5 not between", value1, value2, "pi_text5");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdIODetail.java → applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdIODetail.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.storage.entities;
+package com.usoftchina.saas.storage.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import com.usoftchina.saas.document.entities.Product;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdIODetailExample.java → applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdIODetailExample.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.purchase.po;
+package com.usoftchina.saas.storage.po;
 
 import java.util.ArrayList;
 import java.util.Date;

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdInOut.java → applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.storage.entities;
+package com.usoftchina.saas.storage.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import lombok.Data;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutExample.java → applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOutExample.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.purchase.po;
+package com.usoftchina.saas.storage.po;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdInOutList.java → applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOutList.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.storage.entities;
+package com.usoftchina.saas.storage.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import lombok.Data;
@@ -86,9 +86,9 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private String pd_unit;
 
-    private Integer pd_inqty;
+    private Double pd_inqty;
 
-    private Integer pd_outqty;
+    private Double pd_outqty;
 
     private Double pd_orderprice;
 
@@ -134,7 +134,7 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private Integer pd_ym;
 
-    private Integer pd_yqty;
+    private Double pd_yqty;
 
     private String pd_remark;
 

applications/storage/storage-server/pom.xml

@@ -12,6 +12,10 @@
     <artifactId>storage-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>document-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>auth-client</artifactId>

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/controller/ProdInOutController.java

@@ -4,18 +4,16 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.storage.dto.ProdInOutFormDTO;
-import com.usoftchina.saas.storage.dto.ProdInOutReqDTO;
-import com.usoftchina.saas.storage.entities.ProdInOutList;
+import com.usoftchina.saas.storage.po.ProdInOutList;
 import com.usoftchina.saas.storage.service.ProdInOutService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RestController
-@RequestMapping("/storage/prodInOut")
+@RequestMapping("/prodinout")
 public class ProdInOutController {
 
     @Autowired
@@ -29,7 +27,7 @@ public class ProdInOutController {
      * @return
      */
     @GetMapping("/list")
-    public Result<PageInfo<ProdInOutList>> getListData(PageRequest page, ProdInOutReqDTO req) {
+    public Result<PageInfo<ProdInOutList>> getListData(PageRequest page, ListReqDTO req) {
         PageInfo<ProdInOutList> listData = prodInOutService.getListData(page,req);
         return Result.success(listData);
     }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/ProdIODetailMapper.java

@@ -1,8 +1,7 @@
 package com.usoftchina.saas.storage.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
-import com.usoftchina.saas.storage.entities.ProdIODetail;
-import org.apache.ibatis.annotations.Param;
+import com.usoftchina.saas.storage.po.ProdIODetail;
 
 import java.util.List;
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/ProdInOutListMapper.java

@@ -1,16 +1,16 @@
 package com.usoftchina.saas.storage.mapper;
 
 
-import com.usoftchina.saas.storage.dto.ProdInOutReqDTO;
-import com.usoftchina.saas.storage.entities.ProdInOutList;
+import com.usoftchina.saas.storage.po.ProdInOutList;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 
 public interface ProdInOutListMapper {
 
-    List<ProdInOutList> selectProdInOutListByCondition(ProdInOutReqDTO reqDTO);
+    List<ProdInOutList> selectProdInOutListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 
-    List<ProdInOutList> selectProdInOutBycondition(ProdInOutReqDTO reqDTO);
+    List<ProdInOutList> selectProdInOutBycondition(@Param("con") String con,@Param("companyId") Long companyId);
 
 }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/ProdInOutMapper.java

@@ -1,7 +1,7 @@
 package com.usoftchina.saas.storage.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
-import com.usoftchina.saas.storage.entities.ProdInOut;
+import com.usoftchina.saas.storage.po.ProdInOut;
 
 public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/ProdInOutService.java

@@ -5,12 +5,12 @@ import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.storage.dto.ProdInOutFormDTO;
-import com.usoftchina.saas.storage.dto.ProdInOutReqDTO;
-import com.usoftchina.saas.storage.entities.ProdInOut;
-import com.usoftchina.saas.storage.entities.ProdInOutList;
 import com.usoftchina.saas.storage.mapper.ProdInOutMapper;
+import com.usoftchina.saas.storage.po.ProdInOut;
+import com.usoftchina.saas.storage.po.ProdInOutList;
 
 public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, ProdInOut> {
 
@@ -55,7 +55,7 @@ public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, Pro
 
     void batchDelete(BatchDealBaseDTO baseDTOs);
 
-    PageInfo<ProdInOutList> getListData(PageRequest page, ProdInOutReqDTO req);
+    PageInfo<ProdInOutList> getListData(PageRequest page, ListReqDTO req);
 
     Result turnProdOut(Long id);
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInoutServiceImpl.java

@@ -8,6 +8,7 @@ import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.api.WarehouseApi;
@@ -17,13 +18,12 @@ import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.storage.dto.ProdIODetailDTO;
 import com.usoftchina.saas.storage.dto.ProdInOutDTO;
 import com.usoftchina.saas.storage.dto.ProdInOutFormDTO;
-import com.usoftchina.saas.storage.dto.ProdInOutReqDTO;
-import com.usoftchina.saas.storage.entities.ProdIODetail;
-import com.usoftchina.saas.storage.entities.ProdInOut;
-import com.usoftchina.saas.storage.entities.ProdInOutList;
 import com.usoftchina.saas.storage.mapper.ProdIODetailMapper;
 import com.usoftchina.saas.storage.mapper.ProdInOutListMapper;
 import com.usoftchina.saas.storage.mapper.ProdInOutMapper;
+import com.usoftchina.saas.storage.po.ProdIODetail;
+import com.usoftchina.saas.storage.po.ProdInOut;
+import com.usoftchina.saas.storage.po.ProdInOutList;
 import com.usoftchina.saas.storage.service.ProdInOutService;
 import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,13 +41,14 @@ public class ProdInoutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     private ProdInOutListMapper prodInOutListMapper;
     @Autowired
     private WarehouseApi warehouseApi;
+
     @Autowired
     private MaxnumberService maxnumberService;
 
 
 
     @Override
-    public PageInfo<ProdInOutList> getListData(PageRequest page, ProdInOutReqDTO req) {
+    public PageInfo<ProdInOutList> getListData(PageRequest page, ListReqDTO req) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -62,12 +63,14 @@ public class ProdInoutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         return pageInfo;
     }
 
-    private List<ProdInOutList> getListByMode(ProdInOutReqDTO req) {
+    private List<ProdInOutList> getListByMode(ListReqDTO req) {
         List<ProdInOutList> list = null;
+        Long companyId = BaseContextHolder.getCompanyId();
+        String con = req.getFinalCondition();
         if (null == req || StringUtils.isEmpty(req.getMode()) || "Main".equals(req.getMode())) {
-            list = prodInOutListMapper.selectProdInOutListByCondition(req);
+            list = prodInOutListMapper.selectProdInOutListByCondition(con, companyId);
         } else {
-            list = prodInOutListMapper.selectProdInOutBycondition(req);
+            list = prodInOutListMapper.selectProdInOutBycondition(con, companyId);
         }
         return list;
     }
@@ -130,7 +133,7 @@ public class ProdInoutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                 detail.setPd_piid(pi_id);
                 detail.setPd_inoutno(pi_inoutno);
                 detail.setPd_piclass(prodInOut.getPi_class());
-                detail.setPd_yqty(new Double(0));
+//                detail.setPd_yqty(new Double());
                 insertDetails.add(detail);
             }
             //插入从表

applications/storage/storage-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 9000
   tomcat:

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usoftchina.saas.purchase.mapper.ProdIODetailMapper">
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdIODetail">
     <id column="pd_id" jdbcType="INTEGER" property="id" />
     <result column="pd_piid" jdbcType="INTEGER" property="pd_piid" />
     <result column="pd_inoutno" jdbcType="VARCHAR" property="pd_inoutno" />
@@ -72,9 +72,10 @@
       <result column="pr_text4" property="pr_text4"/>
     </association>
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdIODetail">
     <result column="pd_remark" jdbcType="LONGVARCHAR" property="pd_remark" />
   </resultMap>
+
   <sql id="Base_Column_List">
     pd_id, pd_piid, pd_inoutno, pd_piclass, pd_pdno, pd_ordercode, pd_orderdetno, pd_prodid, 
     pd_prodcode, pd_unit, pd_inqty, pd_outqty, pd_orderprice, pd_sendprice, pd_price, 
@@ -85,6 +86,7 @@
   <sql id="Blob_Column_List">
     pd_remark
   </sql>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
@@ -97,7 +99,8 @@
     delete from prodiodetail
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+
+  <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     insert into prodiodetail (pd_id, pd_piid, pd_inoutno, 
       pd_piclass, pd_pdno, pd_ordercode, 
       pd_orderdetno, pd_prodid, pd_prodcode, 
@@ -128,7 +131,7 @@
       #{pd_ioid,jdbcType=INTEGER}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
@@ -372,7 +375,8 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     <set>
       <if test="pd_piid != null">
@@ -495,7 +499,7 @@
     </set>
     where pd_id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     set pd_piid = #{pd_piid,jdbcType=INTEGER},
       pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
@@ -538,7 +542,7 @@
       pd_ioid = #{pd_ioid,jdbcType=INTEGER}
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     set pd_piid = #{pd_piid,jdbcType=INTEGER},
       pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
@@ -861,7 +865,7 @@
 
 
 
-  <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail" >
+  <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.po.ProdIODetail" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update prodiodetail <set>
       <if test="item.pd_piid !=null">

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usoftchina.saas.purchase.mapper.ProdInOutListMapper">
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdInOutList">
+<mapper namespace="com.usoftchina.saas.storage.mapper.ProdInOutListMapper">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdInOutList">
     <id column="pi_id" jdbcType="INTEGER" property="id" />
     <result column="pi_inoutno" jdbcType="VARCHAR" property="pi_inoutno" />
     <result column="pi_class" jdbcType="VARCHAR" property="pi_class" />
@@ -39,8 +39,8 @@
     <result column="pd_prodid" jdbcType="INTEGER" property="pd_prodid" />
     <result column="pd_prodcode" jdbcType="VARCHAR" property="pd_prodcode" />
     <result column="pd_unit" jdbcType="VARCHAR" property="pd_unit" />
-    <result column="pd_inqty" jdbcType="INTEGER" property="pd_inqty" />
-    <result column="pd_outqty" jdbcType="INTEGER" property="pd_outqty" />
+    <result column="pd_inqty" jdbcType="DOUBLE" property="pd_inqty" />
+    <result column="pd_outqty" jdbcType="DOUBLE" property="pd_outqty" />
     <result column="pd_orderprice" jdbcType="DOUBLE" property="pd_orderprice" />
     <result column="pd_sendprice" jdbcType="DOUBLE" property="pd_sendprice" />
     <result column="pd_price" jdbcType="DOUBLE" property="pd_price" />
@@ -66,46 +66,35 @@
     <result column="pd_text4" jdbcType="VARCHAR" property="pd_text4" />
     <result column="pd_text5" jdbcType="VARCHAR" property="pd_text5" />
     <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
-    <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
+    <result column="pd_yqty" jdbcType="DOUBLE" property="pd_yqty" />
     <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
 
   </resultMap>
 
 
-  <select id="selectProdInOutListByCondition" parameterType="com.usoftchina.saas.storage.dto.ProdInOutReqDTO" resultMap="BaseResultMap">
-    select  *  from prodinout left join prodiodetail on pi_id = pd_piid
+  <select id="selectProdInOutListByCondition"  resultMap="BaseResultMap">
+    select  *  from prodinout left join prodiodetail on pi_id=pd_piid
     <where>
-      <if test="begin != null">
-        pu_date &gt;= ${begin}
+      <if test="con != null">
+        ${con}
       </if>
-      <if test="end!= null">
-        AND  pu_date &lt;= ${end}
+      <if test="companyId != null">
+        and   prodinout.companyId = #{companyId}
       </if>
-      <if test="status != null">
-        AND pu_status=${status}
-      </if>
-      <if test="keyword != null">
-        AND ${keyword}
-      </if>
-    </where>
+    </where>  order by pi_id,pd_pdno
   </select>
 
-  <select id="selectProdInOutBycondition" parameterType="com.usoftchina.saas.storage.dto.ProdInOutReqDTO" resultMap="BaseResultMap">
+  <select id="selectProdInOutBycondition"  resultMap="BaseResultMap">
     select  *  from prodinout
     <where>
-      <if test="begin != null">
-        pu_date &gt;= ${begin}
-      </if>
-      <if test="end!= null">
-        AND  pu_date &lt;= ${end}
-      </if>
-      <if test="status != null">
-        AND pu_status=${status}
+      <if test="con != null">
+        ${con}
       </if>
-      <if test="keyword != null">
-        AND ${keyword}
+      <if test="companyId != null">
+        and  companyId = #{companyId}
       </if>
     </where>
+    order by pi_id
   </select>
 
 

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usoftchina.saas.purchase.mapper.ProdInOutMapper">
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdInOut">
+<mapper namespace="com.usoftchina.saas.storage.mapper.ProdInOutMapper">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdInOut">
     <id column="pi_id" jdbcType="INTEGER" property="id" />
     <result column="pi_inoutno" jdbcType="VARCHAR" property="pi_inoutno" />
     <result column="pi_class" jdbcType="VARCHAR" property="pi_class" />
@@ -36,67 +36,9 @@
 
 
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.entities.ProdInOut">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
     pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_recordmanid, 
@@ -106,36 +48,7 @@
   <sql id="Blob_Column_List">
     pi_address
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdInOut" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.storage.entities.ProdInOut" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
@@ -148,13 +61,8 @@
     delete from prodinout
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
-    delete from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+
+  <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     insert into prodinout (pi_id, pi_inoutno, pi_class, 
       pi_date, pi_vendid, pi_vendcode, 
       pi_vendname, pi_custid, pi_custcode, 
@@ -178,7 +86,7 @@
       #{pi_text3,jdbcType=VARCHAR}, #{pi_text4,jdbcType=VARCHAR}, #{pi_text5,jdbcType=VARCHAR}, 
       #{pi_address,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
@@ -370,189 +278,8 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.storage.entities.ProdInOut" resultType="java.lang.Long">
-    select count(*) from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update prodinout
-    <set>
-      <if test="record.pi_id != null">
-        pi_id = #{record.pi_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_inoutno != null">
-        pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_class != null">
-        pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_date != null">
-        pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_vendid != null">
-        pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_vendcode != null">
-        pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_vendname != null">
-        pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_custid != null">
-        pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_custcode != null">
-        pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_custname != null">
-        pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_puid != null">
-        pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_pucode != null">
-        pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_said != null">
-        pi_said = #{record.pi_said,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_sacode != null">
-        pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_total != null">
-        pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pi_recordmanid != null">
-        pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_recordman != null">
-        pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_recorddate != null">
-        pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_status != null">
-        pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_statuscode != null">
-        pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_printstatus != null">
-        pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_printstatuscode != null">
-        pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterid != null">
-        updaterid = #{record.updaterid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatetime != null">
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_text1 != null">
-        pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text2 != null">
-        pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text3 != null">
-        pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text4 != null">
-        pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text5 != null">
-        pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_address != null">
-        pi_address = #{record.pi_address,jdbcType=LONGVARCHAR},
-      </if>
 
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update prodinout
-    set pi_id = #{record.pi_id,jdbcType=INTEGER},
-      pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{record.pi_said,jdbcType=INTEGER},
-      pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
-      pi_address = #{record.pi_address,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update prodinout
-    set pi_id = #{record.pi_id,jdbcType=INTEGER},
-      pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{record.pi_said,jdbcType=INTEGER},
-      pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR}
-
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     <set>
       <if test="pi_inoutno != null">
@@ -649,72 +376,5 @@
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
-    update prodinout
-    set pi_inoutno = #{pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{pi_class,jdbcType=VARCHAR},
-      pi_date = #{pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{pi_said,jdbcType=INTEGER},
-      pi_sacode = #{pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{pi_recorddate,jdbcType=TIMESTAMP},
-      pi_status = #{pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updaterid = #{updaterid,jdbcType=INTEGER},
-      updatetime = #{updatetime,jdbcType=TIMESTAMP},
-      pi_text1 = #{pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{pi_text5,jdbcType=VARCHAR},
-      pi_address = #{pi_address,jdbcType=LONGVARCHAR}
 
-    where pi_id = #{pi_id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
-    update prodinout
-    set pi_inoutno = #{pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{pi_class,jdbcType=VARCHAR},
-      pi_date = #{pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{pi_said,jdbcType=INTEGER},
-      pi_sacode = #{pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{pi_recorddate,jdbcType=TIMESTAMP},
-      pi_status = #{pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{companyId,jdbcType=INTEGER},
-      updaterid = #{updaterId,jdbcType=INTEGER},
-      updatetime = #{updateTime,jdbcType=TIMESTAMP},
-      pi_text1 = #{pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{pi_text5,jdbcType=VARCHAR}
-    where pi_id = #{id,jdbcType=INTEGER}
-  </update>
 </mapper>

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({

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -0,0 +1,218 @@
+Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'stock-appropriationinout-formpanel',
+
+    controller: 'stock-appropriationinout-formpanel',
+    viewModel: 'stock-appropriationinout-formpanel',
+    
+     //字段属性
+     _title:'其它入库单',
+     _idField: 'id',
+     _codeField: 'pi_inoutno',
+     _statusField: 'pi_status',
+     _statusCodeField: 'pi_statuscode',
+     
+     _relationColumn: 'pd_piid',
+     _readUrl:'http://localhost:8800/purchase/read/',
+     _saveUrl:'http://localhost:8800/purchase/save',
+     _auditUrl:'http://localhost:8800/purchase/audit',
+     _deleteUrl:'http://localhost:8800/purchase/delete/',
+     _deleteDetailUrl:'http://localhost:8800/purchase/deleteItem/',
+     _turnInUrl:'http://localhost:8800/purchase/turnProdin/',
+     initId:0,
+ 
+     toolBtns: [{
+         xtype: 'button',
+         text: '转其他出库',
+         handler: 'turnIn'
+     }],
+
+    defaultItems: [{
+        xtype: 'hidden',
+        name: 'id',
+        bind: '{id}',
+        fieldLabel: 'id',
+        allowBlank: true,
+        columnWidth: 0
+    },{
+        xtype : "textfield", 
+        name : "pi_inoutno", 
+        bind : "{pi_inoutno}", 
+        fieldLabel : "调拨单号", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        xtype : "datefield", 
+        name : "pi_date", 
+        bind : "{pi_date}", 
+        fieldLabel : "单据日期", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        name : "detailGridField", 
+        xtype : "detailGridField", 
+        _detnoColumn:  'pd_pdno',
+        columns : [
+            {
+                text : "序号", 
+                dataIndex : "pd_pdno", 
+                width : 100, 
+                xtype : "numbercolumn",
+                align : 'center',
+                format:'0',
+                summaryType: 'count',
+                summaryRenderer: function(value, summaryData, dataIndex) {
+                    return Ext.String.format('合计： {0}条', value);
+                },
+            }, {
+                text : "id", 
+                dataIndex : "id", 
+                xtype : "numbercolumn",
+                hidden:true
+            },{
+                text : "pd_piid", 
+                dataIndex : "pd_piid", 
+                xtype : "numbercolumn",
+                hidden:true
+            },
+            {
+                text : "物料编号", 
+                width : 200.0, 
+                dataIndex : "pd_prodcode", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            },
+            {
+                text : "名称", 
+                dataIndex : "pr_detail",
+                ignore:true
+            },
+            {
+                text : "规格", 
+                dataIndex : "pr_spec",
+                ignore:true
+            },
+            {
+                text : "单位", 
+                dataIndex : "pr_unit",
+                ignore:true
+            },
+            {
+                text : "数量", 
+                dataIndex : "pd_qty", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                format:'0',
+                items : null,
+                summaryType: 'sum'
+            }, {
+                text : "拨出仓库id", 
+                dataIndex : "pd_whid", 
+                xtype : "numbercolumn",
+                hidden:true
+            },
+            {
+                text : "拨出仓库编号", 
+                dataIndex : "pd_whcode", 
+                width : 120.0, 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            },{
+                text : "拨出仓库名称", 
+                dataIndex : "pd_whname", 
+                width : 120.0
+            },{
+                text : "拨入仓库id", 
+                dataIndex : "pd_inwhid", 
+                xtype : "numbercolumn",
+                hidden:true
+            },{
+                text : "拨入仓库编号", 
+                dataIndex : "pd_inwhcode", 
+                width : 120.0, 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            },{
+                text : "拨入仓库名称", 
+                dataIndex : "pd_inwhname", 
+                width : 120.0
+            }
+            
+            
+           
+        ]
+    }, {
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "createTime", 
+        bind : "{createTime}", 
+        fieldLabel : "创建时间", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    }, {
+        xtype : "datefield", 
+        name : "updateTime", 
+        bind : "{updateTime}", 
+        fieldLabel : "更新时间", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    }, {
+        xtype : "textfield", 
+        readOnly : true, 
+        editable : false, 
+        name : "pu_status", 
+        bind : "{pi_status}", 
+        fieldLabel : "单据状态", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    }, {
+        xtype : "hidden", 
+        readOnly : true, 
+        editable : false, 
+        name : "pi_statuscode", 
+        bind : "{pi_statuscode}", 
+        fieldLabel : "单据状态码", 
+        allowBlank : true, 
+        columnWidth : 0.0
+    }]
+});

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -0,0 +1,158 @@
+Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.stock-appropriationinout-formpanel',
+    
+    init: function (form) {
+        var me = this;
+        this.control({
+            /**放大镜新增demo*/
+            "field[name=combo]":{
+                beforerender:function(f){
+                    f.addHandler=me.addCombo;
+                }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pu_vendcode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dbfinds:[{
+                            from:'ve_code',to:'pu_vendcode'
+                        },{
+                            from:'ve_name',to:'pu_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        dbColumns:[{
+                            conditionCode:'ve_id',
+                            "text": "供应商ID",
+                            "flex": 0,
+                            "dataIndex": "ve_id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            conditionCode:'ve_code',
+                            "text": "供应商编号",
+                            "flex": 1,
+                            "dataIndex": "ve_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'ve_name',
+                            "text": "供应商名称",
+                            "flex": 1,
+                            "dataIndex": "ve_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'ve_type',
+                            "text": "供应商类型",
+                            "flex": 0,
+                            "dataIndex": "ve_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pd_prodcode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        conditionCode:'pr_code',
+                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dbfinds:[{
+                            from:'pr_code',to:'pd_prodcode'
+                        }],
+                        dbtpls:[{
+                            field:'pr_code',width:100
+                        },{
+                            field:'pr_detail',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "物料ID",
+                            "flex": 0,
+                            "dataIndex": "pr_id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "物料编号",
+                            "flex": 1,
+                            "dataIndex": "pr_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料名称",
+                            "flex": 1,
+                            "dataIndex": "pr_detail",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料规格",
+                            "flex": 0,
+                            "dataIndex": "pr_spec",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+
+    },
+    addCombo:function(){
+        var combo=this.ownerCmp;
+        Ext.create('Ext.window.Window',{
+            layout:'vbox',
+            bodyPadding: 15,
+            width:500,
+            items:[{
+                fieldLabel:'实际值',
+                xtype:'textfield'
+            },{
+                fieldLabel:'显示值',
+                xtype:'textfield'
+            }],
+            buttons:[{
+                text:'确认',
+                handler:function(b){
+                    combo.setValue('ok');
+                    b.up('window').close();
+                }
+            }],
+            renderTo:this.ownerCmp.ownerCt.getEl()
+        }).show();
+
+    },
+
+    turnIn: function() {
+        var me = this,
+        form = me.getView(),
+        id = form.getForm().findField(form._idField);
+        form.BaseUtil.request({
+            url: form._turnInUrl+id.value,
+            method: 'GET',
+        })
+        .then(function(res) {
+            var localJson = new Ext.decode(res.responseText);
+            if(localJson.success){
+                Ext.Msg.alert('提示','转单成功');
+              
+            }
+        })
+        .catch(function() {
+            Ext.Msg.alert('提示','转单失败');
+        });
+     }
+});

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelModel.js

@@ -0,0 +1,8 @@
+Ext.define('saas.view.stock.appropriationInOut.FormPanelModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.stock-appropriationinout-formpanel',
+    data: {
+        pi_class: '调拨单'
+     }
+
+});

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -0,0 +1,212 @@
+Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
+    extend: 'saas.view.core.query.QueryPanel',
+    xtype: 'stock-appropriationinout-querypanel',
+
+    controller: 'stock-appropriationinout-querypanel',
+    viewModel: 'stock-appropriationinout-querypanel',
+
+    viewName: 'stock-appropriationinout-querypanel',
+
+    queryFormItems: [{
+        xtype: 'hidden',
+        name: 'pu_id',
+        bind: '{pu_id}',
+        fieldLabel: 'ID',
+        allowBlank: true,
+        columnWidth: 0
+    }, {
+        xtype: 'textfield',
+        name: 'pu_code',
+        bind: '{pu_code}',
+        fieldLabel: '单据编号',
+        allowBlank: true,
+        columnWidth: 0.25
+    }, {
+        xtype: 'condatefield',
+        name: 'pu_date',
+        bind: '{pu_date}',
+        fieldLabel: '采购日期',
+        allowBlank: true,
+        columnWidth: 0.5
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'pu_vendcode',
+        bind: '{pu_vendcode}',
+        fieldLabel: '供应商编号',
+        allowBlank: true,
+        columnWidth: 0.25
+    }, {
+        xtype: 'textfield',
+        name: 'pu_vendname',
+        bind: '{pu_vendname}',
+        fieldLabel: '供应商名称',
+        allowBlank: true,
+        columnWidth: 0.25
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'pd_prodcode#pd_prodcode',
+        //#pr_detail
+        bind: '{pd_prodcode}',
+        fieldLabel: '物料编号',
+        fieldMode: 'DETAIL',
+        queryType: 'VAG',
+        allowBlank: true,
+        columnWidth: 0.25
+    }, {
+        xtype: 'textfield',
+        name: 'pr_detail',
+        bind: '{pr_detail}',
+        fieldLabel: '物料名称',
+        allowBlank: true,
+        columnWidth: 0.25
+    }, {
+        xtype: 'combobox',
+        name: 'pu_statuscode',
+       // bind: '{pu_statuscode}',
+        fieldLabel: '审核状态',
+        allowBlank: true,
+        columnWidth: 0.25,
+        queryMode: 'local',
+        displayField: 'pu_status',
+        valueField: 'pu_statuscode',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['pu_statuscode', 'pu_status'],
+        data: [
+            ["$ALL", "全部"],
+            ["AUDITED", "已审核"],
+            ["UNAUDITED", "未审核"]
+        ]
+        })
+    }, {
+        xtype: 'multicombo',
+        name: 'pu_acceptstatuscode',
+        bind: '{pu_acceptstatuscode}',
+        fieldLabel: '入库状态',
+        allowBlank: true,
+        columnWidth: 0.25,
+        datas: [
+            ["TURNIN", "已入库"],
+            ["UNTURNIN", "未入库"],
+            ["PARTIN", "部分入库"]
+        ]
+    }],
+    moreQueryFormItems: [{
+        xtype: 'textfield',
+        name: 'pu_buyername',
+        bind: '{pu_buyername}',
+        fieldLabel: '采购员',
+        allowBlank: true
+    }, {
+        xtype: 'textfield',
+        name: 'pu_total',
+        bind: '{pu_total}',
+        fieldLabel: '金额',
+        allowBlank: true
+    }, {
+        xtype: 'condatefield',
+        name: 'pu_delivery',
+        bind: '{pu_delivery}',
+        fieldLabel: '交货日期',
+        allowBlank: true,
+        columnWidth: 1
+    }],
+    queryGridConfig: {
+        idField: 'pu_id',
+        codeField: 'pu_code',
+        addTitle: '采购单',
+        addXtype: 'purchase-purchase-formpanel',
+        defaultCondition:' pi_class = \'调拨单\'',
+        baseVastUrl: 'http://localhost:8800/purchase/',
+        baseColumn: [{
+            text: '序号',
+            width: 80,
+            xtype: 'rownumberer'
+        }, {
+            text: 'id',
+            dataIndex: 'pu_id',
+            width: 100,
+            xtype: 'numbercolumn'
+        }, {
+            text: '单据编号',
+            dataIndex: 'pu_code',
+            width: 120
+        }, {
+            text: '单据状态',
+            dataIndex: 'pu_status',
+            width: 120
+        }, {
+            text: '下单日期',
+            dataIndex: 'pu_indate',
+            xtype: 'datecolumn',
+            width: 200
+        }, {
+            text: '供应商名称',
+            dataIndex: 'pu_vendname',
+            width: 120
+        }, {
+            text: '含税金额',
+            dataIndex: 'pu_taxtotal',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
+            text: '金额',
+            dataIndex: 'pu_total',
+            xtype: 'numbercolumn',
+            width: 120,
+            flex: 1
+        }],
+        relativeColumn: [{
+            text: '序号',
+            width: 80,
+            xtype: 'rownumberer'
+        }, {
+            text: 'id',
+            dataIndex: 'pu_id',
+            width: 100,
+            xtype: 'numbercolumn'
+        }, {
+            text: '单据编号',
+            dataIndex: 'pu_code',
+            width: 120
+        }, {
+            text: '单据状态',
+            dataIndex: 'pu_status',
+            width: 120
+        }, {
+            text: '下单日期',
+            dataIndex: 'pu_indate',
+            xtype: 'datecolumn',
+            width: 200
+        }, {
+            text: '供应商名称',
+            dataIndex: 'pu_vendname',
+            width: 120
+        }, {
+            text: '采购序号',
+            dataIndex: 'pd_detno',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
+            text: '物料编号',
+            dataIndex: 'pd_prodcode',
+            width: 120
+        }, {
+            text: '数量',
+            dataIndex: 'pd_qty',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
+            text: '单价',
+            dataIndex: 'pd_price',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
+            text: '已转数',
+            dataIndex: 'pd_ytqy',
+            xtype: 'numbercolumn',
+            width: 120,
+            flex: 1
+        }]
+    }
+});

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -0,0 +1,115 @@
+Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
+    extend: 'saas.view.core.query.QueryPanelController',
+    alias: 'controller.stock-appropriationinout-querypanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pu_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dbfinds:[{
+                            from:'ve_code',to:'pu_vendcode'
+                        },{
+                            from:'ve_name',to:'pu_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        dbColumns:[{
+                            conditionCode:'ve_id',
+                            "text": "供应商ID",
+                            "flex": 0,
+                            "dataIndex": "ve_id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            conditionCode:'ve_code',
+                            "text": "供应商编号",
+                            "flex": 1,
+                            "dataIndex": "ve_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'ve_name',
+                            "text": "供应商名称",
+                            "flex": 1,
+                            "dataIndex": "ve_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'ve_type',
+                            "text": "供应商类型",
+                            "flex": 0,
+                            "dataIndex": "ve_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pd_prodcode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        conditionCode:'pr_code',
+                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dbfinds:[{
+                            from:'pr_code',to:'pd_prodcode',
+                            from:'pr_detail',to:'pr_detail'
+                        }],
+                        dbtpls:[{
+                            field:'pr_code',width:100
+                        },{
+                            field:'pr_detail',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "物料ID",
+                            "flex": 0,
+                            "dataIndex": "pr_id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "物料编号",
+                            "flex": 1,
+                            "dataIndex": "pr_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料名称",
+                            "flex": 1,
+                            "dataIndex": "pr_detail",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料规格",
+                            "flex": 0,
+                            "dataIndex": "pr_spec",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "物料单位",
+                            "flex": 0,
+                            "dataIndex": "pr_unit",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+
+    }
+});

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelModel.js

@@ -0,0 +1,5 @@
+Ext.define('saas.view.stock.appropriationInOut.QueryPanelModel', {
+    extend: 'saas.view.core.query.QueryPanelModel',
+    alias: 'viewmodel.stock-appropriationinout-querypanel'
+
+});

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -13,12 +13,12 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
      _statusCodeField: 'pi_statuscode',
      
      _relationColumn: 'pd_piid',
-     _readUrl:'http://localhost:8800/purchase/read/',
-     _saveUrl:'http://localhost:8800/purchase/save',
-     _auditUrl:'http://localhost:8800/purchase/audit',
-     _deleteUrl:'http://localhost:8800/purchase/delete/',
-     _deleteDetailUrl:'http://localhost:8800/purchase/deleteItem/',
-     _turnInUrl:'http://localhost:8800/purchase/turnProdin/',
+     _readUrl:'http://localhost:9000/prodinout/read/',
+     _saveUrl:'http://localhost:9000/prodinout/save',
+     _auditUrl:'http://localhost:9000/prodinout/audit',
+     _deleteUrl:'http://localhost:9000/prodinout/delete/',
+     _deleteDetailUrl:'http://localhost:9000/prodinout/deleteItem/',
+     _turnInUrl:'http://localhost:9000/prodinout/turnProdin/',
      initId:0,
  
      toolBtns: [{

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -114,10 +114,10 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     queryGridConfig: {
         idField: 'pu_id',
         codeField: 'pu_code',
-        addTitle: '采购单',
-        addXtype: 'purchase-purchase-formpanel',
-        defaultCondition:'',
-        baseVastUrl: 'http://localhost:8800/purchase/',
+        addTitle: '其它入库单',
+        addXtype: 'stock-otherin-formpanel',
+        defaultCondition:' pi_class = \'其它入库单\'',
+        baseVastUrl: 'http://localhost:9000/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -114,9 +114,9 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     queryGridConfig: {
         idField: 'pu_id',
         codeField: 'pu_code',
-        addTitle: '采购单',
-        addXtype: 'purchase-purchase-formpanel',
-        defaultCondition:'',
+        addTitle: '其它出库单',
+        addXtype: 'stock-otheron-formpanel',
+        defaultCondition:' pi_class = \'其它出库单\'',
         baseVastUrl: 'http://localhost:8800/purchase/',
         baseColumn: [{
             text: '序号',

frontend/saas-web/resources/json/navigation.json

@@ -86,13 +86,13 @@
         }, {
             "id": "otherIn",
             "text": "其它入库单",
-            "addType": "stock-otherIn-formpanel",
-            "viewType": "stock-otherIn-querypanel"
+            "addType": "stock-otherin-formpanel",
+            "viewType": "stock-otherin-querypanel"
         }, {
             "id": "otherOut",
             "text": "其它出库单",
-            "addType": "stock-otherOut-formpanel",
-            "viewType": "stock-otherOut-querypanel"
+            "addType": "stock-otherout-formpanel",
+            "viewType": "stock-otherout-querypanel"
         }, {
             "id": "inventory",
             "text": "盘点单",