Browse Source

导航栏合并

rainco 7 years ago
parent
commit
50e392fd4a
71 changed files with 6358 additions and 282 deletions
  1. 12 10
      applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java
  2. 0 1
      applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MessageLogService.java
  3. 4 0
      applications/commons/commons-dto/pom.xml
  4. 4 1
      applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/WarehouseApi.java
  5. 4 0
      applications/document/document-server/pom.xml
  6. 12 1
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/WarehouseController.java
  7. 3 1
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/WarehouseMapper.java
  8. 3 1
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/WarehouseService.java
  9. 5 1
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorkindServiceImpl.java
  10. 24 2
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/WarehouseServiceImpl.java
  11. 2 1
      applications/document/document-server/src/main/resources/application.yml
  12. 5 3
      applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml
  13. 2 2
      applications/pom.xml
  14. 0 1
      applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java
  15. 3 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java
  16. 4 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseListMapper.java
  17. 0 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java
  18. 0 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutList.java
  19. 2 1
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java
  20. 0 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java
  21. 10 4
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java
  22. 0 1
      applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml
  23. 8 30
      applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml
  24. 10 23
      applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml
  25. 6 0
      applications/storage/pom.xml
  26. 15 0
      applications/storage/storage-api/pom.xml
  27. 30 0
      applications/storage/storage-dto/pom.xml
  28. 86 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdIODetailDTO.java
  29. 75 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutDTO.java
  30. 18 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutFormDTO.java
  31. 140 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutListDTO.java
  32. 28 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutReqDTO.java
  33. 83 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdIODetail.java
  34. 2631 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdIODetailExample.java
  35. 68 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdInOut.java
  36. 2182 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdInOutExample.java
  37. 143 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdInOutList.java
  38. 86 0
      applications/storage/storage-server/pom.xml
  39. 20 0
      applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/StorageApplication.java
  40. 28 0
      applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/controller/ProdInOutController.java
  41. 19 0
      applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/ProdInOutMapper.java
  42. 9 0
      applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/ProdInOutService.java
  43. 12 0
      applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInoutServiceImpl.java
  44. 65 0
      applications/storage/storage-server/src/main/resources/application.yml
  45. BIN
      applications/storage/storage-server/src/main/resources/auth/pub.key
  46. 0 0
      applications/storage/storage-server/src/main/resources/config/application-dev.yml
  47. 10 0
      applications/storage/storage-server/src/main/resources/config/application-docker.yml
  48. 106 0
      applications/storage/storage-server/src/main/resources/logback-spring.xml
  49. 4 4
      frontend/saas-web/app/util/QueryUtil.js
  50. 1 1
      frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js
  51. 11 8
      frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js
  52. 8 3
      frontend/saas-web/app/view/core/dbfind/MultiDbfindTrigger.js
  53. 37 39
      frontend/saas-web/app/view/core/query/QueryGridPanel.js
  54. 196 8
      frontend/saas-web/app/view/core/query/QueryPanel.js
  55. 4 3
      frontend/saas-web/app/view/core/query/QueryPanelController.js
  56. 5 0
      frontend/saas-web/app/view/core/query/QueryPanelModel.js
  57. 2 3
      frontend/saas-web/app/view/core/tab/Controller.js
  58. 3 1
      frontend/saas-web/app/view/document/kind/ChildForm.js
  59. 1 2
      frontend/saas-web/app/view/document/kind/KindController.js
  60. 0 29
      frontend/saas-web/app/view/main/MainController.js
  61. 18 8
      frontend/saas-web/app/view/main/Navigation.js
  62. 23 39
      frontend/saas-web/app/view/purchase/purchase/QueryPanel.js
  63. 1 0
      frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js
  64. 1 2
      frontend/saas-web/app/view/purchase/purchaseIn/FormController.js
  65. 11 4
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js
  66. 6 1
      frontend/saas-web/app/view/purchase/purchaseOut/FormController.js
  67. 0 7
      frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js
  68. 0 24
      frontend/saas-web/app/view/test/order/FormController.js
  69. 25 2
      frontend/saas-web/app/view/test/order/FormPanel.js
  70. 19 0
      frontend/saas-web/overrides/i18n.js
  71. 5 0
      pom.xml

+ 12 - 10
applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java

@@ -1,23 +1,26 @@
 package com.usoftchina.saas.commons.api;
-
 import com.usoftchina.saas.base.Result;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-
+/**
+ * @Description: 编号接口
+ * @Author: guq
+ * @Date: 2018/10/20
+ */
 @FeignClient("commons-server")
 public interface MaxnumberService {
     /**
-    * @Description: 更新并获取最大编号
-    * @Param: [count, code, caller]
-    * @return: com.usoftchina.saas.base.Result
-    * @Author: guq
-    * @Date: 2018/10/19 api/commons
-    */
+     * @Description: 更新并获取最大编号
+     * @Param: [count, code, caller]
+     * @return: com.usoftchina.saas.base.Result
+     * @Author: guq
+     * @Date: 2018/10/19 api/commons
+     */
     @PostMapping("/number/pushMaxnubmer")
     public String pushMaxnubmer(@RequestParam("count") Integer count,@RequestParam("code") String code,
                                 @RequestParam("caller") String caller);
-
     /**
      * @Description 获取单号
      * @Param: [caller, update]
@@ -27,5 +30,4 @@ public interface MaxnumberService {
      */
     @PostMapping("/getMaxnumber")
     public Result getMaxnumber(@RequestParam("caller") String caller, @RequestParam("update") boolean update);
-
 }

+ 0 - 1
applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MessageLogService.java

@@ -2,7 +2,6 @@ package com.usoftchina.saas.commons.api;
 
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 

+ 4 - 0
applications/commons/commons-dto/pom.xml

@@ -15,6 +15,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
     </dependencies>
 
 

+ 4 - 1
applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/WarehouseApi.java

@@ -10,6 +10,9 @@ import java.util.Map;
 public interface WarehouseApi {
 
     @GetMapping("/api/document/warehouse/post")
-    public Result callProcedure(Map<String, Object> param);
+    public Result post(Map<String, Object> param);
+
+    @GetMapping("/api/document/warehouse/unPost")
+    public Result unPost(Map<String, Object> param);
 
 }

+ 4 - 0
applications/document/document-server/pom.xml

@@ -65,6 +65,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-dto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

+ 12 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/WarehouseController.java

@@ -25,10 +25,21 @@ public class WarehouseController {
      */
     @GetMapping("/post")
     public Result post(Map<String, Object> map){
-        warehouseService.callProcedure(map);
+        warehouseService.post(map);
         return Result.success(map.get("result"));
     }
 
+    /**
+     * 反过账
+     * @param map
+     * @return
+     */
+    @GetMapping("/unPost")
+    public Result unPost(Map<String, Object> map){
+        warehouseService.unPost(map);
+        return Result.success();
+    }
+
     /**
      * 保存
      * @param data

+ 3 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/WarehouseMapper.java

@@ -7,7 +7,7 @@ import java.util.Map;
 
 public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
-    void callProcedure(Map<String, Object> map);
+    void post(Map<String, Object> map);
 
     Short validPeriod(Map<String, Object> map);
 
@@ -22,4 +22,6 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
     int updateByPrimaryKeySelective(Warehouse record);
 
     int updateByPrimaryKey(Warehouse record);
+
+    void unPost(Map<String, Object> map);
 }

+ 3 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/WarehouseService.java

@@ -9,9 +9,11 @@ import java.util.Map;
 
 public interface WarehouseService extends CommonBaseService<WarehouseMapper, Warehouse> {
 
-    void callProcedure(Map<String, Object> map);
+    void post(Map<String, Object> map);
 
     boolean validPeriod(String periods);
 
     int insertSelective(Warehouse record);
+
+    void unPost(Map<String, Object> map);
 }

+ 5 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorkindServiceImpl.java

@@ -15,7 +15,11 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
 
     @Override
     public boolean save(Vendorkind vendorkind){
-        vendorkindMapper.insertSelective(vendorkind);
+        if(vendorkind.getId() == 0){
+            vendorkindMapper.insertSelective(vendorkind);
+        }else{
+            vendorkindMapper.updateByPrimaryKeySelective(vendorkind);
+        }
         return true;
     }
 

+ 24 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/WarehouseServiceImpl.java

@@ -13,11 +13,20 @@ import java.util.Map;
 @Service
 public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
 
+    /**
+     * 过账
+     * @param map
+     */
     @Override
-    public void callProcedure(Map<String, Object> map){
-        getMapper().callProcedure(map);
+    public void post(Map<String, Object> map) {
+        getMapper().post(map);
     }
 
+    /**
+     * 账期校验
+     * @param period
+     * @return
+     */
     @Override
     public boolean validPeriod(String period) {
         long companyId = BaseContextHolder.getCompanyId();
@@ -32,10 +41,23 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         }
     }
 
+    /**
+     * 保存
+     * @param record
+     * @return
+     */
     @Override
     public int insertSelective(Warehouse record) {
         int count = getMapper().insertSelective(record);
         return count;
     }
 
+    /**
+     * 反过账
+     * @param map
+     */
+    @Override
+    public void unPost(Map<String, Object> map) {
+        getMapper().unPost(map);
+    }
 }

+ 2 - 1
applications/document/document-server/src/main/resources/application.yml

@@ -47,7 +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.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.31:8500/eureka/
 server:
   port: 9480
   tomcat:

+ 5 - 3
applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml

@@ -20,17 +20,19 @@
         <result column="wh_text4" property="wh_text4" jdbcType="VARCHAR" />
         <result column="wh_text5" property="wh_text5" jdbcType="VARCHAR" />
     </resultMap>
-    <select id="callProcedure" parameterMap="paramMap" statementType="CALLABLE">
+    <select id="post" parameterMap="postParamMap" statementType="CALLABLE">
         CALL SP_COMMITPRODINOUT(?, ?, ?, ?, ?)
     </select>
-    <parameterMap id="paramMap" type="java.util.Map">
+    <select id="unPost" parameterMap="postParamMap" statementType="CALLABLE">
+        CALL SP_UNCOMMITPRODINOUT(?, ?, ?, ?, ?)
+    </select>
+    <parameterMap id="postParamMap" type="java.util.Map">
         <parameter property="inoutNo" jdbcType="VARCHAR" mode="IN" />
         <parameter property="class" jdbcType="VARCHAR" mode="IN" />
         <parameter property="commitid" jdbcType="INTEGER" mode="IN" />
         <parameter property="companyid" jdbcType="INTEGER" mode="IN" />
         <parameter property="result" jdbcType="VARCHAR" mode="OUT" />
     </parameterMap>
-
     <select id="validPeriod" parameterType="map" resultType="java.lang.Short">
         SELECT IFNULL(PD_STATUS,0) PD_STATUS FROM PERIODSDETAIL WHERE COMPANYID=#{companyId} AND PD_DETNO=#{period}
     </select>

+ 2 - 2
applications/pom.xml

@@ -14,8 +14,8 @@
     <description>applications</description>
     <modules>
         <module>purchase</module>
-        <!--<module>sale</module>
-        <module>storage</module>-->
+        <module>sale</module>
+        <module>storage</module>
         <module>money</module>
         <module>document</module>
         <module>commons</module>

+ 0 - 1
applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -69,7 +69,6 @@ public class ProdInOutDTO extends CommonBaseEntity implements Serializable {
 
     private String pi_address;
 
-    private Long pi_inid;
 
 
 }

+ 3 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -5,6 +5,7 @@ import com.usoftchina.saas.base.Result;
 
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.*;
 import com.usoftchina.saas.purchase.po.PurchaseList;
@@ -34,7 +35,7 @@ public class PurchaseController {
      * @return
      */
     @GetMapping("/list")
-    public Result<PageInfo<PurchaseList>> getListData(PageRequest page, PurchaseReqDTO req) {
+    public Result<PageInfo<PurchaseList>> getListData(PageRequest page, ListReqDTO req) {
         PageInfo<PurchaseList> listData = purchaseService.getListData(page, req);
         return Result.success(listData);
     }
@@ -163,7 +164,7 @@ public class PurchaseController {
     public Result turnProdin(@PathVariable("id") Long id){
         purchaseService.turnProdin(id);
         return Result.success();
-    };
+    }
 
 
 

+ 4 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseListMapper.java

@@ -1,11 +1,13 @@
 package com.usoftchina.saas.purchase.mapper;
 
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.purchase.dto.PurchaseReqDTO;
 import com.usoftchina.saas.purchase.po.PurchaseList;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface PurchaseListMapper {
-    List<PurchaseList> selectPurchaseListByCondition(PurchaseReqDTO reqDTO);
-    List<PurchaseList> selectPurchaseBycondition(PurchaseReqDTO reqDTO);
+    List<PurchaseList> selectPurchaseListByCondition(@Param("con") String con,@Param("companyId") Long companyId);
+    List<PurchaseList> selectPurchaseBycondition(@Param("con") String con,@Param("companyId") Long companyId);
 }

+ 0 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java

@@ -62,6 +62,4 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_address;
 
-    private Long pi_inid;
-
 }

+ 0 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutList.java

@@ -66,8 +66,6 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private String pi_address;
 
-    private Long pi_inid;
-
     private Long pd_piid;
 
     private String pd_inoutno;

+ 2 - 1
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java

@@ -8,6 +8,7 @@ import com.usoftchina.saas.base.service.CommonBaseService;
 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.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
 import com.usoftchina.saas.purchase.dto.PurchaseReqDTO;
@@ -34,7 +35,7 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @param page,req
      * @return
      */
-    PageInfo<PurchaseList> getListData(PageRequest page, PurchaseReqDTO req);
+    PageInfo<PurchaseList> getListData(PageRequest page, ListReqDTO req);
 
     /**
      * 采购订单列表查询

+ 0 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -304,8 +304,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_vendname(sourcePi.getPi_vendname());
         targetPi.setPi_puid(sourcePi.getPi_puid());
         targetPi.setPi_pucode(sourcePi.getPi_pucode());
-        targetPi.setPi_inid(sourcePi.getId());
-
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
         //保存数据

+ 10 - 4
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -8,6 +8,7 @@ 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;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
@@ -55,7 +56,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     private MessageLogService messageLogService;
 
     @Override
-    public PageInfo<PurchaseList> getListData(PageRequest page, PurchaseReqDTO req) {
+    public PageInfo<PurchaseList> getListData(PageRequest page, ListReqDTO req) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -425,12 +426,17 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
     }
 
-    private List<PurchaseList> getListByMode(PurchaseReqDTO req) {
+    private List<PurchaseList> getListByMode(ListReqDTO req) {
         List<PurchaseList> list = null;
+        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())) {
-            list = purchaseListMapper.selectPurchaseBycondition(req);
+            list = purchaseListMapper.selectPurchaseBycondition(con, companyId);
         } else {
-            list = purchaseListMapper.selectPurchaseListByCondition(req);
+            list = purchaseListMapper.selectPurchaseListByCondition(con, companyId);
         }
         return list;
     }

+ 0 - 1
applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -30,7 +30,6 @@
     <result column="pi_text4" jdbcType="VARCHAR" property="pi_text4" />
     <result column="pi_text5" jdbcType="VARCHAR" property="pi_text5" />
     <result column="pi_address" jdbcType="VARCHAR" property="pi_address" />
-    <result column="pi_inid" jdbcType="INTEGER" property="pi_inid" />
     <result column="pd_piid" jdbcType="INTEGER" property="pd_piid" />
     <result column="pd_inoutno" jdbcType="VARCHAR" property="pd_inoutno" />
     <result column="pd_piclass" jdbcType="VARCHAR" property="pd_piclass" />

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

@@ -32,7 +32,7 @@
     <result column="pi_text3" jdbcType="VARCHAR" property="pi_text3" />
     <result column="pi_text4" jdbcType="VARCHAR" property="pi_text4" />
     <result column="pi_text5" jdbcType="VARCHAR" property="pi_text5" />
-    <result column="pi_inid" jdbcType="INTEGER" property="pi_inid" />
+
 
 
   </resultMap>
@@ -101,7 +101,7 @@
     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, 
     pi_recordman, pi_recorddate, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode, 
-    companyid, updaterid, updatetime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_inid
+    companyid, updaterid, updatetime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5
   </sql>
   <sql id="Blob_Column_List">
     pi_address
@@ -165,7 +165,7 @@
       pi_printstatuscode, companyid, updaterid, 
       updatetime, pi_text1, pi_text2, 
       pi_text3, pi_text4, pi_text5,
-      pi_address,pi_inid)
+      pi_address)
     values (#{pi_id,jdbcType=INTEGER}, #{pi_inoutno,jdbcType=VARCHAR}, #{pi_class,jdbcType=VARCHAR}, 
       #{pi_date,jdbcType=TIMESTAMP}, #{pi_vendid,jdbcType=INTEGER}, #{pi_vendcode,jdbcType=VARCHAR}, 
       #{pi_vendname,jdbcType=VARCHAR}, #{pi_custid,jdbcType=INTEGER}, #{pi_custcode,jdbcType=VARCHAR}, 
@@ -176,7 +176,7 @@
       #{pi_printstatuscode,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{pi_text1,jdbcType=VARCHAR}, #{pi_text2,jdbcType=VARCHAR}, 
       #{pi_text3,jdbcType=VARCHAR}, #{pi_text4,jdbcType=VARCHAR}, #{pi_text5,jdbcType=VARCHAR}, 
-      #{pi_address,jdbcType=LONGVARCHAR}.#{pi_inid,jdbcType=INTEGER})
+      #{pi_address,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.purchase.po.ProdInOut">
     <selectKey resultType="java.lang.Long" keyProperty="id">
@@ -275,9 +275,6 @@
       <if test="pi_address != null">
         pi_address,
       </if>
-      <if test="pi_inid != null">
-        pi_inid,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -371,11 +368,6 @@
       <if test="pi_address != null">
         #{pi_address,jdbcType=LONGVARCHAR},
       </if>
-      <if test="pi_inid != null">
-        #{pi_inid,jdbcType=INTEGER},
-      </if>
-
-
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.usoftchina.saas.purchase.po.ProdInOutExample" resultType="java.lang.Long">
@@ -480,9 +472,6 @@
       <if test="record.pi_address != null">
         pi_address = #{record.pi_address,jdbcType=LONGVARCHAR},
       </if>
-      <if test="record.pi_inid != null">
-        pi_address = #{record.pi_inid,jdbcType=INTEGER},
-      </if>
 
     </set>
     <if test="_parameter != null">
@@ -521,10 +510,7 @@
       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},
-      pi_inid = #{record.pi_inid,jdbcType=INTEGER}
-
-
+      pi_address = #{record.pi_address,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -560,9 +546,7 @@
       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_inid = #{record.pi_inid,jdbcType=INTEGER}
-
+      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR}
 
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -661,10 +645,6 @@
       <if test="pi_address != null">
         pi_address = #{pi_address,jdbcType=LONGVARCHAR},
       </if>
-      <if test="pi_inid != null">
-        pi_inid = #{pi_inid,jdbcType=INTEGER},
-      </if>
-
 
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
@@ -700,8 +680,7 @@
       pi_text3 = #{pi_text3,jdbcType=VARCHAR},
       pi_text4 = #{pi_text4,jdbcType=VARCHAR},
       pi_text5 = #{pi_text5,jdbcType=VARCHAR},
-      pi_address = #{pi_address,jdbcType=LONGVARCHAR},
-      pi_inid = #{pi_inid,jdbcType=INTEGER}
+      pi_address = #{pi_address,jdbcType=LONGVARCHAR}
 
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </update>
@@ -735,8 +714,7 @@
       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_inid = #{pi_inid,jdbcType=INTEGER}
+      pi_text5 = #{pi_text5,jdbcType=VARCHAR}
     where pi_id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

+ 10 - 23
applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -55,39 +55,26 @@
         <result column="pd_yqty" property="pd_yqty" jdbcType="DOUBLE" />
     </resultMap>
 
-    <select id="selectPurchaseListByCondition" parameterType="com.usoftchina.saas.purchase.dto.PurchaseReqDTO" resultMap="BaseResultMap">
+    <select id="selectPurchaseListByCondition" parameterType="string" resultMap="BaseResultMap">
         select  *  from purchase left join purchasedetail on pu_id=pd_puid
         <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   companyId = #{companyId}
             </if>
-            <if test="status != null">
-                AND pu_status=${status}
-            </if>
-            <if test="keyword != null">
-                AND ${keyword}
-            </if>
-            order by pu_id,pd_detno
-        </where>
+        </where>  order by pu_id,pd_detno
     </select>
 
     <select id="selectPurchaseBycondition" parameterType="com.usoftchina.saas.purchase.dto.PurchaseReqDTO" resultMap="BaseResultMap">
         select  *  from purchase
         <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 pu_id

+ 6 - 0
applications/storage/pom.xml

@@ -10,7 +10,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>storage</artifactId>
+    <packaging>pom</packaging>
     <description>storage server</description>
+    <modules>
+        <module>storage-api</module>
+        <module>storage-dto</module>
+        <module>storage-server</module>
+    </modules>
 
 
 </project>

+ 15 - 0
applications/storage/storage-api/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>storage</artifactId>
+        <groupId>com.usoftchina.saas</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>storage-api</artifactId>
+
+
+</project>

+ 30 - 0
applications/storage/storage-dto/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>storage</artifactId>
+        <groupId>com.usoftchina.saas</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>storage-dto</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

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

@@ -0,0 +1,86 @@
+package com.usoftchina.saas.storage.dto;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Created by zdw
+ * 2018-10-17 13:45.
+ */
+@Data
+public class ProdIODetailDTO extends CommonBaseEntity implements Serializable {
+
+    private Long pd_piid;
+
+    private String pd_inoutno;
+
+    private String pd_piclass;
+
+    private Integer pd_pdno;
+
+    private String pd_ordercode;
+
+    private Integer pd_orderdetno;
+
+    private Integer pd_prodid;
+
+    private String pd_prodcode;
+
+    private String pd_unit;
+
+    private Integer pd_inqty;
+
+    private Integer pd_outqty;
+
+    private Double pd_orderprice;
+
+    private Double pd_sendprice;
+
+    private Double pd_price;
+
+    private Double pd_total;
+
+    private Double pd_taxrate;
+
+    private Double pd_netprice;
+
+    private Double pd_nettotal;
+
+    private Integer pd_whid;
+
+    private String pd_whcode;
+
+    private String pd_whname;
+
+    private Integer pd_inwhid;
+
+    private String pd_inwhcode;
+
+    private String pd_inwhname;
+
+    private Integer pd_orderid;
+
+    private Integer pd_sdid;
+
+    private Integer pd_status;
+
+    private String pd_text1;
+
+    private String pd_text2;
+
+    private String pd_text3;
+
+    private String pd_text4;
+
+    private String pd_text5;
+
+    private Integer pd_ym;
+
+    private Integer pd_yqty;
+
+    private String pd_remark;
+
+    private Long pd_ioid;
+}

+ 75 - 0
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutDTO.java

@@ -0,0 +1,75 @@
+package com.usoftchina.saas.storage.dto;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by zdw
+ * 2018-10-17 13:44.
+ */
+@Data
+@ApiModel(value = "Prodinout", description = "出入库单")
+public class ProdInOutDTO extends CommonBaseEntity implements Serializable {
+
+    private String pi_inoutno;
+
+    private String pi_class;
+
+    private Date pi_date;
+
+    private Integer pi_vendid;
+
+    private String pi_vendcode;
+
+    private String pi_vendname;
+
+    private Integer pi_custid;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private Integer pi_puid;
+
+    private String pi_pucode;
+
+    private Integer pi_said;
+
+    private String pi_sacode;
+
+    private Double pi_total;
+
+    private Integer pi_recordmanid;
+
+    private String pi_recordman;
+
+    private Date pi_recorddate;
+
+    private String pi_status;
+
+    private String pi_statuscode;
+
+    private String pi_printstatus;
+
+    private String pi_printstatuscode;
+
+    private String pi_text1;
+
+    private String pi_text2;
+
+    private String pi_text3;
+
+    private String pi_text4;
+
+    private String pi_text5;
+
+    private String pi_address;
+
+    private Long pi_inid;
+
+
+}

+ 18 - 0
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutFormDTO.java

@@ -0,0 +1,18 @@
+package com.usoftchina.saas.storage.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by zdw
+ * 2018-10-17 13:45.
+ */
+@Data
+public class ProdInOutFormDTO implements Serializable {
+
+    private ProdInOutDTO main;
+    private List<ProdIODetailDTO> items;
+
+}

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

@@ -0,0 +1,140 @@
+package com.usoftchina.saas.storage.dto;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by zdw
+ * 2018-10-17 13:45.
+ */
+@Data
+public class ProdInOutListDTO extends CommonBaseEntity implements Serializable {
+
+    private String pi_inoutno;
+
+    private String pi_class;
+
+    private Date pi_date;
+
+    private Integer pi_vendid;
+
+    private String pi_vendcode;
+
+    private String pi_vendname;
+
+    private Integer pi_custid;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private Integer pi_puid;
+
+    private String pi_pucode;
+
+    private Integer pi_said;
+
+    private String pi_sacode;
+
+    private Double pi_total;
+
+    private Integer pi_recordmanid;
+
+    private String pi_recordman;
+
+    private Date pi_recorddate;
+
+    private String pi_status;
+
+    private String pi_statuscode;
+
+    private String pi_printstatus;
+
+    private String pi_printstatuscode;
+
+    private String pi_text1;
+
+    private String pi_text2;
+
+    private String pi_text3;
+
+    private String pi_text4;
+
+    private String pi_text5;
+
+    private String pi_address;
+
+    private Long pd_piid;
+
+    private String pd_inoutno;
+
+    private String pd_piclass;
+
+    private Integer pd_pdno;
+
+    private String pd_ordercode;
+
+    private Integer pd_orderdetno;
+
+    private Integer pd_prodid;
+
+    private String pd_prodcode;
+
+    private String pd_unit;
+
+    private Integer pd_inqty;
+
+    private Integer pd_outqty;
+
+    private Double pd_orderprice;
+
+    private Double pd_sendprice;
+
+    private Double pd_price;
+
+    private Double pd_total;
+
+    private Double pd_taxrate;
+
+    private Double pd_netprice;
+
+    private Double pd_nettotal;
+
+    private Integer pd_whid;
+
+    private String pd_whcode;
+
+    private String pd_whname;
+
+    private Integer pd_inwhid;
+
+    private String pd_inwhcode;
+
+    private String pd_inwhname;
+
+    private Integer pd_orderid;
+
+    private Integer pd_sdid;
+
+    private Integer pd_status;
+
+    private String pd_text1;
+
+    private String pd_text2;
+
+    private String pd_text3;
+
+    private String pd_text4;
+
+    private String pd_text5;
+
+    private Integer pd_ym;
+
+    private Integer pd_yqty;
+
+    private String pd_remark;
+
+}

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

@@ -0,0 +1,28 @@
+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;
+
+
+}

+ 83 - 0
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdIODetail.java

@@ -0,0 +1,83 @@
+package com.usoftchina.saas.storage.entities;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ProdIODetail extends CommonBaseEntity implements Serializable {
+
+    private Long pd_piid;
+
+    private String pd_inoutno;
+
+    private String pd_piclass;
+
+    private Integer pd_pdno;
+
+    private String pd_ordercode;
+
+    private Integer pd_orderdetno;
+
+    private Long pd_prodid;
+
+    private String pd_prodcode;
+
+    private String pd_unit;
+
+    private Integer pd_inqty;
+
+    private Integer pd_outqty;
+
+    private Double pd_orderprice;
+
+    private Double pd_sendprice;
+
+    private Double pd_price;
+
+    private Double pd_total;
+
+    private Double pd_taxrate;
+
+    private Double pd_netprice;
+
+    private Double pd_nettotal;
+
+    private Integer pd_whid;
+
+    private String pd_whcode;
+
+    private String pd_whname;
+
+    private Integer pd_inwhid;
+
+    private String pd_inwhcode;
+
+    private String pd_inwhname;
+
+    private Integer pd_orderid;
+
+    private Integer pd_sdid;
+
+    private Integer pd_status;
+
+    private String pd_text1;
+
+    private String pd_text2;
+
+    private String pd_text3;
+
+    private String pd_text4;
+
+    private String pd_text5;
+
+    private Integer pd_ym;
+
+    private Integer pd_yqty;
+
+    private String pd_remark;
+
+    private Long pd_ioid;
+
+}

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

@@ -0,0 +1,2631 @@
+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);
+        }
+    }
+}

+ 68 - 0
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdInOut.java

@@ -0,0 +1,68 @@
+package com.usoftchina.saas.storage.entities;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ProdInOut extends CommonBaseEntity implements Serializable {
+
+    private String pi_inoutno;
+
+    private String pi_class;
+
+    private Date pi_date;
+
+    private Integer pi_vendid;
+
+    private String pi_vendcode;
+
+    private String pi_vendname;
+
+    private Integer pi_custid;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private Integer pi_puid;
+
+    private String pi_pucode;
+
+    private Integer pi_said;
+
+    private String pi_sacode;
+
+    private Double pi_total;
+
+    private Integer pi_recordmanid;
+
+    private String pi_recordman;
+
+    private Date pi_recorddate;
+
+    private String pi_status;
+
+    private String pi_statuscode;
+
+    private String pi_printstatus;
+
+    private String pi_printstatuscode;
+
+    private String pi_text1;
+
+    private String pi_text2;
+
+    private String pi_text3;
+
+    private String pi_text4;
+
+    private String pi_text5;
+
+    private String pi_address;
+
+    private Long pi_inid;
+
+}

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

@@ -0,0 +1,2182 @@
+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);
+        }
+    }
+}

+ 143 - 0
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdInOutList.java

@@ -0,0 +1,143 @@
+package com.usoftchina.saas.storage.entities;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created by zdw
+ * 2018-10-18 16:40.
+ */
+@Data
+public class ProdInOutList extends CommonBaseEntity{
+
+    private String pi_inoutno;
+
+    private String pi_class;
+
+    private Date pi_date;
+
+    private Integer pi_vendid;
+
+    private String pi_vendcode;
+
+    private String pi_vendname;
+
+    private Integer pi_custid;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private Integer pi_puid;
+
+    private String pi_pucode;
+
+    private Integer pi_said;
+
+    private String pi_sacode;
+
+    private Double pi_total;
+
+    private Integer pi_recordmanid;
+
+    private String pi_recordman;
+
+    private Date pi_recorddate;
+
+    private String pi_status;
+
+    private String pi_statuscode;
+
+    private String pi_printstatus;
+
+    private String pi_printstatuscode;
+
+    private String pi_text1;
+
+    private String pi_text2;
+
+    private String pi_text3;
+
+    private String pi_text4;
+
+    private String pi_text5;
+
+    private String pi_address;
+
+    private Long pi_inid;
+
+    private Long pd_piid;
+
+    private String pd_inoutno;
+
+    private String pd_piclass;
+
+    private Integer pd_pdno;
+
+    private String pd_ordercode;
+
+    private Integer pd_orderdetno;
+
+    private Integer pd_prodid;
+
+    private String pd_prodcode;
+
+    private String pd_unit;
+
+    private Integer pd_inqty;
+
+    private Integer pd_outqty;
+
+    private Double pd_orderprice;
+
+    private Double pd_sendprice;
+
+    private Double pd_price;
+
+    private Double pd_total;
+
+    private Double pd_taxrate;
+
+    private Double pd_netprice;
+
+    private Double pd_nettotal;
+
+    private Integer pd_whid;
+
+    private String pd_whcode;
+
+    private String pd_whname;
+
+    private Integer pd_inwhid;
+
+    private String pd_inwhcode;
+
+    private String pd_inwhname;
+
+    private Integer pd_orderid;
+
+    private Integer pd_sdid;
+
+    private Integer pd_status;
+
+    private String pd_text1;
+
+    private String pd_text2;
+
+    private String pd_text3;
+
+    private String pd_text4;
+
+    private String pd_text5;
+
+    private Integer pd_ym;
+
+    private Integer pd_yqty;
+
+    private String pd_remark;
+
+    private Long pd_ioid;
+
+}

+ 86 - 0
applications/storage/storage-server/pom.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>storage</artifactId>
+        <groupId>com.usoftchina.saas</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>storage-server</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>auth-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>server-starter</artifactId>
+        </dependency>
+        <!-- db -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <!-- sleuth -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+        <!-- feign -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-dto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>storage-dto</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

+ 20 - 0
applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/StorageApplication.java

@@ -0,0 +1,20 @@
+package com.usoftchina.saas.storage;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@SpringBootApplication
+@EnableEurekaClient
+//@EnableAuthClient
+@EnableTransactionManagement
+@MapperScan("com.usoftchina.saas.storage.mapper")
+public class StorageApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(StorageApplication.class);
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package com.usoftchina.saas.storage.controller;
+
+import com.netflix.discovery.converters.Auto;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.storage.entities.ProdInOut;
+import com.usoftchina.saas.storage.service.ProdInOutService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/storage/prodInOut")
+public class ProdInOutController {
+
+    @Autowired
+    public ProdInOutService prodInOutService;
+
+    @RequestMapping("/getAll")
+    public Result<ProdInOut> getAll(){
+        List<ProdInOut> prodInOutList = prodInOutService.findAll();
+        return Result.success(prodInOutList);
+    }
+
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.usoftchina.saas.storage.mapper;
+
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.storage.entities.ProdInOut;
+
+public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
+
+    int deleteByPrimaryKey(Long pi_id);
+
+    int insert(ProdInOut record);
+
+    int insertSelective(ProdInOut record);
+
+    ProdInOut selectByPrimaryKey(Long pi_id);
+
+    int updateByPrimaryKeySelective(ProdInOut record);
+
+    int updateByPrimaryKey(ProdInOut record);
+}

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

@@ -0,0 +1,9 @@
+package com.usoftchina.saas.storage.service;
+
+import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.saas.storage.entities.ProdInOut;
+import com.usoftchina.saas.storage.mapper.ProdInOutMapper;
+
+public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, ProdInOut> {
+
+}

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

@@ -0,0 +1,12 @@
+package com.usoftchina.saas.storage.service.impl;
+
+import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.storage.entities.ProdInOut;
+import com.usoftchina.saas.storage.mapper.ProdInOutMapper;
+import com.usoftchina.saas.storage.service.ProdInOutService;
+
+public class ProdInoutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper, ProdInOut> implements ProdInOutService {
+
+
+
+}

+ 65 - 0
applications/storage/storage-server/src/main/resources/application.yml

@@ -0,0 +1,65 @@
+spring:
+  profiles:
+    active: dev
+  application:
+    name: storage-server
+  security:
+    user:
+      name: admin
+      password: select111***
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false
+    username: root
+    password: select111***
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 50
+      idle-timeout: 30000
+      max-lifetime: 1800000
+      connection-timeout: 30000
+  messages:
+    basename: i18n/messages
+  rabbitmq:
+    host: 192.168.0.176
+    port: 5672
+    virtual-host: dev
+    username: saas
+    password: select123***
+  zipkin:
+    sender:
+      type: rabbit
+    locator:
+      discovery:
+        enabled: true
+  sleuth:
+    sampler:
+      probability: 1.0
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /actuator/info
+    prefer-ip-address: true
+    metadata-map:
+      user.name: ${spring.security.user.name}
+      user.password: ${spring.security.user.password}
+  client:
+    registryFetchIntervalSeconds: 5
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+server:
+  port: 9000
+  tomcat:
+    uri-encoding: UTF-8
+info:
+  name: '@project.artifactId@'
+  description: '@project.description@'
+  version: '@project.version@'
+  spring-boot-version: '@spring.boot.version@'
+  spring-cloud-version: '@spring.cloud.version@'
+mybatis:
+  type-aliases-package: com.usoftchina.saas.storage.entities
+  mapper-locations: classpath:mapper/*.xml
+auth:
+  public-key: auth/pub.key

BIN
applications/storage/storage-server/src/main/resources/auth/pub.key


+ 0 - 0
applications/storage/storage-server/src/main/resources/config/application-dev.yml


+ 10 - 0
applications/storage/storage-server/src/main/resources/config/application-docker.yml

@@ -0,0 +1,10 @@
+eureka:
+  instance:
+    hostname: saas-document-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

+ 106 - 0
applications/storage/storage-server/src/main/resources/logback-spring.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+    <jmxConfigurator/>
+
+    <!--
+    %m
+    输出代码中指定的消息
+    %p
+    输出优先级,即DEBUG,INFO,WARN,ERROR,FATAL
+    %r
+    输出自应用启动到输出该log信息耗费的毫秒数
+    %c
+    输出所属的类目,通常就是所在类的全名
+    %t
+    输出产生该日志事件的线程名
+    %n
+    输出一个回车换行符,Windows平台为“\r\n”,Unix平台为“\n”
+    %d
+    输出日志时间点的日期或时间,默认格式为ISO8601,也可以在其后指定格式,比如:%d{yyy MMM dd HH:mm:ss,SSS},
+    输出类似:2002年10月18日 22:10:28,921
+    %l
+    输出日志事件的发生位置,包括类目名、发生的线程,以及在代码中的行数。举例:Testlog4.main(TestLog4.java:10)
+    -->
+
+    <springProperty scope="context" name="log.path" source="logging.path" defaultValue="/var/log/saas/storage-server"/>
+    <springProperty scope="context" name="spring.application.name" source="spring.application.name" defaultValue="storage-server"/>
+    <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
+    <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
+    <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+
+    <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
+
+    <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>${log.level.console}</level>
+        </filter>
+        <encoder>
+            <pattern>${common-pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="ROOT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/root.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/root-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
+            <maxFileSize>128MB</maxFileSize>
+            <maxHistory>7</maxHistory>
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${common-pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Appender to log in a JSON format -->
+    <appender name="JSON_APPENDER" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>${log.destination}</destination>
+        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <pattern>
+                    <pattern>
+                        {
+                        "severity": "%level",
+                        "service": "${spring.application.name:-}",
+                        "trace": "%X{X-B3-TraceId:-}",
+                        "span": "%X{X-B3-SpanId:-}",
+                        "parent": "%X{X-B3-ParentSpanId:-}",
+                        "exportable": "%X{X-Span-Export:-}",
+                        "pid": "${PID:-}",
+                        "thread": "%thread",
+                        "class": "%logger{40}",
+                        "rest": "%message"
+                        }
+                    </pattern>
+                </pattern>
+            </providers>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="INFO"/>
+    <logger name="com.usoftchina.saas" level="INFO"/>
+
+    <springProfile name="dev">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE_APPENDER"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="test">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE_APPENDER"/>
+            <appender-ref ref="ROOT_APPENDER"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="docker">
+        <logger name="org.springframework" level="WARN"/>
+        <root level="WARN">
+            <appender-ref ref="CONSOLE_APPENDER"/>
+            <appender-ref ref="JSON_APPENDER"/>
+        </root>
+    </springProfile>
+
+</configuration>

+ 4 - 4
frontend/saas-web/app/util/QueryUtil.js

@@ -25,15 +25,15 @@ Ext.define('saas.util.QueryUtil', {
             }
         }
         if(Mode=="MAIN"){
-            grid._Mode = Mode;
-            grid.reconfigure(grid.store, grid._baseColumn);
+            grid.Mode = Mode;
+            grid.reconfigure(grid.store, grid.baseColumn);
             grid.store.loadPage(1);
         }else{
             //若明细字段含明细字段注意切换数据源 grid.reconfigure(store, columns);
             //关联viewName = 关联viewName+"-RelativeGrid" selModel
             //grid.selModel = '';
-            grid._Mode = Mode;
-            grid.reconfigure(grid.store, grid._relativeColumn);
+            grid.Mode = Mode;
+            grid.reconfigure(grid.store, grid.relativeColumn);
             grid.store.loadPage(1);
         }
     },

+ 1 - 1
frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js

@@ -1,7 +1,6 @@
 Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
     extend: 'Ext.grid.Panel',
     xtype: 'dbfindgridpanel',
-    GridUtil: Ext.create('saas.util.GridUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     dataUrl: '',
     dbSearchFields: [],
@@ -105,6 +104,7 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
         },
         itemClick: function(view,record) {
             var me = this;
+            debugger;
             var dbfinds = me.dbfinds;
             if(dbfinds&&dbfinds.length>0){
                 if(me.belong=='grid'){

+ 11 - 8
frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -6,8 +6,6 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     displayField: 'dispaly',
     valueField: 'value',
     triggerCls: 'x-form-search-trigger',
-    GridUtil: Ext.create('saas.util.GridUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
     minChars:1, // 设置用户输入字符多少时触发查询
     tpl: '',
     enableKeyEvents:true,
@@ -99,20 +97,25 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
     onTriggerClick:function(f){
         //判断dbfindtrigger归属
-        var form = f.judge(f);//form
-        var win = form.getController().getView().add(Ext.create('Ext.window.Window', {   
+        f.judge(f);//form
+        var panel = f.up('core-tab-panel');
+        var panelEl = panel.getEl();
+        var box = panelEl.getBox();
+        var height = box.height;
+        var width = box.width;
+        var win = panel.add(Ext.create('Ext.window.Window', {   
             trigger:f,
             belong:f.ownerCt,  
             modal:true,
-            height: '80%',
-            width: '80%',
+            height: height * 0.8,
+            width: width * 0.8,
             title: '查找',
             scrollable: true,
             bodyPadding: 10,
             constrain: true,
             closable: true,
             layout:'fit',
-            renderTo:Ext.getCmp('main-tab-panel').getActiveTab().getEl(),
+            renderTo:panel.getEl(),
             items:[{
                 xtype:'dbfindgridpanel',
                 columns: f.dbColumns,
@@ -128,7 +131,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
 
     judge:function(f){
         if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
-            f.belong = 'query';
+            f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
             f.belong = 'form';

+ 8 - 3
frontend/saas-web/app/view/core/dbfind/MultiDbfindTrigger.js

@@ -103,8 +103,13 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
     },
     onTriggerClick:function(f){
         //判断dbfindtrigger归属
-        var form = f.judge(f);
-        var win = form.getController().getView().add(Ext.create('Ext.window.Window', {   
+        f.judge(f);
+        var panel = f.up('core-tab-panel');
+        var panelEl = panel.getEl();
+        var box = panelEl.getBox();
+        var height = box.height;
+        var width = box.width;
+        var win = panel.add(Ext.create('Ext.window.Window', {   
             trigger:f,
             belong:f.ownerCt,  
             modal:true,
@@ -167,7 +172,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
 
     judge:function(f){
         if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
-            f.belong = 'query';
+            f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
             f.belong = 'form';

+ 37 - 39
frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -7,19 +7,21 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     GridUtil: Ext.create('saas.util.GridUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     //字段属性
-    _baseColumn: [],
-    _relativeColumn: [],
-    _idField:'',
-    _codeField:'',
-    _title:'',
-    _addXtype:'',
-    _baseVastUrl:'',
+    baseColumn: [],
+    relativeColumn: [],
+
+    idField:'',
+    codeField:'',
+    addTitle:'',
+    addXtype:'',
+    baseVastUrl:'',
+    queryMode: 'MAIN',
+    defaultCondition: '',
 
     //基础属性
     border: 1,
     anchor: '100% 70%',
     loadMask: true,
-    frame: true,
     showIndex: true,
     columnWidth: 1.0,
     showRowNum: true,
@@ -36,7 +38,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 data: [],
                 proxy: {
                     type: 'ajax',
-                    url: me._baseVastUrl+'list',
+                    url: me.baseVastUrl+'list',
                     actionMethods: {
                         read: 'GET'
                     },
@@ -48,29 +50,22 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 },
                 listeners: {
                     beforeload: function (store, op) {
-                        var condition = '',
-                        queryForm = me.ownerCt.down('form'),
-                        condition = me.QueryUtil.getFormCondition(queryForm),
-                        mode = me._Mode,
-                        defaultCondition = me._defaultCondition;
-                        if(defaultCondition){
-                            if (Ext.isEmpty(condition)) {
-                                condition = defaultCondition + ' and '+condition;
-                            }else{
-                                condition = defaultCondition;
-                            }
-                        }
-                        if (Ext.isEmpty(condition)) {
-                            condition = " 1=1 ";
-                        }
-                        if(!mode){
-                            mode='MAIN';
+                        var queryPanel = me.up('core-query-querypanel'),
+                        condition = queryPanel.getConditions(),
+                        defaultCondition = me.defaultCondition,
+                        mode = queryPanel.getQueryMode();
+
+                        if(defaultCondition) {
+                            condition.push({
+                                type: 'condition',
+                                value: defaultCondition
+                            });
                         }
                         Ext.apply(store.proxy.extraParams, {
                             number: op._page,
                             size: store.pageSize,
                             mode:mode,
-                            keyword: condition
+                            condition: JSON.stringify(condition)
                         });
     
                     }
@@ -79,6 +74,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             dockedItems: [{
                 xtype: 'toolbar',
                 dock: 'top',
+                style: {
+                    borderTop: 'none'
+                },
                 defaults: { // defaults 将会应用所有的子组件上,而不是父容器
                     listeners: {
                         'mouseover':function(){
@@ -185,15 +183,15 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         itemdblClick: function (tableView, record, item, index, e, eOpts) {
             var grid = tableView.up('grid'),
                 mainTab = Ext.getCmp('main-tab-panel'),
-                idValue = record.get(grid._idField),
-                codeValue = record.get(grid._codeField),
+                idValue = record.get(grid.idField),
+                codeValue = record.get(grid.codeField),
                 id = grid.xtype + idValue;
                 existingItem = mainTab.down('[id=' + id + ']');
             if (!existingItem) {
                 var form = {
-                    xtype:grid._addXtype,
+                    xtype:grid.addXtype,
                     id,
-                    title:grid._title+"("+codeValue+")",
+                    title:grid.addTitle+"("+codeValue+")",
                     initId:idValue
                 };
                 mainTab.setActiveTab(mainTab.add(form));
@@ -215,9 +213,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             existingItem = mainTab.down('[id=' + id + ']');
         if (!existingItem) {
             var form = {
-                xtype:grid._addXtype,
+                xtype:grid.addXtype,
                 id,
-                title:'新增'+grid._title
+                title:'新增'+grid.addTitle
             };
             mainTab.setActiveTab(mainTab.add(form));
         }
@@ -256,7 +254,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         if(data&&data.length>0){
             var params = JSON.stringify({baseDTOs:data});
             me.BaseUtil.request({
-                    url: me._baseVastUrl+type,
+                    url: me.baseVastUrl+type,
                     params: params,
                     method: 'POST',
                     async:false
@@ -281,13 +279,13 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             items = me.selModel.getSelection(),
             data = new Array() ;
             Ext.each(items, function(item, index){
-                if(!Ext.isEmpty(item.data[me._idField])&&!Ext.isEmpty(item.data[me._codeField])){
+                if(!Ext.isEmpty(item.data[me.idField])&&!Ext.isEmpty(item.data[me.codeField])){
                     var o = new Object();
-                    if(me._idField){
-                        o['id'] = item.data[me._idField];
+                    if(me.idField){
+                        o['id'] = item.data[me.idField];
                     }
-                    if(me._codeField){
-                        o['code'] = item.data[me._codeField];
+                    if(me.codeField){
+                        o['code'] = item.data[me.codeField];
                     }
                     data.push(o);
                 }

+ 196 - 8
frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -7,7 +7,10 @@ Ext.define('saas.view.core.query.QueryPanel', {
 
     layout: 'anchor',
     autoScroll: true,
+    border: 1,
+    bodyPadding: 5,
     margin: '0',
+    
     items: [{
         anchor: '100% 30%',
         reference: 'queryform',
@@ -20,36 +23,221 @@ Ext.define('saas.view.core.query.QueryPanel', {
 
     initComponent: function () {
         var me = this;
-        me.setQueryItems(me.queryFormItems);
+        me.setQueryFormItems();
         me.setQuertGridConfigs();
         me.callParent(arguments);
     },
 
     getQueryForm: function () {
         var me = this,
-            refs = me.getReferences();
+        queryForm = me.items[0];
 
-        return refs['queryform'];
+        return queryForm;
     },
 
     getQueryGrid: function () {
         var me = this,
-            refs = me.getReferences();
+        queryGrid = me.items[1];
 
-        return refs['querygrid'];
+        return queryGrid;
     },
 
-    setQueryItems: function (items) {
+    /**
+     * 解析查询字段并处理一些初始化配置
+     */
+    setQueryFormItems: function () {
         var me = this,
-        queryForm = me.items[0];
+        items = me.queryFormItems,
+        queryForm = me.getQueryForm(),
+        viewModel = me.getViewModel();
+
+        Ext.Array.each(items, function(item) {
+            var bind = item.bind,
+            name = item.name,
+            ignore = item.ignore,
+            defaultValue = item.defaultValue,
+            showDetail = item.showDetail,
+            shwoDetailFunc = item.shwoDetailFunc;
+
+            if(!item.columnWidth){
+                item.columnWidth = 0.25;
+            }
+
+            // 设置model绑定
+            if(!ignore) {
+                if(bind) {
+                    if(!Ext.isString(bind)) {
+                        bind = name;
+                        Ext.apply(bind, {
+                            value: '{form.' + bind + '}'
+                        });
+                    }else {
+                        bind = bind.replace(/[{|}]/g, '');
+                        item.bind = '{form.' + bind + '}';
+                    }
+                }else {
+                    bind = name;
+                    item.bind = '{form.' + bind + '}';
+                }
+                // 设置默认值
+                if(defaultValue) {
+                    viewModel.set('form.' + bind, defaultValue);
+                }
+                // 设置关联列表
+                if(showDetail) {
+                    var fields = viewModel.get('showDetailFields');
+                    fields.push(bind);
+                    viewModel.set('showDetailFields', fields);
+                }
+            }
+        });
+
         queryForm.items = items;
     },
 
     setQuertGridConfigs: function() {
         var me = this,
         queryGrid = me.items[1];
-        me.queryGridConfig['columns']=me.queryGridConfig._baseColumn || [];
+        me.queryGridConfig['columns']=me.queryGridConfig.baseColumn || [];
         Ext.apply(queryGrid,me.queryGridConfig);
+    },
+
+    /**
+     * 获得过滤条件
+     */
+    getConditions: function() {
+        var me = this,
+        formItems = me.queryFormItems,
+        viewModel = me.getViewModel(),
+        viewModelData = viewModel.getData(),
+        bindItems = viewModelData['form'],
+        condition,
+        conditions = [];
+
+        for(k in bindItems) {
+            var item = Ext.Array.findBy(formItems, function(i) {
+                return i.name == k;
+            });
+            var field = item.name,
+            func = item.getCondition,
+            value = bindItems[k],
+            condition;
+
+            if(typeof func == 'function') {
+                condition = {
+                    type: 'condition',
+                    value: func(value)
+                }
+            }else {
+                var xtype = item.xtype || 'textfield',
+                type = item.fieldType || me.getDefaultFieldType(xtype),
+                operation = item.operation || me.getDefaultFieldOperation(type),
+                conditionValue = me.getConditionValue(xtype, value);
+    
+                if(!conditionValue) {
+                    continue;
+                }
+                condition = {
+                    type: type,
+                    field: field,
+                    operation: operation,
+                    value: conditionValue
+                }
+            }
+            conditions.push(condition);
+        }
+
+        return conditions;
+    },
+
+    getDefaultFieldType: function(xtype) {
+        var type;
+
+        if(Ext.Array.contains(['numberfield'], xtype)) {
+            type = 'number';
+        }else if(Ext.Array.contains(['datefield', 'condatefield'], xtype)) {
+            type = 'date';
+        }else if(Ext.Array.contains(['combobox', 'multicombo', 'combo', 'radiofield', 'radio'], xtype)) {
+            type = 'enum';
+        }else {
+            type = 'string';
+        }
+
+        return type;
+    },
+
+    getDefaultFieldOperation: function(type) {
+        var operation;
+
+        if(type == 'string') {
+            operation = 'like';
+        }else if(type == 'number') {
+            operation = '=';
+        }else if(type == 'date') {
+            operation = '=';
+        }else if(type == 'enum') {
+            operation = 'in';
+        }
+
+        return operation;
+    },
+
+    /**
+     * 处理部分字段值
+     */
+    getConditionValue: function(xtype, value) {
+        var conditionValue;
+        if(xtype == 'datefield') {
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
+        }else if(xtype == 'condatefield') {
+            var from = value.from,
+            to = value.to;
+
+            conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
+        }else if(xtype == 'multicombo') {
+            conditionValue = value.map(function(v) {
+                return '\'' + v.value + '\'';
+            }).join(',');
+        }else {
+            conditionValue = value;
+        }
+
+        return conditionValue;
+    },
+
+    /**
+     * 获得是否是关联列表模式
+     */
+    getQueryMode: function() {
+        var me = this,
+        formItems = me.queryFormItems,
+        viewModel = me.getViewModel(),
+        viewModelData = viewModel.getData(),
+        formData = viewModelData['form'],
+        showDetailFields = viewModelData['showDetailFields'],
+        detailModel;
+
+        detailModel = !!Ext.Array.findBy(showDetailFields, function(name) {
+            var item = Ext.Array.findBy(formItems, function(i) {
+                var b = i.bind, bname;
+                if(!Ext.isString(b)) {
+                    bname = b.value.replace(/[{|}]/g, '').split('.')[1];
+                }else {
+                    bname = b.replace(/[{|}]/g, '').split('.')[1];
+                }
+                return bname == name;
+            });
+            if(!item) {
+                return false;
+            }
+            var isShowDetail = item.isShowDetail || function(value) {
+                return !!value;
+            }
+            var value = formData[name];
+            return isShowDetail(value);
+        });
+
+        return detailModel ? 'DETAIL' : 'MAIN';
     }
 
 });

+ 4 - 3
frontend/saas-web/app/view/core/query/QueryPanelController.js

@@ -28,8 +28,9 @@ Ext.define('saas.view.core.query.QueryPanelController', {
     },
     onQuery: function (btn) {
         var me = this,
-        queryForm = btn.ownerCt.ownerCt,
-        grid = queryForm.ownerCt.down('grid');
-        grid.QueryUtil.turnRelativeGrid(grid,queryForm);
+        queryPanel = me.getView(),
+        queryGrid = queryPanel.down('core-query-querygridpanel');
+
+        queryGrid.store.loadPage(1);
     }
 });

+ 5 - 0
frontend/saas-web/app/view/core/query/QueryPanelModel.js

@@ -1,4 +1,9 @@
 Ext.define('saas.view.core.query.QueryPanelModel', {
     extend: 'Ext.app.ViewModel',
     alias: 'viewmodel.core-query-querypanel',
+
+    data: {
+        form: {}, // 查询字段记录
+        showDetailFields: [], // 关联列表切换字段
+    }
 });

+ 2 - 3
frontend/saas-web/app/view/core/tab/Controller.js

@@ -5,11 +5,10 @@ Ext.define('saas.view.core.tab.Controller', {
     init: function() {
         var me = this,
         tab = me.getView(),
-        tabConfig = tab.tabViewConfig,
-        viewtype = tabConfig.viewtype;
+        viewType = tab.viewType;
 
         tab.add({
-            xtype:viewtype
+            xtype: viewType
         });
     },
 

+ 3 - 1
frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -116,7 +116,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             if(localJson.success){
                 Ext.Msg.alert('提示','保存成功');
                 var grid = form.ownerCt._parent.lookup('document-kind-Grid');
-                grid.store.load();
+                if(grid){
+                    grid.store.load();
+                }
                 form.ownerCt.close();
             }
         })

+ 1 - 2
frontend/saas-web/app/view/document/kind/KindController.js

@@ -75,8 +75,7 @@ Ext.define('saas.view.document.kind.KindController', {
         var keyV=rec.get(view.etc[dataKind].keyField);
         //删除接口
         this.BaseUtil.request({
-            url: view.etc[dataKind].delUrl,
-            params: {id:keyV},
+            url: view.etc[dataKind].delUrl+'/'+keyV,
             method: 'POST'
         })
         .then(function(res) {

+ 0 - 29
frontend/saas-web/app/view/main/MainController.js

@@ -7,35 +7,6 @@ Ext.define('saas.view.main.MainController', {
 
     alias: 'controller.main',
 
-    setActiveTab: function(dataset) {
-        var me = this,
-        refs = me.getReferences(),
-        mainTab = refs.mainTabPanel,
-        // existingItem = mainTab.child(type),
-        newView,
-        type = dataset.type,
-        title = dataset.text,
-        tabTitle = title + (type == 'form' ? '' : '查询'),
-        id = dataset.id,
-        tabId = 'maintab-' + type + '-' + id,
-        existingItem = mainTab.down('[id=' + tabId + ']'),
-        lastView = mainTab.getActiveTab();
-
-        if (!existingItem) {
-            existingItem = Ext.create('saas.view.core.tab.Panel', {
-                id: tabId,
-                title: tabTitle,
-                tabViewConfig: dataset
-            });
-            Ext.suspendLayouts();
-            mainTab.setActiveTab(mainTab.add(existingItem));
-            Ext.resumeLayouts(true);
-        }else {
-            mainTab.setActiveTab(existingItem);
-        }
-        
-    },
-
     onToggleNavigationSize: function () {
         var me = this,
         refs = me.getReferences(),

+ 18 - 8
frontend/saas-web/app/view/main/Navigation.js

@@ -395,22 +395,32 @@ Ext.define('saas.view.main.Navigation', {
                             Ext.Array.each(menuItemText, function (item) {
                                 item.addEventListener('click', function (e) {
                                     var target = e.target,
-                                        dataset = target.dataset;
-                                    mainView = Ext.getCmp('mainView'),
-                                        controller = mainView.getController();
+                                    dataset = target.dataset,
+                                    viewType = dataset.viewtype,
+                                    type = dataset.type,
+                                    text = dataset.text,
+                                    id = dataset.id;
 
-                                    controller.setActiveTab(dataset);
+                                    var tabTitle = text + (type == 'form' ? '' : '查询'),
+                                    tabId = 'maintab-' + type + '-' + id;
+        
+                                    openTab(viewType, tabTitle, tabId);
                                     menu.hide();
                                 });
                             });
                             Ext.Array.each(menuItemIcon, function (item) {
                                 item.addEventListener('click', function (e) {
                                     var target = e.target,
-                                        dataset = target.dataset;
-                                    mainView = Ext.getCmp('mainView'),
-                                        controller = mainView.getController();
+                                    dataset = target.dataset,
+                                    viewType = dataset.viewtype,
+                                    type = dataset.type,
+                                    text = dataset.text,
+                                    id = dataset.id;
 
-                                    controller.setActiveTab(dataset);
+                                    var tabTitle = text + (type == 'form' ? '' : '查询'),
+                                    tabId = 'maintab-' + type + '-' + id;
+        
+                                    openTab(viewType, tabTitle, tabId);
                                     menu.hide();
                                 });
                             });

+ 23 - 39
frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -4,68 +4,57 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
 
     controller: 'purchase-purchase-querypanel',
     viewModel: 'purchase-purchase-querypanel',
+
     viewName: 'purchase-purchase-formpanel',
-    _idField: 'pu_id',
-    _codeField: 'pu_code',
+    
     queryFormItems: [{
         xtype: 'hidden',
         name: 'pu_id',
         bind: '{pu_id}',
         fieldLabel: 'ID',
         allowBlank: true,
-        columnWidth: 0
+        getCondition: function(value) {
+            return 'pu_id=' + value;
+        }
     }, {
         xtype: 'textfield',
         name: 'pu_code',
         bind: '{pu_code}',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '单据编号'
     }, {
         xtype: 'condatefield',
         name: 'pu_date',
         bind: '{pu_date}',
         fieldLabel: '采购日期',
-        allowBlank: true,
-        columnWidth: 0.5
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pu_vendcode',
         bind: '{pu_vendcode}',
-        fieldLabel: '供应商编号',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '供应商编号'
     }, {
         xtype: 'textfield',
         name: 'pu_vendname',
         bind: '{pu_vendname}',
-        fieldLabel: '供应商名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '供应商名称'
     }, {
         xtype: 'dbfindtrigger',
-        name: 'pd_prodcode#pd_prodcode',
-        //#pr_detail
+        name: 'pd_prodcode',
         bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
-        fieldMode: 'DETAIL',
-        queryType: 'VAG',
-        allowBlank: true,
-        columnWidth: 0.25
+        showDetail: true
     }, {
         xtype: 'textfield',
         name: 'pr_detail',
         bind: '{pr_detail}',
         fieldLabel: '物料名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pu_statuscode',
        // bind: '{pu_statuscode}',
         fieldLabel: '审核状态',
-        allowBlank: true,
-        columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'pu_status',
         valueField: 'pu_statuscode',
@@ -83,8 +72,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         name: 'pu_acceptstatuscode',
         bind: '{pu_acceptstatuscode}',
         fieldLabel: '入库状态',
-        allowBlank: true,
-        columnWidth: 0.25,
         datas: [
             ["TURNIN", "已入库"],
             ["UNTURNIN", "未入库"],
@@ -95,30 +82,27 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         xtype: 'textfield',
         name: 'pu_buyername',
         bind: '{pu_buyername}',
-        fieldLabel: '采购员',
-        allowBlank: true
+        fieldLabel: '采购员'
     }, {
         xtype: 'textfield',
         name: 'pu_total',
         bind: '{pu_total}',
-        fieldLabel: '金额',
-        allowBlank: true
+        fieldLabel: '金额'
     }, {
         xtype: 'condatefield',
         name: 'pu_delivery',
         bind: '{pu_delivery}',
         fieldLabel: '交货日期',
-        allowBlank: true,
         columnWidth: 1
     }],
     queryGridConfig: {
-        _idField: 'pu_id',
-        _codeField: 'pu_code',
-        _title: '采购单',
-        _defaultCondition:'',
-        _addXtype: 'purchase-purchase-formpanel',
-        _baseVastUrl: 'http://192.168.0.181:8560/api/purchase/purchase/',
-        _baseColumn: [{
+        idField: 'pu_id',
+        codeField: 'pu_code',
+        addTitle: '采购单',
+        addXtype: 'purchase-purchase-formpanel',
+        defaultCondition:'',
+        baseVastUrl: 'http://192.168.253.58:8800/purchase/',
+        baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
@@ -156,7 +140,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 120,
             flex: 1
         }],
-        _relativeColumn: [{
+        relativeColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'

+ 1 - 0
frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js

@@ -63,6 +63,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                         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:[{

+ 1 - 2
frontend/saas-web/app/view/purchase/purchaseIn/FormController.js

@@ -75,8 +75,7 @@ Ext.define('saas.view.purchase.purchasein.FormController', {
                             from:'pr_detail',to:'pr_detail'
                         },{
                             from:'pr_unit',to:'pd_unit'
-                        }
-                    ],
+                        }],
                         dbtpls:[{
                             field:'pr_code',width:100
                         },{

+ 11 - 4
frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -104,7 +104,8 @@ Ext.define('saas.view.purchase.purchasein.FormPanel', {
         columnWidth : 0.25
     }, {
         name : "detailGridField", 
-        xtype : "detailGridField", 
+        xtype : "detailGridField",
+        storeModel:'saas.model.purchase.prodIODetail', 
         columns : [
             {
                 text : "序号", 
@@ -150,13 +151,19 @@ Ext.define('saas.view.purchase.purchasein.FormPanel', {
             {
                 text : "名称", 
                 dataIndex : "pr_detail",
-                ignore:true
+                ignore:true,
+                renderer: function (v, m, r) {
+                    return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
+                }
             },
             {
                 text : "规格", 
                 dataIndex : "pr_spec",
-                ignore:true
-            }, 
+                ignore:true,
+                renderer: function (v, m, r) {
+                    return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
+                }
+            },
             {
                 text : "数量", 
                 dataIndex : "pd_inqty", 

+ 6 - 1
frontend/saas-web/app/view/purchase/purchaseOut/FormController.js

@@ -68,7 +68,12 @@ Ext.define('saas.view.purchase.purchaseout.FormController', {
                         conditionCode:'pr_code',
                         dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
+                            from:'pr_id',to:'pd_prodid'                          
+                        },{
+                            from:'pr_code',to:'pd_prodcode'                          
+                        },{
+                            from:'pr_detail',to:'pr_detail'
+                        },{
                             from:'pr_unit',to:'pd_unit'
                         }],
                         dbtpls:[{

+ 0 - 7
frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -97,13 +97,6 @@ Ext.define('saas.view.purchase.purchaseout.FormPanel', {
         fieldLabel : "采购单号", 
         allowBlank : true, 
         columnWidth : 0.25
-    }, {
-        xtype : "hidden", 
-        name : "pi_inid", 
-        bind : "{pi_inid}", 
-        fieldLabel : "出入库单id", 
-        allowBlank : true, 
-        columnWidth : 0.25
     },{
         name : "detailGridField", 
         xtype : "detailGridField", 

+ 0 - 24
frontend/saas-web/app/view/test/order/FormController.js

@@ -198,29 +198,5 @@ Ext.define('saas.view.test.order.FormController', {
             }
         });
 
-    },
-    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();
-
     }
 });

+ 25 - 2
frontend/saas-web/app/view/test/order/FormPanel.js

@@ -117,12 +117,35 @@ Ext.define('saas.view.test.order.FormPanel', {
         storeUrl:"http://192.168.253.41:9480/api/document/product/getProdUnit",
         name : "pu_text1", 
         bind : "{pu_text1}", 
-        fieldLabel : "物料下拉框", 
+        fieldLabel : "供应商类型", 
         allowBlank : true, 
         queryMode: 'local',
         displayField: 'display',
         valueField: 'value',
-        columnWidth : 0.25
+        columnWidth : 0.25,
+        etc:{
+            vendorkind:{
+                keyField:'id',
+                dataField:'vk_name',
+                reqUrl:'http://192.168.253.41:9480/api/document/vendorkind/save',
+                delUrl:'http://192.168.253.41:9480/api/document/vendorkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增供应商类型'
+                },
+                dataKind:'vendorkind',
+                belong:this.ownerCmp.etc['vendorkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 

+ 19 - 0
frontend/saas-web/overrides/i18n.js

@@ -0,0 +1,19 @@
+var basePath = '';
+
+function openTab(xtype, title, id) {
+    var mainTab = Ext.getCmp('main-tab-panel');
+    var panel = Ext.getCmp(id);
+    if(!panel) {
+        panel = Ext.create('saas.view.core.tab.Panel', {
+            id: id,
+            title: title,
+            viewType: xtype
+        });
+
+        Ext.suspendLayouts();
+        mainTab.setActiveTab(mainTab.add(panel));
+        Ext.resumeLayouts(true);
+    }else {
+        mainTab.setActiveTab(panel);
+    }
+}

+ 5 - 0
pom.xml

@@ -297,6 +297,11 @@
                 <artifactId>commons-fileupload</artifactId>
                 <version>${commons.fileupload.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>