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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -28,10 +28,11 @@ public enum BizExceptionCode implements BaseExceptionCode {
     //销售
     SALE_ALL_TURNOUT(72000, "该销售单已全部转出货,无法转出货单"),
     SALE_CLOSE(72001, "单据已关闭,无法进行操作"),
-    SALE_YQTYBEYONDQTY(72001, "明细行已转数量大于数量");
+    SALE_YQTYBEYONDQTY(72001, "明细行已转数量大于数量"),
     //资金
 
     //库存
+    EMPTY_DATA(76100,"数据为空,请填写后再保存"),
 
     ;
     private int code;

applications/document/document-server/src/main/java/com/usoftchina/saas/document/DocumentApplication.java

@@ -4,12 +4,14 @@ 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.cloud.openfeign.EnableFeignClients;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
 @EnableEurekaClient
 //@EnableAuthClient
 @EnableTransactionManagement
+@EnableFeignClients
 @MapperScan("com.usoftchina.saas.document.mapper")
 public class DocumentApplication {
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/AddressController.java

@@ -16,7 +16,7 @@ public class AddressController {
     private AddressService addressService;
 
     @PostMapping("/save")
-    public Result save(Address address){
+    public Result save(@RequestBody Address address){
         addressService.save(address);
         return Result.success();
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/CustomerkindController.java

@@ -17,7 +17,7 @@ public class CustomerkindController {
     private CustomerkindService customerkindService;
 
     @PostMapping("/save")
-    public Result save(Customerkind customerkind){
+    public Result save(@RequestBody Customerkind customerkind){
         customerkindService.save(customerkind);
         return Result.success();
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProductbrandController.java

@@ -21,7 +21,7 @@ public class ProductbrandController {
      * @return
      */
     @PostMapping("/save")
-    public Result save(Productbrand productbrand){
+    public Result save(@RequestBody Productbrand productbrand){
         productbrandService.save(productbrand);
         return Result.success();
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProducttypeController.java

@@ -22,7 +22,7 @@ public class ProducttypeController {
     }
 
     @PostMapping("/save")
-    public Result save(Producttype producttype){
+    public Result save(@RequestBody Producttype producttype){
         producttypeService.save(producttype);
         return Result.success();
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/VendorController.java

@@ -4,11 +4,13 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 
 import com.usoftchina.saas.commons.dto.DocReqDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.service.VendorService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,9 +23,9 @@ public class VendorController {
     @Autowired
     private VendorService vendorService;
 
-    @RequestMapping("/getVendorsByCondition")
-    public Result<List<VendorDTO>> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO){
-        PageInfo<VendorDTO> vendorList = vendorService.getVendorsByCondition(page, docReqDTO);
+    @GetMapping("/getVendorsByCondition")
+    public Result<List<VendorDTO>> getVendorsByCondition(PageRequest page, ListReqDTO listReqDTO){
+        PageInfo<VendorDTO> vendorList = vendorService.getVendorsByCondition(page, listReqDTO);
         return Result.success(vendorList);
     }
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/VendorkindController.java

@@ -16,7 +16,7 @@ public class VendorkindController {
     private VendorkindService vendorkindService;
 
     @PostMapping("/save")
-    public Result save(Vendorkind vendorkind){
+    public Result save(@RequestBody Vendorkind vendorkind){
         vendorkindService.save(vendorkind);
         return Result.success();
     }
@@ -27,7 +27,7 @@ public class VendorkindController {
         return Result.success();
     }
 
-    @GetMapping
+    @GetMapping("/getAll")
     public Result<Vendorkind> getAll(){
         List<Vendorkind> vendorkindList = vendorkindService.findAll();
         return Result.success(vendorkindList);

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/AddressMapper.java

@@ -6,13 +6,13 @@ import java.util.List;
 
 public interface AddressMapper extends CommonBaseMapper<Address> {
 
-    int deleteByPrimaryKey(Long ad_id);
+    int deleteByPrimaryKey(Long id);
 
     int insert(Address record);
 
     int insertSelective(Address record);
 
-    Address selectByPrimaryKey(Long ad_id);
+    Address selectByPrimaryKey(Long id);
 
     int updateByPrimaryKeySelective(Address record);
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CustomerMapper.java

@@ -10,7 +10,7 @@ public interface CustomerMapper extends CommonBaseMapper<Customer> {
 
     int insertSelective(Customer record);
 
-    Customer selectByPrimaryKey(Integer cu_id);
+    Customer selectByPrimaryKey(Long cu_id);
 
     int updateByPrimaryKeySelective(Customer record);
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CustomeraddressMapper.java

@@ -4,6 +4,8 @@ import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.document.entities.Customer;
 import com.usoftchina.saas.document.entities.Customeraddress;
 
+import java.util.List;
+
 public interface CustomeraddressMapper extends CommonBaseMapper<Customer> {
     int deleteByPrimaryKey(Integer ca_id);
 
@@ -18,4 +20,6 @@ public interface CustomeraddressMapper extends CommonBaseMapper<Customer> {
     int updateByPrimaryKeyWithBLOBs(Customeraddress record);
 
     int updateByPrimaryKey(Customeraddress record);
+
+    List<Customeraddress> selectByFK(Long fk_i);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CustomercontactMapper.java

@@ -4,6 +4,8 @@ package com.usoftchina.saas.document.mapper;
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.document.entities.Customercontact;
 
+import java.util.List;
+
 public interface CustomercontactMapper extends CommonBaseMapper<Customercontact> {
     int deleteByPrimaryKey(Integer cc_id);
 
@@ -16,4 +18,8 @@ public interface CustomercontactMapper extends CommonBaseMapper<Customercontact>
     int updateByPrimaryKeySelective(Customercontact record);
 
     int updateByPrimaryKey(Customercontact record);
+
+    List<Customercontact> selectByFK(Long fk_i);
+
+
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CustomerkindMapper.java

@@ -4,13 +4,13 @@ import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.document.entities.Customerkind;
 
 public interface CustomerkindMapper extends CommonBaseMapper<Customerkind> {
-    int deleteByPrimaryKey(Long ck_id);
+    int deleteByPrimaryKey(Long id);
 
     int insert(Customerkind record);
 
     int insertSelective(Customerkind record);
 
-    Customerkind selectByPrimaryKey(Long ck_id);
+    Customerkind selectByPrimaryKey(Long id);
 
     int updateByPrimaryKeySelective(Customerkind record);
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/ProductbrandMapper.java

@@ -5,13 +5,13 @@ import com.usoftchina.saas.document.entities.Productbrand;
 
 public interface ProductbrandMapper extends CommonBaseMapper<Productbrand> {
 
-    int deleteByPrimaryKey(Long pb_id);
+    int deleteByPrimaryKey(Long id);
 
     int insert(Productbrand record);
 
     int insertSelective(Productbrand record);
 
-    Productbrand selectByPrimaryKey(Long pb_id);
+    Productbrand selectByPrimaryKey(Long id);
 
     int updateByPrimaryKeySelective(Productbrand record);
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/VendorMapper.java

@@ -4,12 +4,14 @@ import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 
 
 import com.usoftchina.saas.commons.dto.DocReqDTO;
+import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
+import feign.Param;
 
 import java.util.List;
 
 public interface VendorMapper extends CommonBaseMapper<Vendor> {
 
-    List<Vendor> getVendorsByCondition(DocReqDTO docReqDTO);
+    List<VendorDTO> getVendorsByCondition(@Param("condition") String condition, @Param("companyId") Long companyId);
 
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/VendorkindMapper.java

@@ -5,13 +5,13 @@ import com.usoftchina.saas.document.entities.Vendorkind;
 
 public interface VendorkindMapper extends CommonBaseMapper<Vendorkind> {
 
-    int deleteByPrimaryKey(Integer vk_id);
+    int deleteByPrimaryKey(Integer id);
 
     int insert(Vendorkind record);
 
     int insertSelective(Vendorkind record);
 
-    Vendorkind selectByPrimaryKey(Long vk_id);
+    Vendorkind selectByPrimaryKey(Long id);
 
     int updateByPrimaryKeySelective(Vendorkind record);
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/VendorService.java

@@ -5,6 +5,7 @@ import com.usoftchina.saas.base.service.CommonBaseService;
 
 
 import com.usoftchina.saas.commons.dto.DocReqDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;
@@ -14,6 +15,6 @@ import com.usoftchina.saas.page.PageRequest;
 
 public interface VendorService extends CommonBaseService<VendorMapper, Vendor>{
 
-    PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO);
+    PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, ListReqDTO listReqDTO);
 
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -8,8 +8,12 @@ import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.dto.CustomerDTO;
 import com.usoftchina.saas.document.dto.CustomerFormDTO;
+import com.usoftchina.saas.document.dto.CustomeraddressDTO;
+import com.usoftchina.saas.document.dto.CustomercontactDTO;
 import com.usoftchina.saas.document.entities.Customer;
 import com.usoftchina.saas.document.entities.CustomerList;
+import com.usoftchina.saas.document.entities.Customeraddress;
+import com.usoftchina.saas.document.entities.Customercontact;
 import com.usoftchina.saas.document.mapper.CustomerListMapper;
 import com.usoftchina.saas.document.mapper.CustomerMapper;
 import com.usoftchina.saas.document.mapper.CustomeraddressMapper;
@@ -63,17 +67,21 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         if (null == id || "0".equals(id)) {
             return null;
         }
-        CustomerFormDTO purchaseFormDTO = new CustomerFormDTO();
+        CustomerFormDTO customerFormDTO = new CustomerFormDTO();
         //查询主表信息
         Customer customer = getMapper().selectByPrimaryKey(id);
+
         //将Customer实体对象转化成传输对象
         CustomerDTO main = BeanMapper.map(customer, CustomerDTO.class);
         //查询从表
-//        List<PurchaseDetail> purchaseDetails = purchasedetailMapper.selectByFK(id);
-//        List<PurchaseDetailDTO> items = BeanMapper.mapList(purchaseDetails, PurchaseDetailDTO.class);
-//        purchaseFormDTO.setMain(main);
-//        purchaseFormDTO.setItems(items);
-        return purchaseFormDTO;
+        List<Customercontact> customercontacts = customercontactMapper.selectByFK(id);
+        List<CustomercontactDTO> items1 = BeanMapper.mapList(customercontacts, CustomercontactDTO.class);
+        List<Customeraddress> customeraddresses = customeraddressMapper.selectByFK(id);
+        List<CustomeraddressDTO> items2 = BeanMapper.mapList(customeraddresses, CustomeraddressDTO.class);
+        customerFormDTO.setMain(main);
+        customerFormDTO.setItems1(items1);
+        customerFormDTO.setItems2(items2);
+        return customerFormDTO;
     }
 
     @Override

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductbrandServiceImpl.java

@@ -1,20 +1,21 @@
 package com.usoftchina.saas.document.service.impl;
 
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
-import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.entities.Productbrand;
 import com.usoftchina.saas.document.mapper.ProductbrandMapper;
 import com.usoftchina.saas.document.service.ProductbrandService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandMapper, Productbrand> implements ProductbrandService {
 
     @Autowired
     private ProductbrandMapper productbrandMapper;
-    @Autowired
-    private MessageLogService messageLogService;
+//    @Autowired
+//    private MessageLogService messageLogService;
 
     private final String LOG_NAME = "物料品牌";
 
@@ -25,12 +26,12 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
             productbrandMapper.insertSelective(productbrand);
             //记录日志
             DocBaseDTO docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
-            messageLogService.save(docBaseDTO);
+//            messageLogService.save(docBaseDTO);
         }else{
             productbrandMapper.updateByPrimaryKeySelective(productbrand);
             //记录日志
             DocBaseDTO docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
-            messageLogService.update(docBaseDTO);
+//            messageLogService.update(docBaseDTO);
         }
         return true;
     }
@@ -40,7 +41,7 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
         productbrandMapper.deleteByPrimaryKey(id);
         //记录日志
         DocBaseDTO docBaseDTO = new DocBaseDTO(id, null, LOG_NAME);
-        messageLogService.delete(docBaseDTO);
+//        messageLogService.delete(docBaseDTO);
         return true;
     }
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -4,6 +4,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.dto.DocReqDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;
@@ -22,7 +24,7 @@ import java.util.List;
 public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendor> implements VendorService {
 
     @Override
-    public PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO) {
+    public PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, ListReqDTO listReqDTO) {
         //设置分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -30,9 +32,20 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             page.setSize(10);
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
-        List<VendorDTO> vendorList = BeanMapper.mapList(getMapper().getVendorsByCondition(docReqDTO), VendorDTO.class);
+        List<VendorDTO> vendorList = getList(listReqDTO);
         //取分页信息
         PageInfo<VendorDTO> pageInfo = new PageInfo<VendorDTO>(vendorList);
         return pageInfo;
     }
+
+    private List<VendorDTO> getList(ListReqDTO listReqDTO){
+        Long companyId = BaseContextHolder.getCompanyId();
+        String condition = listReqDTO.getFinalCondition();
+        if(condition == null){
+            condition = "1=1";
+        }
+        List<VendorDTO> vendorDTOList = getMapper().getVendorsByCondition(condition, companyId);
+        return vendorDTOList;
+    }
+
 }

applications/document/document-server/src/main/resources/mapper/AddressMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usoftchina.saas.document.mapper.AddressMapper">
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Address">
-    <id column="ad_id" jdbcType="INTEGER" property="ad_id" />
+    <id column="ad_id" jdbcType="INTEGER" property="id" />
     <result column="ad_recorddate" jdbcType="TIMESTAMP" property="ad_recorddate" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
@@ -149,7 +149,7 @@
       ad_text4 = #{ad_text4,jdbcType=VARCHAR},
       ad_text5 = #{ad_text5,jdbcType=VARCHAR},
       ad_address = #{ad_address,jdbcType=LONGVARCHAR}
-    where ad_id = #{ad_id,jdbcType=INTEGER}
+    where ad_id = #{id}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Address">
     update address
@@ -162,11 +162,11 @@
       ad_text3 = #{ad_text3,jdbcType=VARCHAR},
       ad_text4 = #{ad_text4,jdbcType=VARCHAR},
       ad_text5 = #{ad_text5,jdbcType=VARCHAR}
-    where ad_id = #{ad_id,jdbcType=INTEGER}
+    where ad_id = #{id}
   </update>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from address
-    where ad_id = #{ad_id,jdbcType=INTEGER}
+    where ad_id = #{id}
   </delete>
   <delete id="deleteByIds" parameterType="java.lang.String">
     delete from address

applications/document/document-server/src/main/resources/mapper/CustomerMapper.xml

@@ -22,7 +22,7 @@
     <result column="cu_recordman" jdbcType="VARCHAR" property="cu_recordman" />
     <result column="cu_recorddate" jdbcType="TIMESTAMP" property="cu_recorddate" />
     <result column="companyid" jdbcType="INTEGER" property="companyId" />
-    <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
+    <result column="updaterid" jdbcType="INTEGER" property="updaterId" />
     <result column="updatetime" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="cu_text1" jdbcType="VARCHAR" property="cu_text1" />
     <result column="cu_text2" jdbcType="VARCHAR" property="cu_text2" />
@@ -36,7 +36,7 @@
     cu_id, cu_code, cu_name, cu_uu, cu_type, cu_begindate, cu_beginaramount, cu_beginprerecamount, 
     cu_promisedays, cu_taxrate, cu_sellerid, cu_sellercode, cu_sellername, cu_credit, 
     cu_status, cu_statuscode, cu_recordmanid, cu_recordman, cu_recorddate, companyid, 
-    updaterId, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount, 
+    updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount, 
     cu_recamount
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -56,7 +56,7 @@
       cu_taxrate, cu_sellerid, cu_sellercode, 
       cu_sellername, cu_credit, cu_status, 
       cu_statuscode, cu_recordmanid, cu_recordman, 
-      cu_recorddate, companyid, updaterId, 
+      cu_recorddate, companyid, updaterid, 
       updatetime, cu_text1, cu_text2, 
       cu_text3, cu_text4, cu_text5, 
       cu_leftamount, cu_recamount)
@@ -66,7 +66,7 @@
       #{cu_taxrate,jdbcType=DOUBLE}, #{cu_sellerid,jdbcType=INTEGER}, #{cu_sellercode,jdbcType=VARCHAR}, 
       #{cu_sellername,jdbcType=VARCHAR}, #{cu_credit,jdbcType=DOUBLE}, #{cu_status,jdbcType=VARCHAR}, 
       #{cu_statuscode,jdbcType=VARCHAR}, #{cu_recordmanid,jdbcType=INTEGER}, #{cu_recordman,jdbcType=VARCHAR}, 
-      #{cu_recorddate,jdbcType=TIMESTAMP}, #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
+      #{cu_recorddate,jdbcType=TIMESTAMP}, #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{cu_text1,jdbcType=VARCHAR}, #{cu_text2,jdbcType=VARCHAR}, 
       #{cu_text3,jdbcType=VARCHAR}, #{cu_text4,jdbcType=VARCHAR}, #{cu_text5,jdbcType=VARCHAR}, 
       #{cu_leftamount,jdbcType=DOUBLE}, #{cu_recamount,jdbcType=DOUBLE})
@@ -134,8 +134,8 @@
       <if test="companyid != null">
         companyid,
       </if>
-      <if test="updaterId != null">
-        updaterId,
+      <if test="updaterid != null">
+        updaterid,
       </if>
       <if test="updatetime != null">
         updatetime,
@@ -223,8 +223,8 @@
       <if test="companyid != null">
         #{companyid,jdbcType=INTEGER},
       </if>
-      <if test="updaterId != null">
-        #{updaterId,jdbcType=INTEGER},
+      <if test="updaterid != null">
+        #{updaterid,jdbcType=INTEGER},
       </if>
       <if test="updatetime != null">
         #{updatetime,jdbcType=TIMESTAMP},
@@ -312,8 +312,8 @@
       <if test="companyid != null">
         companyid = #{companyid,jdbcType=INTEGER},
       </if>
-      <if test="updaterId != null">
-        updaterId = #{updaterId,jdbcType=INTEGER},
+      <if test="updaterid != null">
+        updaterid = #{updaterid,jdbcType=INTEGER},
       </if>
       <if test="updatetime != null">
         updatetime = #{updatetime,jdbcType=TIMESTAMP},
@@ -363,7 +363,7 @@
       cu_recordman = #{cu_recordman,jdbcType=VARCHAR},
       cu_recorddate = #{cu_recorddate,jdbcType=TIMESTAMP},
       companyid = #{companyid,jdbcType=INTEGER},
-      updaterId = #{updaterId,jdbcType=INTEGER},
+      updaterid = #{updaterid,jdbcType=INTEGER},
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
       cu_text1 = #{cu_text1,jdbcType=VARCHAR},
       cu_text2 = #{cu_text2,jdbcType=VARCHAR},

applications/document/document-server/src/main/resources/mapper/CustomeraddressMapper.xml

@@ -29,9 +29,7 @@
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
     select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
+   *
     from customeraddress
     where ca_id = #{ca_id,jdbcType=INTEGER}
   </select>
@@ -233,4 +231,15 @@
       ca_text5 = #{ca_text5,jdbcType=VARCHAR}
     where ca_id = #{ca_id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectByFK" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from customeraddress
+    where ca_cuid = #{fk_i,jdbcType=INTEGER}
+  </select>
+
+
 </mapper>

applications/document/document-server/src/main/resources/mapper/CustomercontactMapper.xml

@@ -209,4 +209,14 @@
       cc_text5 = #{cc_text5,jdbcType=VARCHAR}
     where cc_id = #{cc_id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectByFK" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from customercontact
+    where cc_cuid = #{fk_i,jdbcType=INTEGER}
+  </select>
+
+
+
 </mapper>

applications/document/document-server/src/main/resources/mapper/CustomerkindMapper.xml

@@ -15,11 +15,14 @@
     select 
     <include refid="Base_Column_List" />
     from customerkind
-    where ck_id = #{id,jdbcType=INTEGER}
+    where ck_id = #{id}
   </select>
+  <sql id="Base_Column_List" >
+    ck_id, ck_name, ck_recordid, ck_recorder, ck_date, companyId, updaterId, updateTime
+  </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from customerkind
-    where ck_id = #{id,jdbcType=INTEGER}
+    where ck_id = #{id}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
     insert into customerkind (ck_name, ck_recordid,
@@ -103,7 +106,7 @@
         updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where ck_id = #{id,jdbcType=INTEGER}
+    where ck_id = #{id}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
     update customerkind
@@ -114,7 +117,7 @@
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}
-    where ck_id = #{id,jdbcType=INTEGER}
+    where ck_id = #{id}
   </update>
   <select id="selectAll" resultMap="BaseResultMap">
     SELECT * FROM CUSTOMERKIND

applications/document/document-server/src/main/resources/mapper/ProductbrandMapper.xml

@@ -15,11 +15,14 @@
     select 
     <include refid="Base_Column_List" />
     from productbrand
-    where pb_id = #{id,jdbcType=INTEGER}
+    where pb_id = #{id}
   </select>
+  <sql id="Base_Column_List" >
+    pb_id, pb_name, pb_recordid, pb_recorder, pb_date, companyId, updaterId, updateTime
+  </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from productbrand
-    where pb_id = #{id,jdbcType=INTEGER}
+    where pb_id = #{id}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Productbrand" >
     insert into productbrand (pb_name, pb_recordid,
@@ -103,7 +106,7 @@
         updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where pb_id = #{id,jdbcType=INTEGER}
+    where pb_id = #{id}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Productbrand" >
     update productbrand
@@ -114,7 +117,7 @@
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}
-    where pb_id = #{id,jdbcType=INTEGER}
+    where pb_id = #{id}
   </update>
   <select id="selectAll" resultMap="BaseResultMap">
     SELECT * FROM PRODUCTBRAND

applications/document/document-server/src/main/resources/mapper/ProducttypeMapper.xml

@@ -18,7 +18,7 @@
     select 
     <include refid="Base_Column_List" />
     from producttype
-    where pt_id = #{id,jdbcType=INTEGER}
+    where pt_id = #{id}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from producttype
@@ -106,7 +106,7 @@
         updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where pt_id = #{id,jdbcType=INTEGER}
+    where pt_id = #{id}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Producttype">
     update producttype
@@ -117,9 +117,9 @@
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}
-    where pt_id = #{id,jdbcType=INTEGER}
+    where pt_id = #{id}
   </update>
-  <select id="selectAll" resultMap="com.usoftchina.saas.document.entities.Producttype">
+  <select id="selectAll" resultMap="BaseResultMap">
     SELECT * FROM PRODUCTTYPE
   </select>
 </mapper>

applications/document/document-server/src/main/resources/mapper/VendorMapper.xml

@@ -43,7 +43,12 @@
             <if test="condition!=null">
                 ${condition}
             </if>
+            <if test="companyId!=null">
+                AND companyId = #{companyId}
+            </if>
         </where>
+        ORDER BY VE_ID
     </select>
+
 </mapper>
 

applications/document/document-server/src/main/resources/mapper/VendorkindMapper.xml

@@ -18,11 +18,11 @@
     select
     <include refid="Base_Column_List" />
     from vendorkind
-    where vk_id = #{id,jdbcType=INTEGER}
+    where vk_id = #{id}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from vendorkind
-    where vk_id = #{id,jdbcType=INTEGER}
+    where vk_id = #{id}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Vendorkind">
     insert into vendorkind (vk_name, vk_recordid,
@@ -106,7 +106,7 @@
         updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where vk_id = #{id,jdbcType=INTEGER}
+    where vk_id = #{id}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Vendorkind">
     update vendorkind
@@ -117,7 +117,7 @@
     companyId = #{companyId,jdbcType=INTEGER},
     updaterId = #{updaterId,jdbcType=INTEGER},
     updateTime = #{updateTime,jdbcType=TIMESTAMP}
-    where vk_id = #{id,jdbcType=INTEGER}
+    where vk_id = #{id}
   </update>
   <select id="selectAll" resultMap="BaseResultMap">
     SELECT * FROM VENDORKIND

applications/document/document-server/src/test/java/com/usoftchina/saas/document/service/CustomerTest.java

@@ -0,0 +1,32 @@
+package com.usoftchina.saas.document.service;
+
+
+import com.usoftchina.saas.document.DocumentApplication;
+import com.usoftchina.saas.document.mapper.CustomeraddressMapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = DocumentApplication.class)
+@EnableAutoConfiguration
+public class CustomerTest {
+
+    @Autowired
+    private CustomerService customerService;
+    @Autowired
+    private CustomeraddressMapper customeraddressMapper;
+
+    @Test
+    public void test(){
+        System.out.println(customerService.getFormData(new Long(1)));
+    }
+
+    @Test
+    public void test1(){
+        System.out.println(customeraddressMapper.selectByPrimaryKey(1));
+    }
+}

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationListDTO.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * @createtime 2018-10-22-17:02
  */
 @Data
-public class VerificationListDTO extends CommonBaseEntity implements Serializable {
+public class VerificationListDTO implements Serializable {
     private Integer vc_id;
 
     private String vc_code;

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

@@ -0,0 +1,55 @@
+package com.usoftchina.saas.money.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.money.po.Pay;
+import com.usoftchina.saas.money.po.Paybalance;
+import com.usoftchina.saas.money.service.PaybalanceService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author heqw
+ * @date 2018/10/22 15:03
+ **/
+@RestController
+@RequestMapping("/money")
+public class PaybalanceController {
+    @Autowired
+    private PaybalanceService paybalanceService;
+
+    @RequestMapping("/insertPaybalance")
+    public Result insertPaybalance(@RequestBody Pay body) {
+        int id = paybalanceService.insert(body);
+        return Result.success(id);
+    }
+
+
+    @RequestMapping("/updatePaybalance")
+    public Result updatePaybalance(@RequestBody Pay body){
+        paybalanceService.updatePaybalance(body);
+        return Result.success();
+    }
+
+    @GetMapping("/deletePaybalance")
+    public Result deletePaybalance(int id){
+        paybalanceService.deletePaybalance(id);
+        return Result.success();
+    }
+
+    @GetMapping("/getPaybalance")
+    public Result getPaybalance(int id){
+        return Result.success(paybalanceService.selectByPrimaryKey(id));
+    }
+
+    @GetMapping("/getPaybalanceList")
+    public Result getPaybalanceList(PageRequest page){
+        PageInfo<Paybalance> list = paybalanceService.selectList(page);
+        return Result.success(list);
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.usoftchina.saas.money.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.money.po.Rec;
+import com.usoftchina.saas.money.service.RecbalanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 15:40
+ **/
+@RestController
+@RequestMapping("/money")
+public class RecbalanceContorller {
+    @Autowired
+    private RecbalanceService recbalanceService;
+
+    @RequestMapping("/insertRecbalance")
+    public Result insert(@RequestBody Rec body){
+        recbalanceService.insert(body);
+        return Result.success();
+    }
+
+    @GetMapping("/deleteRecbalance")
+    public Result deleteRecbalance(int id){
+        recbalanceService.delectRecbalance(id);
+        return Result.success();
+    }
+
+    @RequestMapping("/updateRecbalance")
+    public Result updateRecbalance(@RequestBody Rec body){
+        recbalanceService.updateRecbalance(body);
+        return Result.success();
+    }
+
+    @GetMapping("/selectRecbalance")
+    public Result selectRecbalance(int id){
+        return Result.success(recbalanceService.selectRecbalance(id));
+    }
+
+    @GetMapping("/selectRecbalanceList")
+    public Result selectRecbalanceList(){
+        return Result.success(recbalanceService.selectRecbalanceList());
+    }
+}

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

@@ -2,14 +2,12 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Paybalance;
-import com.usoftchina.saas.money.po.PaybalanceExample;
+
 import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
-    int countByExample(PaybalanceExample example);
-
-    int deleteByExample(PaybalanceExample example);
 
     int deleteByPrimaryKey(Integer pb_id);
 
@@ -17,14 +15,10 @@ public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
 
     int insertSelective(Paybalance record);
 
-    List<Paybalance> selectByExample(PaybalanceExample example);
+    List<Paybalance> selectList();
 
     Paybalance selectByPrimaryKey(Integer pb_id);
 
-    int updateByExampleSelective(@Param("record") Paybalance record, @Param("example") PaybalanceExample example);
-
-    int updateByExample(@Param("record") Paybalance record, @Param("example") PaybalanceExample example);
-
     int updateByPrimaryKeySelective(Paybalance record);
 
     int updateByPrimaryKey(Paybalance record);

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

@@ -0,0 +1,17 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.Paybalancedet;
+
+public interface PaybalancedetMapper {
+    int deleteByPrimaryKey(Integer pdId);
+
+    int insert(Paybalancedet record);
+
+    int insertSelective(Paybalancedet record);
+
+    Paybalancedet selectByPrimaryKey(Integer pdId);
+
+    int updateByPrimaryKeySelective(Paybalancedet record);
+
+    int updateByPrimaryKey(Paybalancedet record);
+}

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

@@ -0,0 +1,18 @@
+package com.usoftchina.saas.money.mapper;
+
+
+import com.usoftchina.saas.money.po.Paybalancedetail;
+
+public interface PaybalancedetailMapper {
+    int deleteByPrimaryKey(Integer pbdId);
+
+    int insert(Paybalancedetail record);
+
+    int insertSelective(Paybalancedetail record);
+
+    Paybalancedetail selectByPrimaryKey(Integer pbdId);
+
+    int updateByPrimaryKeySelective(Paybalancedetail record);
+
+    int updateByPrimaryKey(Paybalancedetail record);
+}

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

@@ -2,8 +2,10 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Recbalance;
-import com.usoftchina.saas.money.po.RecbalanceExample;
+
 import java.util.List;
+
+import com.usoftchina.saas.money.po.RecbalanceExample;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -22,7 +24,7 @@ public interface RecbalanceMapper extends CommonBaseMapper<Recbalance> {
 
     int insertSelective(Recbalance record);
 
-    List<Recbalance> selectByExample(RecbalanceExample example);
+    List<Recbalance> selectList();
 
     Recbalance selectByPrimaryKey(Integer rb_id);
 

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

@@ -2,8 +2,10 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Recbalancedet;
-import com.usoftchina.saas.money.po.RecbalancedetExample;
+
 import java.util.List;
+
+import com.usoftchina.saas.money.po.RecbalancedetExample;
 import org.apache.ibatis.annotations.Param;
 
 public interface RecbalancedetMapper extends CommonBaseMapper<Recbalancedet> {

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

@@ -0,0 +1,17 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.Recbalancedetail;
+
+public interface RecbalancedetailMapper {
+    int deleteByPrimaryKey(Integer rbdId);
+
+    int insert(Recbalancedetail record);
+
+    int insertSelective(Recbalancedetail record);
+
+    Recbalancedetail selectByPrimaryKey(Integer rbdId);
+
+    int updateByPrimaryKeySelective(Recbalancedetail record);
+
+    int updateByPrimaryKey(Recbalancedetail record);
+}

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

@@ -162,4 +162,23 @@ public class Banksubledger extends CommonBaseEntity implements Serializable {
         this.bl_remark = bl_remark == null ? null : bl_remark.trim();
     }
 
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
 }

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

@@ -5,9 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author hx
- * @createtime 2018-10-19 16:03
- */
+ * @author heqw
+ * @date 2018/10/23 14:41
+ **/
 public class BanksubledgerExample {
     protected String orderByClause;
 
@@ -1372,4 +1372,4 @@ public class BanksubledgerExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

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

@@ -0,0 +1,35 @@
+package com.usoftchina.saas.money.po;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 10:19
+ **/
+public class Pay {
+    private Paybalance paybalance;
+    private Paybalancedet paybalancedet;
+    private Paybalancedetail paybalancedetail;
+
+    public Paybalance getPaybalance() {
+        return paybalance;
+    }
+
+    public void setPaybalance(Paybalance paybalance) {
+        this.paybalance = paybalance;
+    }
+
+    public Paybalancedet getPaybalancedet() {
+        return paybalancedet;
+    }
+
+    public void setPaybalancedet(Paybalancedet paybalancedet) {
+        this.paybalancedet = paybalancedet;
+    }
+
+    public Paybalancedetail getPaybalancedetail() {
+        return paybalancedetail;
+    }
+
+    public void setPaybalancedetail(Paybalancedetail paybalancedetail) {
+        this.paybalancedetail = paybalancedetail;
+    }
+}

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

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

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

@@ -6,9 +6,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author hx
- * @createtime 2018-10-19 16:03
- */
+ * @author heqw
+ * @date 2018/10/23 14:58
+ **/
 public class PaybalanceExample {
     protected String orderByClause;
 
@@ -1943,4 +1943,4 @@ public class PaybalanceExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

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

@@ -0,0 +1,217 @@
+package com.usoftchina.saas.money.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Paybalancedet extends CommonBaseEntity implements Serializable {
+    private Integer pdId;
+
+    private Integer pdRbid;
+
+    private Integer pdDetno;
+
+    private Integer pdYm;
+
+    private Integer pdBankid;
+
+    private String pdBankcode;
+
+    private String pdBankname;
+
+    private Double pdAmount;
+
+    private String pdPaymethod;
+
+    private String pdPaycode;
+
+    private String pdRemark;
+
+    private Integer companyid;
+
+    private Integer updaterid;
+
+    private Date updatedate;
+
+    private String pdText1;
+
+    private String pdText2;
+
+    private String pdText3;
+
+    private String pdText4;
+
+    private String pdText5;
+
+    public Integer getPdId() {
+        return pdId;
+    }
+
+    public void setPdId(Integer pdId) {
+        this.pdId = pdId;
+    }
+
+    public Integer getPdRbid() {
+        return pdRbid;
+    }
+
+    public void setPdRbid(Integer pdRbid) {
+        this.pdRbid = pdRbid;
+    }
+
+    public Integer getPdDetno() {
+        return pdDetno;
+    }
+
+    public void setPdDetno(Integer pdDetno) {
+        this.pdDetno = pdDetno;
+    }
+
+    public Integer getPdYm() {
+        return pdYm;
+    }
+
+    public void setPdYm(Integer pdYm) {
+        this.pdYm = pdYm;
+    }
+
+    public Integer getPdBankid() {
+        return pdBankid;
+    }
+
+    public void setPdBankid(Integer pdBankid) {
+        this.pdBankid = pdBankid;
+    }
+
+    public String getPdBankcode() {
+        return pdBankcode;
+    }
+
+    public void setPdBankcode(String pdBankcode) {
+        this.pdBankcode = pdBankcode == null ? null : pdBankcode.trim();
+    }
+
+    public String getPdBankname() {
+        return pdBankname;
+    }
+
+    public void setPdBankname(String pdBankname) {
+        this.pdBankname = pdBankname == null ? null : pdBankname.trim();
+    }
+
+    public Double getPdAmount() {
+        return pdAmount;
+    }
+
+    public void setPdAmount(Double pdAmount) {
+        this.pdAmount = pdAmount;
+    }
+
+    public String getPdPaymethod() {
+        return pdPaymethod;
+    }
+
+    public void setPdPaymethod(String pdPaymethod) {
+        this.pdPaymethod = pdPaymethod == null ? null : pdPaymethod.trim();
+    }
+
+    public String getPdPaycode() {
+        return pdPaycode;
+    }
+
+    public void setPdPaycode(String pdPaycode) {
+        this.pdPaycode = pdPaycode == null ? null : pdPaycode.trim();
+    }
+
+    public String getPdRemark() {
+        return pdRemark;
+    }
+
+    public void setPdRemark(String pdRemark) {
+        this.pdRemark = pdRemark == null ? null : pdRemark.trim();
+    }
+
+    public Integer getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(Integer companyid) {
+        this.companyid = companyid;
+    }
+
+    public Integer getUpdaterid() {
+        return updaterid;
+    }
+
+    public void setUpdaterid(Integer updaterid) {
+        this.updaterid = updaterid;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public String getPdText1() {
+        return pdText1;
+    }
+
+    public void setPdText1(String pdText1) {
+        this.pdText1 = pdText1 == null ? null : pdText1.trim();
+    }
+
+    public String getPdText2() {
+        return pdText2;
+    }
+
+    public void setPdText2(String pdText2) {
+        this.pdText2 = pdText2 == null ? null : pdText2.trim();
+    }
+
+    public String getPdText3() {
+        return pdText3;
+    }
+
+    public void setPdText3(String pdText3) {
+        this.pdText3 = pdText3 == null ? null : pdText3.trim();
+    }
+
+    public String getPdText4() {
+        return pdText4;
+    }
+
+    public void setPdText4(String pdText4) {
+        this.pdText4 = pdText4 == null ? null : pdText4.trim();
+    }
+
+    public String getPdText5() {
+        return pdText5;
+    }
+
+    public void setPdText5(String pdText5) {
+        this.pdText5 = pdText5 == null ? null : pdText5.trim();
+    }
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
+}

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

@@ -0,0 +1,217 @@
+package com.usoftchina.saas.money.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Paybalancedetail extends CommonBaseEntity implements Serializable {
+    private Integer pbdId;
+
+    private Integer pbdPbid;
+
+    private Integer pbdDetno;
+
+    private Integer pbdYm;
+
+    private Integer pbdSild;
+
+    private String pbdSlcode;
+
+    private String pbdSlkind;
+
+    private Date pbdSldate;
+
+    private Double pbdAmount;
+
+    private Double pbdNowbalance;
+
+    private String pbdRemark;
+
+    private Integer companyid;
+
+    private Integer updaterid;
+
+    private Date updatedate;
+
+    private String pbdText1;
+
+    private String pbdText2;
+
+    private String pbdText3;
+
+    private String pbdText4;
+
+    private String pbdText5;
+
+    public Integer getPbdId() {
+        return pbdId;
+    }
+
+    public void setPbdId(Integer pbdId) {
+        this.pbdId = pbdId;
+    }
+
+    public Integer getPbdPbid() {
+        return pbdPbid;
+    }
+
+    public void setPbdPbid(Integer pbdPbid) {
+        this.pbdPbid = pbdPbid;
+    }
+
+    public Integer getPbdDetno() {
+        return pbdDetno;
+    }
+
+    public void setPbdDetno(Integer pbdDetno) {
+        this.pbdDetno = pbdDetno;
+    }
+
+    public Integer getPbdYm() {
+        return pbdYm;
+    }
+
+    public void setPbdYm(Integer pbdYm) {
+        this.pbdYm = pbdYm;
+    }
+
+    public Integer getPbdSild() {
+        return pbdSild;
+    }
+
+    public void setPbdSild(Integer pbdSild) {
+        this.pbdSild = pbdSild;
+    }
+
+    public String getPbdSlcode() {
+        return pbdSlcode;
+    }
+
+    public void setPbdSlcode(String pbdSlcode) {
+        this.pbdSlcode = pbdSlcode == null ? null : pbdSlcode.trim();
+    }
+
+    public String getPbdSlkind() {
+        return pbdSlkind;
+    }
+
+    public void setPbdSlkind(String pbdSlkind) {
+        this.pbdSlkind = pbdSlkind == null ? null : pbdSlkind.trim();
+    }
+
+    public Date getPbdSldate() {
+        return pbdSldate;
+    }
+
+    public void setPbdSldate(Date pbdSldate) {
+        this.pbdSldate = pbdSldate;
+    }
+
+    public Double getPbdAmount() {
+        return pbdAmount;
+    }
+
+    public void setPbdAmount(Double pbdAmount) {
+        this.pbdAmount = pbdAmount;
+    }
+
+    public Double getPbdNowbalance() {
+        return pbdNowbalance;
+    }
+
+    public void setPbdNowbalance(Double pbdNowbalance) {
+        this.pbdNowbalance = pbdNowbalance;
+    }
+
+    public String getPbdRemark() {
+        return pbdRemark;
+    }
+
+    public void setPbdRemark(String pbdRemark) {
+        this.pbdRemark = pbdRemark == null ? null : pbdRemark.trim();
+    }
+
+    public Integer getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(Integer companyid) {
+        this.companyid = companyid;
+    }
+
+    public Integer getUpdaterid() {
+        return updaterid;
+    }
+
+    public void setUpdaterid(Integer updaterid) {
+        this.updaterid = updaterid;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public String getPbdText1() {
+        return pbdText1;
+    }
+
+    public void setPbdText1(String pbdText1) {
+        this.pbdText1 = pbdText1 == null ? null : pbdText1.trim();
+    }
+
+    public String getPbdText2() {
+        return pbdText2;
+    }
+
+    public void setPbdText2(String pbdText2) {
+        this.pbdText2 = pbdText2 == null ? null : pbdText2.trim();
+    }
+
+    public String getPbdText3() {
+        return pbdText3;
+    }
+
+    public void setPbdText3(String pbdText3) {
+        this.pbdText3 = pbdText3 == null ? null : pbdText3.trim();
+    }
+
+    public String getPbdText4() {
+        return pbdText4;
+    }
+
+    public void setPbdText4(String pbdText4) {
+        this.pbdText4 = pbdText4 == null ? null : pbdText4.trim();
+    }
+
+    public String getPbdText5() {
+        return pbdText5;
+    }
+
+    public void setPbdText5(String pbdText5) {
+        this.pbdText5 = pbdText5 == null ? null : pbdText5.trim();
+    }
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.usoftchina.saas.money.po;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 15:59
+ **/
+public class Rec {
+    private Recbalance recbalance;
+    private Recbalancedet recbalancedet;
+    private Recbalancedetail recbalancedetail;
+
+    public Recbalance getRecbalance() {
+        return recbalance;
+    }
+
+    public void setRecbalance(Recbalance recbalance) {
+        this.recbalance = recbalance;
+    }
+
+    public Recbalancedet getRecbalancedet() {
+        return recbalancedet;
+    }
+
+    public void setRecbalancedet(Recbalancedet recbalancedet) {
+        this.recbalancedet = recbalancedet;
+    }
+
+    public Recbalancedetail getRecbalancedetail() {
+        return recbalancedetail;
+    }
+
+    public void setRecbalancedetail(Recbalancedetail recbalancedetail) {
+        this.recbalancedetail = recbalancedetail;
+    }
+}

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

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

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

@@ -5,9 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author hx
- * @createtime 2018-10-19 16:13
- */
+ * @author heqw
+ * @date 2018/10/23 14:43
+ **/
 public class RecbalanceExample {
     protected String orderByClause;
 
@@ -1942,4 +1942,4 @@ public class RecbalanceExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

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

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

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

@@ -5,9 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author hx
- * @createtime 2018-10-19 16:03
- */
+ * @author heqw
+ * @date 2018/10/23 14:45
+ **/
 public class RecbalancedetExample {
     protected String orderByClause;
 
@@ -1442,4 +1442,4 @@ public class RecbalancedetExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

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

@@ -0,0 +1,218 @@
+package com.usoftchina.saas.money.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Recbalancedetail extends CommonBaseEntity implements Serializable {
+    private Integer rbdId;
+
+    private Integer rbdRbid;
+
+    private Integer rbdDetno;
+
+    private Integer rbdYm;
+
+    private Integer rbdSlid;
+
+    private String rbdSlcode;
+
+    private String rbdSlkind;
+
+    private Date rbdSldate;
+
+    private Double rbdAmount;
+
+    private Double rbdNowbalance;
+
+    private String rbdRemark;
+
+    private Integer companyid;
+
+    private Integer updaterid;
+
+    private Date updatedate;
+
+    private String rbdText1;
+
+    private String rbdText2;
+
+    private String rbdText3;
+
+    private String rbdText4;
+
+    private String rbdText5;
+
+    public Integer getRbdId() {
+        return rbdId;
+    }
+
+    public void setRbdId(Integer rbdId) {
+        this.rbdId = rbdId;
+    }
+
+    public Integer getRbdRbid() {
+        return rbdRbid;
+    }
+
+    public void setRbdRbid(Integer rbdRbid) {
+        this.rbdRbid = rbdRbid;
+    }
+
+    public Integer getRbdDetno() {
+        return rbdDetno;
+    }
+
+    public void setRbdDetno(Integer rbdDetno) {
+        this.rbdDetno = rbdDetno;
+    }
+
+    public Integer getRbdYm() {
+        return rbdYm;
+    }
+
+    public void setRbdYm(Integer rbdYm) {
+        this.rbdYm = rbdYm;
+    }
+
+    public Integer getRbdSlid() {
+        return rbdSlid;
+    }
+
+    public void setRbdSlid(Integer rbdSlid) {
+        this.rbdSlid = rbdSlid;
+    }
+
+    public String getRbdSlcode() {
+        return rbdSlcode;
+    }
+
+    public void setRbdSlcode(String rbdSlcode) {
+        this.rbdSlcode = rbdSlcode == null ? null : rbdSlcode.trim();
+    }
+
+    public String getRbdSlkind() {
+        return rbdSlkind;
+    }
+
+    public void setRbdSlkind(String rbdSlkind) {
+        this.rbdSlkind = rbdSlkind == null ? null : rbdSlkind.trim();
+    }
+
+    public Date getRbdSldate() {
+        return rbdSldate;
+    }
+
+    public void setRbdSldate(Date rbdSldate) {
+        this.rbdSldate = rbdSldate;
+    }
+
+    public Double getRbdAmount() {
+        return rbdAmount;
+    }
+
+    public void setRbdAmount(Double rbdAmount) {
+        this.rbdAmount = rbdAmount;
+    }
+
+    public Double getRbdNowbalance() {
+        return rbdNowbalance;
+    }
+
+    public void setRbdNowbalance(Double rbdNowbalance) {
+        this.rbdNowbalance = rbdNowbalance;
+    }
+
+    public String getRbdRemark() {
+        return rbdRemark;
+    }
+
+    public void setRbdRemark(String rbdRemark) {
+        this.rbdRemark = rbdRemark == null ? null : rbdRemark.trim();
+    }
+
+    public Integer getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(Integer companyid) {
+        this.companyid = companyid;
+    }
+
+    public Integer getUpdaterid() {
+        return updaterid;
+    }
+
+    public void setUpdaterid(Integer updaterid) {
+        this.updaterid = updaterid;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public String getRbdText1() {
+        return rbdText1;
+    }
+
+    public void setRbdText1(String rbdText1) {
+        this.rbdText1 = rbdText1 == null ? null : rbdText1.trim();
+    }
+
+    public String getRbdText2() {
+        return rbdText2;
+    }
+
+    public void setRbdText2(String rbdText2) {
+        this.rbdText2 = rbdText2 == null ? null : rbdText2.trim();
+    }
+
+    public String getRbdText3() {
+        return rbdText3;
+    }
+
+    public void setRbdText3(String rbdText3) {
+        this.rbdText3 = rbdText3 == null ? null : rbdText3.trim();
+    }
+
+    public String getRbdText4() {
+        return rbdText4;
+    }
+
+    public void setRbdText4(String rbdText4) {
+        this.rbdText4 = rbdText4 == null ? null : rbdText4.trim();
+    }
+
+    public String getRbdText5() {
+        return rbdText5;
+    }
+
+    public void setRbdText5(String rbdText5) {
+        this.rbdText5 = rbdText5 == null ? null : rbdText5.trim();
+    }
+
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.money.service;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.money.po.Pay;
+import com.usoftchina.saas.money.po.Paybalance;
+import com.usoftchina.saas.page.PageRequest;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/22 14:25
+ **/
+public interface PaybalanceService {
+    int insert(Pay pay);
+
+    void updatePaybalance(Pay pay);
+
+    void deletePaybalance(int id);
+
+    Pay selectByPrimaryKey(int id);
+
+    PageInfo<Paybalance> selectList(PageRequest page);
+}

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

@@ -0,0 +1,18 @@
+package com.usoftchina.saas.money.service;
+
+import com.usoftchina.saas.money.po.Rec;
+import com.usoftchina.saas.money.po.Recbalance;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 16:02
+ **/
+public interface RecbalanceService {
+    int insert(Rec rec);
+    void delectRecbalance(int id);
+    void updateRecbalance(Rec rec);
+    Rec selectRecbalance(int id);
+    List<Recbalance> selectRecbalanceList();
+}

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

@@ -0,0 +1,79 @@
+package com.usoftchina.saas.money.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.money.mapper.PaybalanceMapper;
+import com.usoftchina.saas.money.mapper.PaybalancedetMapper;
+import com.usoftchina.saas.money.mapper.PaybalancedetailMapper;
+import com.usoftchina.saas.money.po.Pay;
+import com.usoftchina.saas.money.po.Paybalance;
+import com.usoftchina.saas.money.po.Paybalancedet;
+import com.usoftchina.saas.money.po.Paybalancedetail;
+import com.usoftchina.saas.money.service.PaybalanceService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/22 14:28
+ **/
+@Service
+public class PaybalanceServiceImpl implements PaybalanceService {
+    @Autowired
+    private PaybalanceMapper paybalanceMapper;
+    @Autowired
+    private PaybalancedetMapper paybalancedetMapper;
+    @Autowired
+    private PaybalancedetailMapper paybalancedetailMapper;
+
+    public int insert(Pay pay) {
+        Paybalance paybalance = pay.getPaybalance();
+        Paybalancedet paybalancedet = pay.getPaybalancedet();
+        Paybalancedetail paybalancedetail = pay.getPaybalancedetail();
+        paybalanceMapper.insert(paybalance);
+        paybalancedetMapper.insert(paybalancedet);
+        paybalancedetailMapper.insert(paybalancedetail);
+        return 0;
+    }
+
+    @Override
+    public void updatePaybalance(Pay pay) {
+        Paybalance paybalance = pay.getPaybalance();
+        Paybalancedet paybalancedet = pay.getPaybalancedet();
+        Paybalancedetail paybalancedetail = pay.getPaybalancedetail();
+        paybalanceMapper.updateByPrimaryKeySelective(paybalance);
+        paybalancedetMapper.updateByPrimaryKeySelective(paybalancedet);
+        paybalancedetailMapper.updateByPrimaryKeySelective(paybalancedetail);
+    }
+
+    public void deletePaybalance(int id){
+        paybalanceMapper.deleteByPrimaryKey(id);
+        paybalancedetailMapper.deleteByPrimaryKey(id);
+        paybalancedetMapper.deleteByPrimaryKey(id);
+    }
+
+    public Pay selectByPrimaryKey(int id){
+        Pay pay = new Pay();
+        pay.setPaybalance(paybalanceMapper.selectByPrimaryKey(id));
+        pay.setPaybalancedet(paybalancedetMapper.selectByPrimaryKey(id));
+        pay.setPaybalancedetail(paybalancedetailMapper.selectByPrimaryKey(id));
+        return pay;
+    }
+
+    public PageInfo<Paybalance> selectList(PageRequest page){
+        //设置默认分页
+        if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
+            page = new PageRequest();
+            page.setNumber(1);
+            page.setSize(10);
+        }
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        List<Paybalance> paybalances = paybalanceMapper.selectList();
+        //取分页信息
+        PageInfo<Paybalance> pageInfo = new PageInfo<Paybalance>(paybalances);
+        return pageInfo;
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.usoftchina.saas.money.service.impl;
+
+import com.usoftchina.saas.money.mapper.RecbalanceMapper;
+import com.usoftchina.saas.money.mapper.RecbalancedetMapper;
+import com.usoftchina.saas.money.mapper.RecbalancedetailMapper;
+import com.usoftchina.saas.money.po.Rec;
+import com.usoftchina.saas.money.po.Recbalance;
+import com.usoftchina.saas.money.po.Recbalancedet;
+import com.usoftchina.saas.money.po.Recbalancedetail;
+import com.usoftchina.saas.money.service.RecbalanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 16:18
+ **/
+@Service
+public class RecbalanceServiceImpl implements RecbalanceService {
+    @Autowired
+    RecbalanceMapper recbalanceMapper;
+    @Autowired
+    RecbalancedetMapper recbalancedetMapper;
+    @Autowired
+    RecbalancedetailMapper recbalancedetailMapper;
+
+    @Override
+    public int insert(Rec rec) {
+        Recbalance recbalance = rec.getRecbalance();
+        Recbalancedet recbalancedet = rec.getRecbalancedet();
+        Recbalancedetail recbalancedetail = rec.getRecbalancedetail();
+        recbalanceMapper.insert(recbalance);
+        recbalancedetMapper.insert(recbalancedet);
+        recbalancedetailMapper.insert(recbalancedetail);
+        return 0;
+    }
+
+    @Override
+    public void delectRecbalance(int id) {
+        recbalanceMapper.deleteByPrimaryKey(id);
+        recbalancedetMapper.deleteByPrimaryKey(id);
+        recbalancedetailMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public void updateRecbalance(Rec rec) {
+        Recbalance recbalance = rec.getRecbalance();
+        Recbalancedet recbalancedet = rec.getRecbalancedet();
+        Recbalancedetail recbalancedetail = rec.getRecbalancedetail();
+        recbalanceMapper.updateByPrimaryKey(recbalance);
+        recbalancedetMapper.updateByPrimaryKey(recbalancedet);
+        recbalancedetailMapper.updateByPrimaryKey(recbalancedetail);
+    }
+
+    @Override
+    public Rec selectRecbalance(int id) {
+        Recbalance recbalance = recbalanceMapper.selectByPrimaryKey(id);
+        Recbalancedet recbalancedet = recbalancedetMapper.selectByPrimaryKey(id);
+        Recbalancedetail recbalancedetail = recbalancedetailMapper.selectByPrimaryKey(id);
+        Rec rec = new Rec();
+        rec.setRecbalance(recbalance);
+        rec.setRecbalancedet(recbalancedet);
+        rec.setRecbalancedetail(recbalancedetail);
+        return rec;
+    }
+
+    @Override
+    public List<Recbalance> selectRecbalanceList() {
+        return recbalanceMapper.selectList();
+    }
+}

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

@@ -30,8 +30,8 @@ import java.util.List;
 
 @Service
 public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationMapper,Verification> implements VerificationService {
-    @Autowired
-    private MaxnumberService maxnumberService;
+//    @Autowired
+//    private MaxnumberService maxnumberService;
     @Autowired
     private VerificationMapper verificationMapper;
     @Autowired
@@ -40,8 +40,8 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
     private VerificationdetailMapper verificationdetailMapper;
     @Autowired
     private VerificationListMapper verificationListMapper;
-    @Autowired
-    private MessageLogService messageLogService;
+//    @Autowired
+//    private MessageLogService messageLogService;
 
 
     @Override
@@ -125,7 +125,8 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         verification.setCreatorId(userId);
         verification.setCreateTime(new Date());
         //编号获取
-        code = pushMaxnubmer(code,id);
+//        code = pushMaxnubmer(code,id);
+        code = "1";
         verification.setVc_code(code);
         saveDTO.setCode(code);
         //判断更新与保存动作
@@ -208,7 +209,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             baseDTO.setCode(code);
             baseDTO.setName("Verification");
             //日志
-            messageLogService.delete(baseDTO);
+//            messageLogService.delete(baseDTO);
         }
     }
 
@@ -254,15 +255,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         baseDTO.setCode(code);
         baseDTO.setName("Verification");
         //日志
-        messageLogService.unAudit(baseDTO);
+//        messageLogService.unAudit(baseDTO);
     }
 
-    private String pushMaxnubmer(String code, Long id) {
-        if (null == code) {
-            throw new BizException(BizExceptionCode.NULL_CODE);
-        }
-        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
-                verificationMapper.validateCodeWhenUpdate(code, id);
-        return maxnumberService.pushMaxnubmer(count, code, "Verification");
-    }
+//    private String pushMaxnubmer(String code, Long id) {
+//        if (null == code) {
+//            throw new BizException(BizExceptionCode.NULL_CODE);
+//        }
+//        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
+//                verificationMapper.validateCodeWhenUpdate(code, id);
+//        return maxnumberService.pushMaxnubmer(count, code, "Verification");
+//    }
 }

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

@@ -21,8 +21,9 @@ spring:
   rabbitmq:
     host: 192.168.0.176
     port: 5672
-    password: guest
-    username: guest
+    virtual-host: dev
+    password: saas
+    username: select123***
   zipkin:
     sender:
       type: rabbit
@@ -43,7 +44,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@localhost:8500/eureka/
 server:
   port: 8920
   tomcat:

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

@@ -21,9 +21,9 @@
     <result column="pb_status" jdbcType="INTEGER" property="pb_status" />
     <result column="pb_statuscode" jdbcType="DECIMAL" property="pb_statuscode" />
     <result column="pb_remark" jdbcType="VARCHAR" property="pb_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
+    <result column="companyid" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-    <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
+    <result column="updatedate" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="pb_text1" jdbcType="VARCHAR" property="pb_text1" />
     <result column="pb_text2" jdbcType="VARCHAR" property="pb_text2" />
     <result column="pb_text3" jdbcType="VARCHAR" property="pb_text3" />
@@ -91,23 +91,15 @@
   <sql id="Base_Column_List">
     pb_id, pb_code, pb_kind, pb_date, pb_vendid, pb_vendcode, pb_vendname, pb_manname, 
     pb_pdamount, pb_pbdamount, pb_preamount, pb_discounts, pb_havebalance, pb_recorderid, 
-    pb_recorder, pb_recorddate, pb_status, pb_statuscode, pb_remark, companyid, updaterId, 
+    pb_recorder, pb_recorddate, pb_status, pb_statuscode, pb_remark, companyId, updaterId,
     updatedate, pb_text1, pb_text2, pb_text3, pb_text4, pb_text5
   </sql>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.PaybalanceExample" resultMap="BaseResultMap">
+  <select id="selectList" resultMap="BaseResultMap">
     select
-    <if test="distinct">
-      distinct
-    </if>
     <include refid="Base_Column_List" />
     from paybalance
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
   </select>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
@@ -125,24 +117,24 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalance">
-    insert into paybalance (pb_id, pb_code, pb_kind, 
+    insert into paybalance (pb_code, pb_kind,
       pb_date, pb_vendid, pb_vendcode, 
       pb_vendname, pb_manname, pb_pdamount, 
       pb_pbdamount, pb_preamount, pb_discounts, 
       pb_havebalance, pb_recorderid, pb_recorder, 
       pb_recorddate, pb_status, pb_statuscode, 
-      pb_remark, companyid, updaterId, 
+      pb_remark, companyId, updaterId,
       updatedate, pb_text1, pb_text2, 
       pb_text3, pb_text4, pb_text5
       )
-    values (#{pb_id,jdbcType=INTEGER}, #{pb_code,jdbcType=VARCHAR}, #{pb_kind,jdbcType=VARCHAR}, 
+    values (#{pb_code,jdbcType=VARCHAR}, #{pb_kind,jdbcType=VARCHAR},
       #{pb_date,jdbcType=TIMESTAMP}, #{pb_vendid,jdbcType=INTEGER}, #{pb_vendcode,jdbcType=VARCHAR}, 
       #{pb_vendname,jdbcType=VARCHAR}, #{pb_manname,jdbcType=VARCHAR}, #{pb_pdamount,jdbcType=DOUBLE}, 
       #{pb_pbdamount,jdbcType=DOUBLE}, #{pb_preamount,jdbcType=DOUBLE}, #{pb_discounts,jdbcType=DOUBLE}, 
       #{pb_havebalance,jdbcType=DOUBLE}, #{pb_recorderid,jdbcType=INTEGER}, #{pb_recorder,jdbcType=VARCHAR}, 
       #{pb_recorddate,jdbcType=TIMESTAMP}, #{pb_status,jdbcType=INTEGER}, #{pb_statuscode,jdbcType=DECIMAL}, 
-      #{pb_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
-      #{updatedate,jdbcType=TIMESTAMP}, #{pb_text1,jdbcType=VARCHAR}, #{pb_text2,jdbcType=VARCHAR}, 
+      #{pb_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
+      #{updateTime,jdbcType=TIMESTAMP}, #{pb_text1,jdbcType=VARCHAR}, #{pb_text2,jdbcType=VARCHAR},
       #{pb_text3,jdbcType=VARCHAR}, #{pb_text4,jdbcType=VARCHAR}, #{pb_text5,jdbcType=VARCHAR}
       )
   </insert>
@@ -500,14 +492,14 @@
       <if test="pb_remark != null">
         pb_remark = #{pb_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null">
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null">
+        updatedate = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pb_text1 != null">
         pb_text1 = #{pb_text1,jdbcType=VARCHAR},

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

@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.PaybalancedetMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Paybalancedet" >
+    <id column="pd_id" property="pdId" jdbcType="INTEGER" />
+    <result column="pd_rbid" property="pdRbid" jdbcType="INTEGER" />
+    <result column="pd_detno" property="pdDetno" jdbcType="INTEGER" />
+    <result column="pd_ym" property="pdYm" jdbcType="INTEGER" />
+    <result column="pd_bankid" property="pdBankid" jdbcType="INTEGER" />
+    <result column="pd_bankcode" property="pdBankcode" jdbcType="VARCHAR" />
+    <result column="pd_bankname" property="pdBankname" jdbcType="VARCHAR" />
+    <result column="pd_amount" property="pdAmount" jdbcType="DOUBLE" />
+    <result column="pd_paymethod" property="pdPaymethod" jdbcType="VARCHAR" />
+    <result column="pd_paycode" property="pdPaycode" jdbcType="VARCHAR" />
+    <result column="pd_remark" property="pdRemark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyid" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="pd_text1" property="pdText1" jdbcType="VARCHAR" />
+    <result column="pd_text2" property="pdText2" jdbcType="VARCHAR" />
+    <result column="pd_text3" property="pdText3" jdbcType="VARCHAR" />
+    <result column="pd_text4" property="pdText4" jdbcType="VARCHAR" />
+    <result column="pd_text5" property="pdText5" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    pd_id, pd_rbid, pd_detno, pd_ym, pd_bankid, pd_bankcode, pd_bankname, pd_amount, 
+    pd_paymethod, pd_paycode, pd_remark, companyId, updaterId, updatedate, pd_text1, 
+    pd_text2, pd_text3, pd_text4, pd_text5
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from paybalancedet
+    where pd_id = #{pdId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from paybalancedet
+    where pd_id = #{pdId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
+    insert into paybalancedet (pd_id, pd_rbid, pd_detno, 
+      pd_ym, pd_bankid, pd_bankcode, 
+      pd_bankname, pd_amount, pd_paymethod, 
+      pd_paycode, pd_remark, companyId, 
+      updaterId, updatedate, pd_text1, 
+      pd_text2, pd_text3, pd_text4, 
+      pd_text5)
+    values (#{pdId,jdbcType=INTEGER}, #{pdRbid,jdbcType=INTEGER}, #{pdDetno,jdbcType=INTEGER}, 
+      #{pdYm,jdbcType=INTEGER}, #{pdBankid,jdbcType=INTEGER}, #{pdBankcode,jdbcType=VARCHAR}, 
+      #{pdBankname,jdbcType=VARCHAR}, #{pdAmount,jdbcType=DOUBLE}, #{pdPaymethod,jdbcType=VARCHAR}, 
+      #{pdPaycode,jdbcType=VARCHAR}, #{pdRemark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{pdText1,jdbcType=VARCHAR}, 
+      #{pdText2,jdbcType=VARCHAR}, #{pdText3,jdbcType=VARCHAR}, #{pdText4,jdbcType=VARCHAR}, 
+      #{pdText5,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
+    insert into paybalancedet
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="pdId != null" >
+        pd_id,
+      </if>
+      <if test="pdRbid != null" >
+        pd_rbid,
+      </if>
+      <if test="pdDetno != null" >
+        pd_detno,
+      </if>
+      <if test="pdYm != null" >
+        pd_ym,
+      </if>
+      <if test="pdBankid != null" >
+        pd_bankid,
+      </if>
+      <if test="pdBankcode != null" >
+        pd_bankcode,
+      </if>
+      <if test="pdBankname != null" >
+        pd_bankname,
+      </if>
+      <if test="pdAmount != null" >
+        pd_amount,
+      </if>
+      <if test="pdPaymethod != null" >
+        pd_paymethod,
+      </if>
+      <if test="pdPaycode != null" >
+        pd_paycode,
+      </if>
+      <if test="pdRemark != null" >
+        pd_remark,
+      </if>
+      <if test="companyid != null" >
+        companyId,
+      </if>
+      <if test="updaterid != null" >
+        updaterId,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="pdText1 != null" >
+        pd_text1,
+      </if>
+      <if test="pdText2 != null" >
+        pd_text2,
+      </if>
+      <if test="pdText3 != null" >
+        pd_text3,
+      </if>
+      <if test="pdText4 != null" >
+        pd_text4,
+      </if>
+      <if test="pdText5 != null" >
+        pd_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="pdId != null" >
+        #{pdId,jdbcType=INTEGER},
+      </if>
+      <if test="pdRbid != null" >
+        #{pdRbid,jdbcType=INTEGER},
+      </if>
+      <if test="pdDetno != null" >
+        #{pdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="pdYm != null" >
+        #{pdYm,jdbcType=INTEGER},
+      </if>
+      <if test="pdBankid != null" >
+        #{pdBankid,jdbcType=INTEGER},
+      </if>
+      <if test="pdBankcode != null" >
+        #{pdBankcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pdBankname != null" >
+        #{pdBankname,jdbcType=VARCHAR},
+      </if>
+      <if test="pdAmount != null" >
+        #{pdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="pdPaymethod != null" >
+        #{pdPaymethod,jdbcType=VARCHAR},
+      </if>
+      <if test="pdPaycode != null" >
+        #{pdPaycode,jdbcType=VARCHAR},
+      </if>
+      <if test="pdRemark != null" >
+        #{pdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pdText1 != null" >
+        #{pdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText2 != null" >
+        #{pdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText3 != null" >
+        #{pdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText4 != null" >
+        #{pdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText5 != null" >
+        #{pdText5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
+    update paybalancedet
+    <set >
+      <if test="pdRbid != null" >
+        pd_rbid = #{pdRbid,jdbcType=INTEGER},
+      </if>
+      <if test="pdDetno != null" >
+        pd_detno = #{pdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="pdYm != null" >
+        pd_ym = #{pdYm,jdbcType=INTEGER},
+      </if>
+      <if test="pdBankid != null" >
+        pd_bankid = #{pdBankid,jdbcType=INTEGER},
+      </if>
+      <if test="pdBankcode != null" >
+        pd_bankcode = #{pdBankcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pdBankname != null" >
+        pd_bankname = #{pdBankname,jdbcType=VARCHAR},
+      </if>
+      <if test="pdAmount != null" >
+        pd_amount = #{pdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="pdPaymethod != null" >
+        pd_paymethod = #{pdPaymethod,jdbcType=VARCHAR},
+      </if>
+      <if test="pdPaycode != null" >
+        pd_paycode = #{pdPaycode,jdbcType=VARCHAR},
+      </if>
+      <if test="pdRemark != null" >
+        pd_remark = #{pdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        companyId = #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        updaterId = #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pdText1 != null" >
+        pd_text1 = #{pdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText2 != null" >
+        pd_text2 = #{pdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText3 != null" >
+        pd_text3 = #{pdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText4 != null" >
+        pd_text4 = #{pdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText5 != null" >
+        pd_text5 = #{pdText5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where pd_id = #{pdId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
+    update paybalancedet
+    set pd_rbid = #{pdRbid,jdbcType=INTEGER},
+      pd_detno = #{pdDetno,jdbcType=INTEGER},
+      pd_ym = #{pdYm,jdbcType=INTEGER},
+      pd_bankid = #{pdBankid,jdbcType=INTEGER},
+      pd_bankcode = #{pdBankcode,jdbcType=VARCHAR},
+      pd_bankname = #{pdBankname,jdbcType=VARCHAR},
+      pd_amount = #{pdAmount,jdbcType=DOUBLE},
+      pd_paymethod = #{pdPaymethod,jdbcType=VARCHAR},
+      pd_paycode = #{pdPaycode,jdbcType=VARCHAR},
+      pd_remark = #{pdRemark,jdbcType=VARCHAR},
+      companyId = #{companyid,jdbcType=INTEGER},
+      updaterId = #{updaterid,jdbcType=INTEGER},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      pd_text1 = #{pdText1,jdbcType=VARCHAR},
+      pd_text2 = #{pdText2,jdbcType=VARCHAR},
+      pd_text3 = #{pdText3,jdbcType=VARCHAR},
+      pd_text4 = #{pdText4,jdbcType=VARCHAR},
+      pd_text5 = #{pdText5,jdbcType=VARCHAR}
+    where pd_id = #{pdId,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.PaybalancedetailMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Paybalancedetail" >
+    <id column="pbd_id" property="pbdId" jdbcType="INTEGER" />
+    <result column="pbd_pbid" property="pbdPbid" jdbcType="INTEGER" />
+    <result column="pbd_detno" property="pbdDetno" jdbcType="INTEGER" />
+    <result column="pbd_ym" property="pbdYm" jdbcType="INTEGER" />
+    <result column="pbd_sild" property="pbdSild" jdbcType="INTEGER" />
+    <result column="pbd_slcode" property="pbdSlcode" jdbcType="VARCHAR" />
+    <result column="pbd_slkind" property="pbdSlkind" jdbcType="VARCHAR" />
+    <result column="pbd_sldate" property="pbdSldate" jdbcType="TIMESTAMP" />
+    <result column="pbd_amount" property="pbdAmount" jdbcType="DOUBLE" />
+    <result column="pbd_nowbalance" property="pbdNowbalance" jdbcType="DOUBLE" />
+    <result column="pbd_remark" property="pbdRemark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyid" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="pbd_text1" property="pbdText1" jdbcType="VARCHAR" />
+    <result column="pbd_text2" property="pbdText2" jdbcType="VARCHAR" />
+    <result column="pbd_text3" property="pbdText3" jdbcType="VARCHAR" />
+    <result column="pbd_text4" property="pbdText4" jdbcType="VARCHAR" />
+    <result column="pbd_text5" property="pbdText5" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    pbd_id, pbd_pbid, pbd_detno, pbd_ym, pbd_sild, pbd_slcode, pbd_slkind, pbd_sldate, 
+    pbd_amount, pbd_nowbalance, pbd_remark, companyId, updaterId, updatedate, pbd_text1, 
+    pbd_text2, pbd_text3, pbd_text4, pbd_text5
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from paybalancedetail
+    where pbd_id = #{pbdId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from paybalancedetail
+    where pbd_id = #{pbdId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
+    insert into paybalancedetail (pbd_id, pbd_pbid, pbd_detno, 
+      pbd_ym, pbd_sild, pbd_slcode, 
+      pbd_slkind, pbd_sldate, pbd_amount, 
+      pbd_nowbalance, pbd_remark, companyId, 
+      updaterId, updatedate, pbd_text1, 
+      pbd_text2, pbd_text3, pbd_text4, 
+      pbd_text5)
+    values (#{pbdId,jdbcType=INTEGER}, #{pbdPbid,jdbcType=INTEGER}, #{pbdDetno,jdbcType=INTEGER}, 
+      #{pbdYm,jdbcType=INTEGER}, #{pbdSild,jdbcType=INTEGER}, #{pbdSlcode,jdbcType=VARCHAR}, 
+      #{pbdSlkind,jdbcType=VARCHAR}, #{pbdSldate,jdbcType=TIMESTAMP}, #{pbdAmount,jdbcType=DOUBLE}, 
+      #{pbdNowbalance,jdbcType=DOUBLE}, #{pbdRemark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{pbdText1,jdbcType=VARCHAR}, 
+      #{pbdText2,jdbcType=VARCHAR}, #{pbdText3,jdbcType=VARCHAR}, #{pbdText4,jdbcType=VARCHAR}, 
+      #{pbdText5,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
+    insert into paybalancedetail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="pbdId != null" >
+        pbd_id,
+      </if>
+      <if test="pbdPbid != null" >
+        pbd_pbid,
+      </if>
+      <if test="pbdDetno != null" >
+        pbd_detno,
+      </if>
+      <if test="pbdYm != null" >
+        pbd_ym,
+      </if>
+      <if test="pbdSild != null" >
+        pbd_sild,
+      </if>
+      <if test="pbdSlcode != null" >
+        pbd_slcode,
+      </if>
+      <if test="pbdSlkind != null" >
+        pbd_slkind,
+      </if>
+      <if test="pbdSldate != null" >
+        pbd_sldate,
+      </if>
+      <if test="pbdAmount != null" >
+        pbd_amount,
+      </if>
+      <if test="pbdNowbalance != null" >
+        pbd_nowbalance,
+      </if>
+      <if test="pbdRemark != null" >
+        pbd_remark,
+      </if>
+      <if test="companyid != null" >
+        companyId,
+      </if>
+      <if test="updaterid != null" >
+        updaterId,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="pbdText1 != null" >
+        pbd_text1,
+      </if>
+      <if test="pbdText2 != null" >
+        pbd_text2,
+      </if>
+      <if test="pbdText3 != null" >
+        pbd_text3,
+      </if>
+      <if test="pbdText4 != null" >
+        pbd_text4,
+      </if>
+      <if test="pbdText5 != null" >
+        pbd_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="pbdId != null" >
+        #{pbdId,jdbcType=INTEGER},
+      </if>
+      <if test="pbdPbid != null" >
+        #{pbdPbid,jdbcType=INTEGER},
+      </if>
+      <if test="pbdDetno != null" >
+        #{pbdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="pbdYm != null" >
+        #{pbdYm,jdbcType=INTEGER},
+      </if>
+      <if test="pbdSild != null" >
+        #{pbdSild,jdbcType=INTEGER},
+      </if>
+      <if test="pbdSlcode != null" >
+        #{pbdSlcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdSlkind != null" >
+        #{pbdSlkind,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdSldate != null" >
+        #{pbdSldate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pbdAmount != null" >
+        #{pbdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="pbdNowbalance != null" >
+        #{pbdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="pbdRemark != null" >
+        #{pbdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pbdText1 != null" >
+        #{pbdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText2 != null" >
+        #{pbdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText3 != null" >
+        #{pbdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText4 != null" >
+        #{pbdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText5 != null" >
+        #{pbdText5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
+    update paybalancedetail
+    <set >
+      <if test="pbdPbid != null" >
+        pbd_pbid = #{pbdPbid,jdbcType=INTEGER},
+      </if>
+      <if test="pbdDetno != null" >
+        pbd_detno = #{pbdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="pbdYm != null" >
+        pbd_ym = #{pbdYm,jdbcType=INTEGER},
+      </if>
+      <if test="pbdSild != null" >
+        pbd_sild = #{pbdSild,jdbcType=INTEGER},
+      </if>
+      <if test="pbdSlcode != null" >
+        pbd_slcode = #{pbdSlcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdSlkind != null" >
+        pbd_slkind = #{pbdSlkind,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdSldate != null" >
+        pbd_sldate = #{pbdSldate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pbdAmount != null" >
+        pbd_amount = #{pbdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="pbdNowbalance != null" >
+        pbd_nowbalance = #{pbdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="pbdRemark != null" >
+        pbd_remark = #{pbdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        companyId = #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        updaterId = #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pbdText1 != null" >
+        pbd_text1 = #{pbdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText2 != null" >
+        pbd_text2 = #{pbdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText3 != null" >
+        pbd_text3 = #{pbdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText4 != null" >
+        pbd_text4 = #{pbdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText5 != null" >
+        pbd_text5 = #{pbdText5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where pbd_id = #{pbdId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
+    update paybalancedetail
+    set pbd_pbid = #{pbdPbid,jdbcType=INTEGER},
+      pbd_detno = #{pbdDetno,jdbcType=INTEGER},
+      pbd_ym = #{pbdYm,jdbcType=INTEGER},
+      pbd_sild = #{pbdSild,jdbcType=INTEGER},
+      pbd_slcode = #{pbdSlcode,jdbcType=VARCHAR},
+      pbd_slkind = #{pbdSlkind,jdbcType=VARCHAR},
+      pbd_sldate = #{pbdSldate,jdbcType=TIMESTAMP},
+      pbd_amount = #{pbdAmount,jdbcType=DOUBLE},
+      pbd_nowbalance = #{pbdNowbalance,jdbcType=DOUBLE},
+      pbd_remark = #{pbdRemark,jdbcType=VARCHAR},
+      companyId = #{companyid,jdbcType=INTEGER},
+      updaterId = #{updaterid,jdbcType=INTEGER},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      pbd_text1 = #{pbdText1,jdbcType=VARCHAR},
+      pbd_text2 = #{pbdText2,jdbcType=VARCHAR},
+      pbd_text3 = #{pbdText3,jdbcType=VARCHAR},
+      pbd_text4 = #{pbdText4,jdbcType=VARCHAR},
+      pbd_text5 = #{pbdText5,jdbcType=VARCHAR}
+    where pbd_id = #{pbdId,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -21,7 +21,7 @@
     <result column="rb_status" jdbcType="INTEGER" property="rb_status" />
     <result column="rb_statuscode" jdbcType="DECIMAL" property="rb_statuscode" />
     <result column="rb_remark" jdbcType="VARCHAR" property="rb_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
+    <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
     <result column="rb_text1" jdbcType="VARCHAR" property="rb_text1" />
@@ -91,7 +91,7 @@
   <sql id="Base_Column_List">
     rb_id, rb_code, rb_kind, rb_date, rb_custid, rb_custcode, rb_custname, rb_manname, 
     rb_rdamount, rb_rbdamount, rb_preamount, rb_discounts, rb_havebalance, rb_recorderid, 
-    rb_recorder, rb_recorddate, rb_status, rb_statuscode, rb_remark, companyid, updaterId, 
+    rb_recorder, rb_recorddate, rb_status, rb_statuscode, rb_remark, companyId, updaterId,
     updatedate, rb_text1, rb_text2, rb_text3, rb_text4, rb_text5
   </sql>
   <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.RecbalanceExample" resultMap="BaseResultMap">
@@ -114,6 +114,13 @@
     from recbalance
     where rb_id = #{rb_id,jdbcType=INTEGER}
   </select>
+
+  <select id="selectList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from recbalance
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from recbalance
     where rb_id = #{rb_id,jdbcType=INTEGER}
@@ -131,7 +138,7 @@
       rb_rbdamount, rb_preamount, rb_discounts, 
       rb_havebalance, rb_recorderid, rb_recorder, 
       rb_recorddate, rb_status, rb_statuscode, 
-      rb_remark, companyid, updaterId, 
+      rb_remark, companyId, updaterId,
       updatedate, rb_text1, rb_text2, 
       rb_text3, rb_text4, rb_text5
       )
@@ -141,7 +148,7 @@
       #{rb_rbdamount,jdbcType=DOUBLE}, #{rb_preamount,jdbcType=DOUBLE}, #{rb_discounts,jdbcType=DOUBLE}, 
       #{rb_havebalance,jdbcType=DOUBLE}, #{rb_recorderid,jdbcType=INTEGER}, #{rb_recorder,jdbcType=VARCHAR}, 
       #{rb_recorddate,jdbcType=TIMESTAMP}, #{rb_status,jdbcType=INTEGER}, #{rb_statuscode,jdbcType=DECIMAL}, 
-      #{rb_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
+      #{rb_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updatedate,jdbcType=TIMESTAMP}, #{rb_text1,jdbcType=VARCHAR}, #{rb_text2,jdbcType=VARCHAR}, 
       #{rb_text3,jdbcType=VARCHAR}, #{rb_text4,jdbcType=VARCHAR}, #{rb_text5,jdbcType=VARCHAR}
       )
@@ -206,8 +213,8 @@
       <if test="rb_remark != null">
         rb_remark,
       </if>
-      <if test="companyid != null">
-        companyid,
+      <if test="companyId != null">
+        companyId,
       </if>
       <if test="updaterId != null">
         updaterId,
@@ -289,8 +296,8 @@
       <if test="rb_remark != null">
         #{rb_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
@@ -381,8 +388,8 @@
       <if test="record.rb_remark != null">
         rb_remark = #{record.rb_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null">
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null">
         updaterId = #{record.updaterId,jdbcType=INTEGER},
@@ -431,7 +438,7 @@
       rb_status = #{record.rb_status,jdbcType=INTEGER},
       rb_statuscode = #{record.rb_statuscode,jdbcType=DECIMAL},
       rb_remark = #{record.rb_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
       updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
       rb_text1 = #{record.rb_text1,jdbcType=VARCHAR},
@@ -500,8 +507,8 @@
       <if test="rb_remark != null">
         rb_remark = #{rb_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -547,7 +554,7 @@
       rb_status = #{rb_status,jdbcType=INTEGER},
       rb_statuscode = #{rb_statuscode,jdbcType=DECIMAL},
       rb_remark = #{rb_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       rb_text1 = #{rb_text1,jdbcType=VARCHAR},

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

@@ -13,7 +13,7 @@
     <result column="rd_paymethod" jdbcType="VARCHAR" property="rd_paymethod" />
     <result column="rd_paycode" jdbcType="VARCHAR" property="rd_paycode" />
     <result column="rd_remark" jdbcType="VARCHAR" property="rd_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
+    <result column="companyid" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
     <result column="rd_text1" jdbcType="VARCHAR" property="rd_text1" />
@@ -82,7 +82,7 @@
   </sql>
   <sql id="Base_Column_List">
     rd_id, rd_rbid, rd_detno, rd_ym, rd_bankid, rd_bankcode, rd_bankname, rd_amount, 
-    rd_paymethod, rd_paycode, rd_remark, companyid, updaterId, updatedate, rd_text1, 
+    rd_paymethod, rd_paycode, rd_remark, companyId, updaterId, updatedate, rd_text1,
     rd_text2, rd_text3, rd_text4, rd_text5
   </sql>
   <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.RecbalancedetExample" resultMap="BaseResultMap">
@@ -119,14 +119,14 @@
     insert into recbalancedet (rd_id, rd_rbid, rd_detno, 
       rd_ym, rd_bankid, rd_bankcode, 
       rd_bankname, rd_amount, rd_paymethod, 
-      rd_paycode, rd_remark, companyid, 
+      rd_paycode, rd_remark, companyId,
       updaterId, updatedate, rd_text1, 
       rd_text2, rd_text3, rd_text4, 
       rd_text5)
     values (#{rd_id,jdbcType=INTEGER}, #{rd_rbid,jdbcType=INTEGER}, #{rd_detno,jdbcType=INTEGER}, 
       #{rd_ym,jdbcType=INTEGER}, #{rd_bankid,jdbcType=INTEGER}, #{rd_bankcode,jdbcType=VARCHAR}, 
       #{rd_bankname,jdbcType=VARCHAR}, #{rd_amount,jdbcType=DOUBLE}, #{rd_paymethod,jdbcType=VARCHAR}, 
-      #{rd_paycode,jdbcType=VARCHAR}, #{rd_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{rd_paycode,jdbcType=VARCHAR}, #{rd_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{rd_text1,jdbcType=VARCHAR}, 
       #{rd_text2,jdbcType=VARCHAR}, #{rd_text3,jdbcType=VARCHAR}, #{rd_text4,jdbcType=VARCHAR}, 
       #{rd_text5,jdbcType=VARCHAR})
@@ -167,8 +167,8 @@
       <if test="rd_remark != null">
         rd_remark,
       </if>
-      <if test="companyid != null">
-        companyid,
+      <if test="companyId != null">
+        companyId,
       </if>
       <if test="updaterId != null">
         updaterId,
@@ -226,8 +226,8 @@
       <if test="rd_remark != null">
         #{rd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
@@ -294,8 +294,8 @@
       <if test="record.rd_remark != null">
         rd_remark = #{record.rd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null">
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null">
         updaterId = #{record.updaterId,jdbcType=INTEGER},
@@ -336,7 +336,7 @@
       rd_paymethod = #{record.rd_paymethod,jdbcType=VARCHAR},
       rd_paycode = #{record.rd_paycode,jdbcType=VARCHAR},
       rd_remark = #{record.rd_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
       updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
       rd_text1 = #{record.rd_text1,jdbcType=VARCHAR},
@@ -381,8 +381,8 @@
       <if test="rd_remark != null">
         rd_remark = #{rd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -420,7 +420,7 @@
       rd_paymethod = #{rd_paymethod,jdbcType=VARCHAR},
       rd_paycode = #{rd_paycode,jdbcType=VARCHAR},
       rd_remark = #{rd_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       rd_text1 = #{rd_text1,jdbcType=VARCHAR},

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

@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.RecbalancedetailMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Recbalancedetail" >
+    <id column="rbd_id" property="rbdId" jdbcType="INTEGER" />
+    <result column="rbd_rbid" property="rbdRbid" jdbcType="INTEGER" />
+    <result column="rbd_detno" property="rbdDetno" jdbcType="INTEGER" />
+    <result column="rbd_ym" property="rbdYm" jdbcType="INTEGER" />
+    <result column="rbd_slid" property="rbdSlid" jdbcType="INTEGER" />
+    <result column="rbd_slcode" property="rbdSlcode" jdbcType="VARCHAR" />
+    <result column="rbd_slkind" property="rbdSlkind" jdbcType="VARCHAR" />
+    <result column="rbd_sldate" property="rbdSldate" jdbcType="TIMESTAMP" />
+    <result column="rbd_amount" property="rbdAmount" jdbcType="DOUBLE" />
+    <result column="rbd_nowbalance" property="rbdNowbalance" jdbcType="DOUBLE" />
+    <result column="rbd_remark" property="rbdRemark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="rbd_text1" property="rbdText1" jdbcType="VARCHAR" />
+    <result column="rbd_text2" property="rbdText2" jdbcType="VARCHAR" />
+    <result column="rbd_text3" property="rbdText3" jdbcType="VARCHAR" />
+    <result column="rbd_text4" property="rbdText4" jdbcType="VARCHAR" />
+    <result column="rbd_text5" property="rbdText5" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    rbd_id, rbd_rbid, rbd_detno, rbd_ym, rbd_slid, rbd_slcode, rbd_slkind, rbd_sldate, 
+    rbd_amount, rbd_nowbalance, rbd_remark, companyId, updaterId, updatedate, rbd_text1,
+    rbd_text2, rbd_text3, rbd_text4, rbd_text5
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from recbalancedetail
+    where rbd_id = #{rbdId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from recbalancedetail
+    where rbd_id = #{rbdId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Recbalancedetail" >
+    insert into recbalancedetail (rbd_id, rbd_rbid, rbd_detno, 
+      rbd_ym, rbd_slid, rbd_slcode, 
+      rbd_slkind, rbd_sldate, rbd_amount, 
+      rbd_nowbalance, rbd_remark, companyId,
+      updaterId, updatedate, rbd_text1, 
+      rbd_text2, rbd_text3, rbd_text4, 
+      rbd_text5)
+    values (#{rbdId,jdbcType=INTEGER}, #{rbdRbid,jdbcType=INTEGER}, #{rbdDetno,jdbcType=INTEGER}, 
+      #{rbdYm,jdbcType=INTEGER}, #{rbdSlid,jdbcType=INTEGER}, #{rbdSlcode,jdbcType=VARCHAR}, 
+      #{rbdSlkind,jdbcType=VARCHAR}, #{rbdSldate,jdbcType=TIMESTAMP}, #{rbdAmount,jdbcType=DOUBLE}, 
+      #{rbdNowbalance,jdbcType=DOUBLE}, #{rbdRemark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
+      #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{rbdText1,jdbcType=VARCHAR}, 
+      #{rbdText2,jdbcType=VARCHAR}, #{rbdText3,jdbcType=VARCHAR}, #{rbdText4,jdbcType=VARCHAR}, 
+      #{rbdText5,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Recbalancedetail" >
+    insert into recbalancedetail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="rbdId != null" >
+        rbd_id,
+      </if>
+      <if test="rbdRbid != null" >
+        rbd_rbid,
+      </if>
+      <if test="rbdDetno != null" >
+        rbd_detno,
+      </if>
+      <if test="rbdYm != null" >
+        rbd_ym,
+      </if>
+      <if test="rbdSlid != null" >
+        rbd_slid,
+      </if>
+      <if test="rbdSlcode != null" >
+        rbd_slcode,
+      </if>
+      <if test="rbdSlkind != null" >
+        rbd_slkind,
+      </if>
+      <if test="rbdSldate != null" >
+        rbd_sldate,
+      </if>
+      <if test="rbdAmount != null" >
+        rbd_amount,
+      </if>
+      <if test="rbdNowbalance != null" >
+        rbd_nowbalance,
+      </if>
+      <if test="rbdRemark != null" >
+        rbd_remark,
+      </if>
+      <if test="companyId != null" >
+        companyId,
+      </if>
+      <if test="updaterid != null" >
+        updaterId,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="rbdText1 != null" >
+        rbd_text1,
+      </if>
+      <if test="rbdText2 != null" >
+        rbd_text2,
+      </if>
+      <if test="rbdText3 != null" >
+        rbd_text3,
+      </if>
+      <if test="rbdText4 != null" >
+        rbd_text4,
+      </if>
+      <if test="rbdText5 != null" >
+        rbd_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="rbdId != null" >
+        #{rbdId,jdbcType=INTEGER},
+      </if>
+      <if test="rbdRbid != null" >
+        #{rbdRbid,jdbcType=INTEGER},
+      </if>
+      <if test="rbdDetno != null" >
+        #{rbdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="rbdYm != null" >
+        #{rbdYm,jdbcType=INTEGER},
+      </if>
+      <if test="rbdSlid != null" >
+        #{rbdSlid,jdbcType=INTEGER},
+      </if>
+      <if test="rbdSlcode != null" >
+        #{rbdSlcode,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdSlkind != null" >
+        #{rbdSlkind,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdSldate != null" >
+        #{rbdSldate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rbdAmount != null" >
+        #{rbdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="rbdNowbalance != null" >
+        #{rbdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="rbdRemark != null" >
+        #{rbdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rbdText1 != null" >
+        #{rbdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText2 != null" >
+        #{rbdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText3 != null" >
+        #{rbdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText4 != null" >
+        #{rbdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText5 != null" >
+        #{rbdText5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Recbalancedetail" >
+    update recbalancedetail
+    <set >
+      <if test="rbdRbid != null" >
+        rbd_rbid = #{rbdRbid,jdbcType=INTEGER},
+      </if>
+      <if test="rbdDetno != null" >
+        rbd_detno = #{rbdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="rbdYm != null" >
+        rbd_ym = #{rbdYm,jdbcType=INTEGER},
+      </if>
+      <if test="rbdSlid != null" >
+        rbd_slid = #{rbdSlid,jdbcType=INTEGER},
+      </if>
+      <if test="rbdSlcode != null" >
+        rbd_slcode = #{rbdSlcode,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdSlkind != null" >
+        rbd_slkind = #{rbdSlkind,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdSldate != null" >
+        rbd_sldate = #{rbdSldate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rbdAmount != null" >
+        rbd_amount = #{rbdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="rbdNowbalance != null" >
+        rbd_nowbalance = #{rbdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="rbdRemark != null" >
+        rbd_remark = #{rbdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        updaterId = #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rbdText1 != null" >
+        rbd_text1 = #{rbdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText2 != null" >
+        rbd_text2 = #{rbdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText3 != null" >
+        rbd_text3 = #{rbdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText4 != null" >
+        rbd_text4 = #{rbdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText5 != null" >
+        rbd_text5 = #{rbdText5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where rbd_id = #{rbdId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Recbalancedetail" >
+    update recbalancedetail
+    set rbd_rbid = #{rbdRbid,jdbcType=INTEGER},
+      rbd_detno = #{rbdDetno,jdbcType=INTEGER},
+      rbd_ym = #{rbdYm,jdbcType=INTEGER},
+      rbd_slid = #{rbdSlid,jdbcType=INTEGER},
+      rbd_slcode = #{rbdSlcode,jdbcType=VARCHAR},
+      rbd_slkind = #{rbdSlkind,jdbcType=VARCHAR},
+      rbd_sldate = #{rbdSldate,jdbcType=TIMESTAMP},
+      rbd_amount = #{rbdAmount,jdbcType=DOUBLE},
+      rbd_nowbalance = #{rbdNowbalance,jdbcType=DOUBLE},
+      rbd_remark = #{rbdRemark,jdbcType=VARCHAR},
+      companyId = #{companyId,jdbcType=INTEGER},
+      updaterId = #{updaterid,jdbcType=INTEGER},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      rbd_text1 = #{rbdText1,jdbcType=VARCHAR},
+      rbd_text2 = #{rbdText2,jdbcType=VARCHAR},
+      rbd_text3 = #{rbdText3,jdbcType=VARCHAR},
+      rbd_text4 = #{rbdText4,jdbcType=VARCHAR},
+      rbd_text5 = #{rbdText5,jdbcType=VARCHAR}
+    where rbd_id = #{rbdId,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -1,9 +1,43 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.money.mapper.VerificationListMapper" >
+    <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Verification" >
+        <id column="vc_id" property="vc_id" jdbcType="INTEGER" />
+        <result column="vc_code" property="vc_code" jdbcType="VARCHAR" />
+        <result column="vc_kind" property="vc_kind" jdbcType="VARCHAR" />
+        <result column="vc_date" property="vc_date" jdbcType="TIMESTAMP" />
+        <result column="vc_vendid" property="vc_vendid" jdbcType="INTEGER" />
+        <result column="vc_vendcode" property="vc_vendcode" jdbcType="VARCHAR" />
+        <result column="vc_vendname" property="vc_vendname" jdbcType="VARCHAR" />
+        <result column="vc_custid" property="vc_custid" jdbcType="INTEGER" />
+        <result column="vc_custcode" property="vc_custcode" jdbcType="VARCHAR" />
+        <result column="vc_custname" property="vc_custname" jdbcType="VARCHAR" />
+        <result column="vc_turnvendid" property="vc_turnvendid" jdbcType="INTEGER" />
+        <result column="vc_turnvendcode" property="vc_turnvendcode" jdbcType="VARCHAR" />
+        <result column="vc_turnvendname" property="vc_turnvendname" jdbcType="VARCHAR" />
+        <result column="vc_turncustid" property="vc_turncustid" jdbcType="INTEGER" />
+        <result column="vc_turncustcode" property="vc_turncustcode" jdbcType="VARCHAR" />
+        <result column="vc_turncustname" property="vc_turncustname" jdbcType="VARCHAR" />
+        <result column="vc_amount1" property="vc_amount1" jdbcType="DOUBLE" />
+        <result column="vc_amount2" property="vc_amount2" jdbcType="DOUBLE" />
+        <result column="vc_recorderid" property="vc_recorderid" jdbcType="INTEGER" />
+        <result column="vc_recorder" property="vc_recorder" jdbcType="VARCHAR" />
+        <result column="vc_recorddate" property="vc_recorddate" jdbcType="TIMESTAMP" />
+        <result column="vc_status" property="vc_status" jdbcType="INTEGER" />
+        <result column="vc_statuscode" property="vc_statuscode" jdbcType="DECIMAL" />
+        <result column="vc_remark" property="vc_remark" jdbcType="VARCHAR" />
+        <result column="companyid" property="companyid" jdbcType="INTEGER" />
+        <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+        <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+        <result column="vc_text1" property="vc_text1" jdbcType="VARCHAR" />
+        <result column="vc_text2" property="vc_text2" jdbcType="VARCHAR" />
+        <result column="vc_text3" property="vc_text3" jdbcType="VARCHAR" />
+        <result column="vc_text4" property="vc_text4" jdbcType="VARCHAR" />
+        <result column="vc_text5" property="vc_text5" jdbcType="VARCHAR" />
+    </resultMap>
     <select id="selectPurchaseListByCondition" parameterType="com.usoftchina.saas.money.dto.VerificationReqDTO" resultMap="BaseResultMap">
         select  *  from verification left join verificationdet on vc_id=vd_vcid left join verificationdetail on vc_id=vcd_vcid
         <where>
             order by pu_id,pd_detno
         </where>
     </select>
-</mapper
+</mapper>

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

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
  * @author yingp
  * @date 2018/10/9
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/purchase")
 public class PurchaseController {

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdIODetail.java

@@ -26,9 +26,9 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private String pd_unit;
 
-    private Integer pd_inqty;
+    private Double pd_inqty;
 
-    private Integer pd_outqty;
+    private Double pd_outqty;
 
     private Double pd_orderprice;
 

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

@@ -331,7 +331,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  targetPid.setPd_outqty(sourcePid.getPd_inqty()-sourcePid.getPd_yqty());
                  prodIODetailMapper.insertSelective(targetPid);
                  //更新已转数
-                 sourcePid.setPd_yqty(sourcePid.getPd_inqty());
+               //  sourcePid.setPd_yqty(sourcePid.getPd_inqty());
                  prodIODetailMapper.updateByPrimaryKeySelective(sourcePid);
              }
          }
@@ -344,7 +344,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }
         Integer count = "0".equals(String.valueOf(id)) ? purchaseMapper.validateCodeWhenInsert(code) :
                 purchaseMapper.validateCodeWhenUpdate(code, id);
-        return maxnumberService.pushMaxnubmer(count, code, "Purchase");
+        return maxnumberService.pushMaxnubmer(count, code, "Purchase").getData();
     }
 
 

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

@@ -282,23 +282,23 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 //入库数大于等于采购数
                 if(purchaseDetail.getPd_acceptqty() >= purchaseDetail.getPd_qty()){
                     turnCount++;
+                }else if(purchaseDetail.getPd_acceptqty() > 0 && purchaseDetail.getPd_acceptqty() < purchaseDetail.getPd_qty()){
                     //     0 < 入库数 < 采购数
                     partTurnCount++;
-                }else if(purchaseDetail.getPd_acceptqty() > 0 && purchaseDetail.getPd_acceptqty() < purchaseDetail.getPd_qty()){
                 }
             }
             //构造更新对象
             purchase = new Purchase();
             purchase.setId(id);
-            purchase.setPu_acceptstatuscode("UNTURNIN");
-            purchase.setPu_acceptstatus("未入库");
+            purchase.setPu_acceptstatuscode(Status.UNTURNIN.name());
+            purchase.setPu_acceptstatus(Status.UNTURNIN.getDisplay());
             if(partTurnCount > 0){
-                purchase.setPu_acceptstatuscode("PART2IN");
-                purchase.setPu_acceptstatus("部分入库");
+                purchase.setPu_acceptstatuscode(Status.PART2IN.name());
+                purchase.setPu_acceptstatus(Status.PART2IN.getDisplay());
             }
             if(turnCount == purchaseDetailList.size()){
-                purchase.setPu_acceptstatus("已入库");
-                purchase.setPu_acceptstatuscode("TURNIN");
+                purchase.setPu_acceptstatus(Status.TURNIN.getDisplay());
+                purchase.setPu_acceptstatuscode(Status.TURNIN.name());
             }
             purchaseMapper.updateByPrimaryKeySelective(purchase);
             DocBaseDTO docBaseDTO = getBaseDTOById(id);
@@ -378,7 +378,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 //公司id
                 prodIODetail.setCompanyId(purchaseDetail.getCompanyId());
                 //本次转单数
-                prodIODetail.setPd_inqty((int) (purchaseDetail.getPd_qty()-purchaseDetail.getPd_yqty()));
+                prodIODetail.setPd_inqty((purchaseDetail.getPd_qty()-purchaseDetail.getPd_yqty()));
                 prodIODetailMapper.insertSelective(prodIODetail);
                 //更新已转数
                 purchaseDetail.setPd_yqty(purchaseDetail.getPd_qty());

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

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

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

@@ -57,6 +57,7 @@
 
     <select id="selectPurchaseListByCondition"  resultMap="BaseResultMap">
         select  *  from purchase left join purchasedetail on pu_id=pd_puid
+        left join product on pd_prodcode=pr_code
         <where>
             <if test="con != null">
                  ${con}

applications/sale/sale-dto/pom.xml

@@ -10,6 +10,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sale-dto</artifactId>
-
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -157,7 +157,7 @@ public class SaleController {
         return Result.success();
     }
 
-    @PostMapping("/turnOut/{id}")
+    @PostMapping("/turnProdOut/{id}")
     public Result turnOut(@PathVariable("id") Long id) {
         saleService.turnOut(id);
         return Result.success();

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

@@ -0,0 +1,32 @@
+package com.usoftchina.saas.sale.mapper;
+
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.storage.entities.ProdIODetail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ProdIODetailMapper  {
+
+    int deleteByPrimaryKey(Long pd_id);
+
+    int insert(ProdIODetail record);
+
+    int insertSelective(ProdIODetail record);
+
+    ProdIODetail selectByPrimaryKey(Integer pd_id);
+
+    int updateByPrimaryKeySelective(ProdIODetail record);
+
+    int updateByPrimaryKeyWithBLOBs(ProdIODetail record);
+
+    int updateByPrimaryKey(ProdIODetail record);
+
+    void batchInsert(List<ProdIODetail> list);
+
+    void batchUpdate(List<ProdIODetail> list);
+
+    void updatePurchaseYqty(Integer id);
+
+    List<ProdIODetail> selectByFK(Long id);
+}

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

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.sale.mapper;
+
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.storage.entities.ProdInOut;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ProdInOutMapper {
+
+    int deleteByPrimaryKey(Long pi_id);
+
+    int insert(ProdInOut record);
+
+    int insertSelective(ProdInOut record);
+
+    ProdInOut selectByPrimaryKey(Long pi_id);
+
+    int updateByPrimaryKeySelective(ProdInOut record);
+
+    int updateByPrimaryKeyWithBLOBs(ProdInOut record);
+
+    int updateByPrimaryKey(ProdInOut record);
+}

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

@@ -16,25 +16,6 @@ public interface SaledetailMapper {
     void deleteByForeignKey(Long id);
 
     Integer deleteByPrimaryKey(Long id);
-   /* int countByExample(SaledetailExample example);
 
-    int deleteByExample(SaledetailExample example);
-
-    int deleteByPrimaryKey(Integer sd_id);
-
-    int insert(Saledetail record);
-
-    int insertSelective(Saledetail record);
-
-    List<Saledetail> selectByExample(SaledetailExample example);
-
-    Saledetail selectByPrimaryKey(Integer sd_id);
-
-    int updateByExampleSelective(@Param("record") Saledetail record, @Param("example") SaledetailExample example);
-
-    int updateByExample(@Param("record") Saledetail record, @Param("example") SaledetailExample example);
-
-    int updateByPrimaryKeySelective(Saledetail record);
-
-    int updateByPrimaryKey(Saledetail record);*/
+    void updateByPrimaryKeySelective(SaleDetail saleDetail);
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleDetail.java

@@ -17,7 +17,7 @@ public class SaleDetail extends CommonBaseEntity{
 
     private String sd_code;
 
-    private Integer sd_prodid;
+    private Long sd_prodid;
 
     private String sd_prodcode;
 
@@ -39,6 +39,8 @@ public class SaleDetail extends CommonBaseEntity{
 
     private Double sd_pdqty;
 
+    private Double sd_yqty;
+
     private String sd_remark;
 
     private String sd_text1;

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

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.sale.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.netflix.discovery.converters.Auto;
@@ -18,13 +19,13 @@ import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.sale.dto.SaleDTO;
 import com.usoftchina.saas.sale.dto.SaleDetailDTO;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
-import com.usoftchina.saas.sale.mapper.SaleListMapper;
-import com.usoftchina.saas.sale.mapper.SaleMapper;
-import com.usoftchina.saas.sale.mapper.SaledetailMapper;
+import com.usoftchina.saas.sale.mapper.*;
 import com.usoftchina.saas.sale.po.Sale;
 import com.usoftchina.saas.sale.po.SaleDetail;
 import com.usoftchina.saas.sale.po.SaleList;
 import com.usoftchina.saas.sale.service.SaleService;
+import com.usoftchina.saas.storage.entities.ProdIODetail;
+import com.usoftchina.saas.storage.entities.ProdInOut;
 import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +53,10 @@ public class SaleServiceImpl implements SaleService{
     private MessageLogService messageLogService;
     @Autowired
     private MaxnumberService maxnumberService;
+    @Autowired
+    private ProdInOutMapper prodInOutMapper;
+    @Autowired
+    private ProdIODetailMapper prodIODetailMapper;
 
     @Override
     public PageInfo<SaleList> getListData(PageRequest page, ListReqDTO req) {
@@ -285,7 +290,7 @@ public class SaleServiceImpl implements SaleService{
         }
         Integer count = "0".equals(String.valueOf(id)) ? saleMapper.validateCodeWhenInsert(code) :
                 saleMapper.validateCodeWhenUpdate(code, id);
-        return maxnumberService.pushMaxnubmer(count, code, "Purchase");
+        return maxnumberService.pushMaxnubmer(count, code, "Purchase").getData();
     }
 
     /**
@@ -338,126 +343,125 @@ public class SaleServiceImpl implements SaleService{
     @Override
     public void open(long id) {
         List<SaleDetail> saleDetailList = saledetailMapper.selectByFK(id);
-       /* //部分入库、全部入库
+        //部分入库、全部入库
         int partTurnCount = 0,turnCount = 0;
         if(saleDetailList != null && saleDetailList.size() > 0){
             for(SaleDetail saleDetail : saleDetailList){
-                //入库数大于等于采购数
-                if(purchaseDetail.getPd_acceptqty() >= purchaseDetail.getPd_qty()){
+                //
+                if(saleDetail.getSd_yqty() >= saleDetail.getSd_qty()){
                     turnCount++;
+
+                }else if(saleDetail.getSd_yqty() > 0 && saleDetail.getSd_yqty() < saleDetail.getSd_qty()){
                     //     0 < 入库数 < 采购数
                     partTurnCount++;
-                }else if(purchaseDetail.getPd_acceptqty() > 0 && purchaseDetail.getPd_acceptqty() < purchaseDetail.getPd_qty()){
                 }
             }
             //构造更新对象
-            Purchase purchase = new Purchase();
-            purchase.setId(id);
-            purchase.setPu_acceptstatuscode("UNTURNIN");
-            purchase.setPu_acceptstatus("未入库");
+            Sale sale = new Sale();
+            sale.setId(id);
+            sale.setSa_sendstatus(Status.UNTURNOUT.getDisplay());
+            sale.setSa_sendstatuscode(Status.UNTURNOUT.name());
             if(partTurnCount > 0){
-                purchase.setPu_acceptstatuscode("PART2IN");
-                purchase.setPu_acceptstatus("部分入库");
+                sale.setSa_sendstatus(Status.PARTOUT.getDisplay());
+                sale.setSa_sendstatuscode(Status.PARTOUT.name());
             }
-            if(turnCount == purchaseDetailList.size()){
-                purchase.setPu_acceptstatus("已入库");
-                purchase.setPu_acceptstatuscode("TURNIN");
+            if(turnCount == saleDetailList.size()){
+                sale.setSa_sendstatus(Status.TURNOUT.getDisplay());
+                sale.setSa_sendstatuscode(Status.TURNOUT.name());
             }
-            purchaseMapper.updateByPrimaryKeySelective(purchase);
+            saleMapper.updateByPrimaryKeySelective(sale);
             DocBaseDTO docBaseDTO = getBaseDTOById(id);
             //日志
             messageLogService.open(docBaseDTO);
-        }*/
+        }
     }
 
     @Override
     public void turnOut(Long id) {
-
-    }/*{
         if (null == id) {
             return;
         }
+        Integer count = 0;
+        double pdQty = 0;
+        double pdYqty = 0;
         Sale sale = saleMapper.selectByPrimaryKey(id);
-        Integer count=0;
-        double pdQty=0, pdYqty=0;
+        List<SaleDetail> details = saledetailMapper.selectByFK(id);
         //检查转单状态
-       // String acceptstatus = sale.getPu_acceptstatuscode();
-
-        if ("TURNIN".equals(acceptstatus)){
-            return Result.error(ExceptionCode.TURNIN_EXIST);
+        String statuscode = sale.getSa_sendstatuscode();
+        if (Status.TURNOUT.name().equals(statuscode)){
+            throw new BizException(BizExceptionCode.SALE_ALL_TURNOUT);
         }
-        if ("CLOSED".equals(acceptstatus)){
-            return Result.error(ExceptionCode.CLOSED_EXIST);
+        if (Status.CLOSE.name().equals(statuscode)){
+            throw new BizException(BizExceptionCode.SALE_CLOSE);
         }
 
-        List<PurchaseDetail> purchaseDetails = purchasedetailMapper.selectByFK(id);
-
         //检查从表
-        for (PurchaseDetail purchaseDetail : purchaseDetails) {
-            pdQty = purchaseDetail.getPd_qty();
-            pdYqty = purchaseDetail.getPd_yqty();
-            if (pdQty-pdYqty>0){
+        for (SaleDetail detail : details) {
+            pdQty = detail.getSd_qty();
+            pdYqty = detail.getSd_yqty();
+            if (pdQty - pdYqty > 0){
                 count++;
             }
         }
         //判断可转数
         if (count==0){
-            return Result.error(ExceptionCode.TURNINNUM_NOT_EXIST);
+            throw new BizException(BizExceptionCode.SALE_YQTYBEYONDQTY);
         }
+
         //插入验收单主表
         ProdInOut prodInOut = new ProdInOut();
         //生成单号
-        String piInoutno ="YS0001";
+        Object data = maxnumberService.getMaxnumber("Sale", true).getData();
+        JSONObject parse = (JSONObject)JSONObject.parse(data.toString());
+        String pi_inoutno = String.valueOf(parse.get("code"));
 
-        prodInOut.setPi_inoutno(piInoutno);
-        prodInOut.setPi_class("采购验收单");
+        prodInOut.setPi_inoutno(pi_inoutno);
+        prodInOut.setPi_class("出货单");
         prodInOut.setPi_date(new Date());
-        prodInOut.setPi_status("未审核");
-        prodInOut.setPi_statuscode("UNAUDITED");
+        prodInOut.setPi_status(Status.UNAUDITED.getDisplay());
+        prodInOut.setPi_statuscode(Status.UNAUDITED.name());
         prodInOut.setPi_recorddate(new Date());
-        prodInOut.setPi_vendid(purchase.getPu_vendid());
-        prodInOut.setPi_vendcode(purchase.getPu_vendcode());
-        prodInOut.setPi_vendname(purchase.getPu_vendname());
-        prodInOut.setPi_puid(purchase.getId().intValue());
-        prodInOut.setPi_pucode(purchase.getPu_code());
+        prodInOut.setPi_custid(sale.getSa_custid());
+        prodInOut.setPi_custcode(sale.getSa_custcode());
+        prodInOut.setPi_custname(sale.getSa_custname());
+        prodInOut.setPi_said(sale.getId());
+        prodInOut.setPi_sacode(sale.getSa_code());
         //设置公司id
-        prodInOut.setCompanyId(purchase.getCompanyId());
+        prodInOut.setCompanyId(sale.getCompanyId());
 
         prodInOutMapper.insertSelective(prodInOut);
-
-        //插入验收单从表
+        //插入出货单从表
         long pi_id = prodInOut.getId();
 
-        for (int i=0;i<purchaseDetails.size();i++){
-            PurchaseDetail purchaseDetail =purchaseDetails.get(i);
+        for (int i=0;i<details.size();i++){
+            SaleDetail saleDetail =details.get(i);
             ProdIODetail prodIODetail = new ProdIODetail();
-            if ((int) (purchaseDetail.getPd_qty()-purchaseDetail.getPd_yqty())>0){
-                prodIODetail.setPd_piid(pi_id);
-                prodIODetail.setPd_inoutno(piInoutno);
-                prodIODetail.setPd_piclass("采购验收单");
-                prodIODetail.setPd_pdno(i);
-                prodIODetail.setPd_orderid(purchaseDetail.getId().intValue());
-                prodIODetail.setPd_ordercode(purchase.getPu_code());
-                prodIODetail.setPd_orderdetno(purchaseDetail.getPd_detno());
-                prodIODetail.setPd_orderprice(purchaseDetail.getPd_price());
-                prodIODetail.setPd_prodid(purchaseDetail.getPd_prodid());
-                prodIODetail.setPd_prodcode(purchaseDetail.getPd_prodcode());
-                //公司id
-                prodIODetail.setCompanyId(purchaseDetail.getCompanyId());
-                //本次转单数
-                prodIODetail.setPd_inqty((int) (purchaseDetail.getPd_qty()-purchaseDetail.getPd_yqty()));
-                prodIODetailMapper.insertSelective(prodIODetail);
-                //更新已转数
-                purchaseDetail.setPd_yqty(purchaseDetail.getPd_qty());
-                purchasedetailMapper.updateByPrimaryKeySelective(purchaseDetail);
-            }
+            prodIODetail.setPd_piid(pi_id);
+            prodIODetail.setPd_inoutno(pi_inoutno);
+            prodIODetail.setPd_piclass("出货单");
+            prodIODetail.setPd_pdno(i);
+            prodIODetail.setPd_orderid(sale.getId());
+            prodIODetail.setPd_ordercode(sale.getSa_code());
+            prodIODetail.setPd_orderdetno(saleDetail.getSd_detno());
+            prodIODetail.setPd_orderprice(saleDetail.getSd_price());
+            prodIODetail.setPd_prodid(saleDetail.getSd_prodid());
+            prodIODetail.setPd_prodcode(saleDetail.getSd_prodcode());
+            //公司id
+            prodIODetail.setCompanyId(saleDetail.getCompanyId());
+            //本次转单数
+            prodIODetail.setPd_inqty((saleDetail.getSd_qty()-saleDetail.getSd_yqty()));
+            prodIODetailMapper.insertSelective(prodIODetail);
+            //更新已转数
+            saleDetail.setSd_yqty(saleDetail.getSd_qty());
+            saledetailMapper.updateByPrimaryKeySelective(saleDetail);
+
         }
         //更新主表入库状态
-        purchase.setPu_acceptstatus("已入库");
-        purchase.setPu_acceptstatuscode("TURNIN");
+        sale.setSa_sendstatus(Status.TURNOUT.getDisplay());
+        sale.setSa_sendstatuscode(Status.TURNOUT.name());
         //更新存在字段
-        int affect = getMapper().updateByPrimaryKeySelective(purchase);
-    }*/
+         saleMapper.updateByPrimaryKeySelective(sale);
+    }
 
     private void singleUnAudit(Long id) {
         Sale sale = new Sale();

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

@@ -26,9 +26,9 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private String pd_unit;
 
-    private Integer pd_inqty;
+    private Double pd_inqty;
 
-    private Integer pd_outqty;
+    private Double pd_outqty;
 
     private Double pd_orderprice;
 
@@ -56,7 +56,7 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private String pd_inwhname;
 
-    private Integer pd_orderid;
+    private Long pd_orderid;
 
     private Integer pd_sdid;
 

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

@@ -31,7 +31,7 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 

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

@@ -1,12 +1,16 @@
 package com.usoftchina.saas.storage.controller;
 
-import com.netflix.discovery.converters.Auto;
+import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
-import com.usoftchina.saas.storage.entities.ProdInOut;
+import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.storage.dto.ProdInOutFormDTO;
+import com.usoftchina.saas.storage.dto.ProdInOutReqDTO;
+import com.usoftchina.saas.storage.entities.ProdInOutList;
 import com.usoftchina.saas.storage.service.ProdInOutService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -17,12 +21,133 @@ public class ProdInOutController {
     @Autowired
     public ProdInOutService prodInOutService;
 
-    @RequestMapping("/getAll")
-    public Result<ProdInOut> getAll(){
-        List<ProdInOut> prodInOutList = prodInOutService.findAll();
-        return Result.success(prodInOutList);
+    /**
+     * 出入库订单列表
+     *
+     * @param page
+     * @param req
+     * @return
+     */
+    @GetMapping("/list")
+    public Result<PageInfo<ProdInOutList>> getListData(PageRequest page, ProdInOutReqDTO req) {
+        PageInfo<ProdInOutList> listData = prodInOutService.getListData(page,req);
+        return Result.success(listData);
     }
 
+    /**
+     * 获取出入库单表单
+     *
+     * @return
+     */
+    @GetMapping("/read/{id}")
+    public Result<ProdInOutFormDTO> getFormData(@PathVariable("id") Long id) {
+        ProdInOutFormDTO data = prodInOutService.getFormData(id);
+        return Result.success(data);
+    }
+
+    /**
+     * 出入库单表单保存
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/save")
+    public Result<DocSavedDTO> saveFormData(@RequestBody ProdInOutFormDTO data) {
+        DocSavedDTO savedDTO = prodInOutService.saveFormData(data,false);
+        return Result.success(savedDTO);
+    }
+
+    /**
+     * 出入库单删除
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id) {
+        prodInOutService.delete(id);
+        return Result.success();
+    }
+
+    /**
+     * 出入库单明细删除
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/deleteItem/{id}")
+    public Result deleteItem(@PathVariable("id") Long id) {
+        prodInOutService.deleteItem(id);
+        return Result.success();
+    }
+
+
+    /**
+     * 出入库单审批
+     *
+     * @param formData
+     * @return
+     */
+    @PostMapping("/audit")
+    public Result audit(@RequestBody ProdInOutFormDTO formData) {
+        DocSavedDTO audit = prodInOutService.audit(formData);
+        return Result.success(audit);
+    }
+
+    /**
+     * 出入库单审批
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/unAudit/{id}")
+    public Result unAudit(@PathVariable("id") Long id) {
+        prodInOutService.unAudit(id);
+        return Result.success();
+    }
+
+    /**
+     * 出入库单批量审核/反审核
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchAudit")
+    public Result batchAudit(@RequestBody BatchDealBaseDTO baseDTOs) {
+        prodInOutService.batchAudit(baseDTOs);
+        return Result.success();
+    }
+
+    /**
+     * 出入库单批量反审核
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchUnAudit")
+    public Result batchUnAudit(@RequestBody BatchDealBaseDTO baseDTOs) {
+        prodInOutService.batchAudit(baseDTOs);
+        return Result.success();
+    }
+
+
+    /**
+     * 出入库单批量删除
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs) {
+        prodInOutService.batchDelete(baseDTOs);
+        return Result.success();
+    }
+
+    @GetMapping("/turnProdOut/{id}")
+    public Result turnProdin(@PathVariable("id") Long id){
+        prodInOutService.turnProdOut(id);
+        return Result.success();
+    };
 
 
 }

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

@@ -6,15 +6,11 @@ import com.usoftchina.saas.storage.entities.ProdInOutList;
 
 import java.util.List;
 
-/**
- * Created by zdw
- * 2018-10-18 16:57.
- */
+
 public interface ProdInOutListMapper {
 
     List<ProdInOutList> selectProdInOutListByCondition(ProdInOutReqDTO reqDTO);
 
     List<ProdInOutList> selectProdInOutBycondition(ProdInOutReqDTO reqDTO);
 
-
 }

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

@@ -8,6 +8,7 @@ import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.api.WarehouseApi;
 import com.usoftchina.saas.exception.BizException;
@@ -46,7 +47,6 @@ public class ProdInoutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
 
     @Override
     public PageInfo<ProdInOutList> getListData(PageRequest page, ProdInOutReqDTO req) {
-        //设置默认分页
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -91,7 +91,7 @@ public class ProdInoutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     @Override
     public DocSavedDTO saveFormData(ProdInOutFormDTO formdata, Boolean isbfaudit) {
         if (null == formdata || null == formdata.getMain()){
-            throw new BizException(500, "数据为空，请填写后再保存");
+            throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();

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

@@ -0,0 +1,1309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usoftchina.saas.purchase.mapper.ProdIODetailMapper">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdIODetail">
+    <id column="pd_id" jdbcType="INTEGER" property="id" />
+    <result column="pd_piid" jdbcType="INTEGER" property="pd_piid" />
+    <result column="pd_inoutno" jdbcType="VARCHAR" property="pd_inoutno" />
+    <result column="pd_piclass" jdbcType="VARCHAR" property="pd_piclass" />
+    <result column="pd_pdno" jdbcType="INTEGER" property="pd_pdno" />
+    <result column="pd_ordercode" jdbcType="VARCHAR" property="pd_ordercode" />
+    <result column="pd_orderdetno" jdbcType="INTEGER" property="pd_orderdetno" />
+    <result column="pd_prodid" jdbcType="INTEGER" property="pd_prodid" />
+    <result column="pd_prodcode" jdbcType="VARCHAR" property="pd_prodcode" />
+    <result column="pd_unit" jdbcType="VARCHAR" property="pd_unit" />
+    <result column="pd_inqty" jdbcType="INTEGER" property="pd_inqty" />
+    <result column="pd_outqty" jdbcType="INTEGER" property="pd_outqty" />
+    <result column="pd_orderprice" jdbcType="DOUBLE" property="pd_orderprice" />
+    <result column="pd_sendprice" jdbcType="DOUBLE" property="pd_sendprice" />
+    <result column="pd_price" jdbcType="DOUBLE" property="pd_price" />
+    <result column="pd_total" jdbcType="DOUBLE" property="pd_total" />
+    <result column="pd_taxrate" jdbcType="DOUBLE" property="pd_taxrate" />
+    <result column="pd_netprice" jdbcType="DOUBLE" property="pd_netprice" />
+    <result column="pd_nettotal" jdbcType="DOUBLE" property="pd_nettotal" />
+    <result column="pd_whid" jdbcType="INTEGER" property="pd_whid" />
+    <result column="pd_whcode" jdbcType="VARCHAR" property="pd_whcode" />
+    <result column="pd_whname" jdbcType="VARCHAR" property="pd_whname" />
+    <result column="pd_inwhid" jdbcType="INTEGER" property="pd_inwhid" />
+    <result column="pd_inwhcode" jdbcType="VARCHAR" property="pd_inwhcode" />
+    <result column="pd_inwhname" jdbcType="VARCHAR" property="pd_inwhname" />
+    <result column="pd_orderid" jdbcType="INTEGER" property="pd_orderid" />
+    <result column="pd_sdid" jdbcType="INTEGER" property="pd_sdid" />
+    <result column="pd_status" jdbcType="INTEGER" property="pd_status" />
+    <result column="companyid" jdbcType="INTEGER" property="companyId" />
+    <result column="updaterid" jdbcType="INTEGER" property="updaterId" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="pd_text1" jdbcType="VARCHAR" property="pd_text1" />
+    <result column="pd_text2" jdbcType="VARCHAR" property="pd_text2" />
+    <result column="pd_text3" jdbcType="VARCHAR" property="pd_text3" />
+    <result column="pd_text4" jdbcType="VARCHAR" property="pd_text4" />
+    <result column="pd_text5" jdbcType="VARCHAR" property="pd_text5" />
+    <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
+    <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
+    <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
+    <association property="product" javaType="com.usoftchina.saas.document.entities.Product">
+      <id column="pr_id" property="id"/>
+      <result column="pr_code" property="pr_code"/>
+      <result column="pr_detail" property="pr_detail"/>
+      <result column="pr_spec" property="pr_spec"/>
+      <result column="pr_unit" property="pr_unit"/>
+      <result column="pr_kind" property="pr_kind"/>
+      <result column="pr_orispeccode" property="pr_orispeccode"/>
+      <result column="pr_whid" property="pr_whid"/>
+      <result column="pr_whcode" property="pr_whcode"/>
+      <result column="pr_whname" property="pr_whname"/>
+      <result column="pr_zxbzs" property="pr_zxbzs"/>
+      <result column="pr_leadtime" property="pr_leadtime"/>
+      <result column="pr_brand" property="pr_brand"/>
+      <result column="pr_standardprice" property="pr_standardprice"/>
+      <result column="pr_purcprice" property="pr_purcprice"/>
+      <result column="pr_saleprice" property="pr_saleprice"/>
+      <result column="pr_vendid" property="pr_vendid"/>
+      <result column="pr_vendname" property="pr_vendname"/>
+      <result column="pr_vendcode" property="pr_vendcode"/>
+      <result column="pr_docdate" property="pr_docdate"/>
+      <result column="pr_recordmanid" property="pr_recordmanid"/>
+      <result column="pr_recordman" property="pr_recordman"/>
+      <result column="pr_status" property="pr_status"/>
+      <result column="pr_statuscode" property="pr_statuscode"/>
+      <result column="pr_text1" property="pr_text1"/>
+      <result column="pr_text2" property="pr_text2"/>
+      <result column="pr_text3" property="pr_text3"/>
+      <result column="pr_text4" property="pr_text4"/>
+    </association>
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.ProdIODetail">
+    <result column="pd_remark" jdbcType="LONGVARCHAR" property="pd_remark" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    pd_id, pd_piid, pd_inoutno, pd_piclass, pd_pdno, pd_ordercode, pd_orderdetno, pd_prodid, 
+    pd_prodcode, pd_unit, pd_inqty, pd_outqty, pd_orderprice, pd_sendprice, pd_price, 
+    pd_total, pd_taxrate, pd_netprice, pd_nettotal, pd_whid, pd_whcode, pd_whname, pd_inwhid, 
+    pd_inwhcode, pd_inwhname, pd_orderid, pd_sdid, pd_status, companyid, updaterid, updatetime, 
+    pd_text1, pd_text2, pd_text3, pd_text4, pd_text5, pd_ym, pd_yqty,pd_ioid
+  </sql>
+  <sql id="Blob_Column_List">
+    pd_remark
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.purchase.po.ProdIODetailExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from prodiodetail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.usoftchina.saas.purchase.po.ProdIODetailExample" resultMap="BaseResultMap">
+    select
+        *
+    from prodiodetail a left join product b on a.pd_prodid = b.pr_id and a.companyid = b.companyid
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from prodiodetail
+    where pd_id = #{pd_id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from prodiodetail
+    where pd_id = #{pd_id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.usoftchina.saas.purchase.po.ProdIODetailExample">
+    delete from prodiodetail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail">
+    insert into prodiodetail (pd_id, pd_piid, pd_inoutno, 
+      pd_piclass, pd_pdno, pd_ordercode, 
+      pd_orderdetno, pd_prodid, pd_prodcode, 
+      pd_unit, pd_inqty, pd_outqty, 
+      pd_orderprice, pd_sendprice, pd_price, 
+      pd_total, pd_taxrate, pd_netprice, 
+      pd_nettotal, pd_whid, pd_whcode, 
+      pd_whname, pd_inwhid, pd_inwhcode, 
+      pd_inwhname, pd_orderid, pd_sdid, 
+      pd_status, companyid, updaterid, 
+      updatetime, pd_text1, pd_text2, 
+      pd_text3, pd_text4, pd_text5, 
+      pd_ym, pd_yqty, pd_remark,pd_ioid
+      )
+    values (#{pd_id,jdbcType=INTEGER}, #{pd_piid,jdbcType=INTEGER}, #{pd_inoutno,jdbcType=VARCHAR}, 
+      #{pd_piclass,jdbcType=VARCHAR}, #{pd_pdno,jdbcType=INTEGER}, #{pd_ordercode,jdbcType=VARCHAR}, 
+      #{pd_orderdetno,jdbcType=INTEGER}, #{pd_prodid,jdbcType=INTEGER}, #{pd_prodcode,jdbcType=VARCHAR}, 
+      #{pd_unit,jdbcType=VARCHAR}, #{pd_inqty,jdbcType=INTEGER}, #{pd_outqty,jdbcType=INTEGER}, 
+      #{pd_orderprice,jdbcType=DOUBLE}, #{pd_sendprice,jdbcType=DOUBLE}, #{pd_price,jdbcType=DOUBLE}, 
+      #{pd_total,jdbcType=DOUBLE}, #{pd_taxrate,jdbcType=DOUBLE}, #{pd_netprice,jdbcType=DOUBLE},
+      #{pd_nettotal,jdbcType=DOUBLE}, #{pd_whid,jdbcType=INTEGER}, #{pd_whcode,jdbcType=VARCHAR}, 
+      #{pd_whname,jdbcType=VARCHAR}, #{pd_inwhid,jdbcType=INTEGER}, #{pd_inwhcode,jdbcType=VARCHAR}, 
+      #{pd_inwhname,jdbcType=VARCHAR}, #{pd_orderid,jdbcType=INTEGER}, #{pd_sdid,jdbcType=INTEGER}, 
+      #{pd_status,jdbcType=INTEGER}, #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
+      #{updatetime,jdbcType=TIMESTAMP}, #{pd_text1,jdbcType=VARCHAR}, #{pd_text2,jdbcType=VARCHAR}, 
+      #{pd_text3,jdbcType=VARCHAR}, #{pd_text4,jdbcType=VARCHAR}, #{pd_text5,jdbcType=VARCHAR}, 
+      #{pd_ym,jdbcType=INTEGER}, #{pd_yqty,jdbcType=INTEGER}, #{pd_remark,jdbcType=LONGVARCHAR},
+      #{pd_ioid,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail">
+    <selectKey resultType="java.lang.Long" keyProperty="id">
+      SELECT LAST_INSERT_ID() AS ID
+    </selectKey>
+    insert into prodiodetail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="pd_piid != null">
+        pd_piid,
+      </if>
+      <if test="pd_inoutno != null">
+        pd_inoutno,
+      </if>
+      <if test="pd_piclass != null">
+        pd_piclass,
+      </if>
+      <if test="pd_pdno != null">
+        pd_pdno,
+      </if>
+      <if test="pd_ordercode != null">
+        pd_ordercode,
+      </if>
+      <if test="pd_orderdetno != null">
+        pd_orderdetno,
+      </if>
+      <if test="pd_prodid != null">
+        pd_prodid,
+      </if>
+      <if test="pd_prodcode != null">
+        pd_prodcode,
+      </if>
+      <if test="pd_unit != null">
+        pd_unit,
+      </if>
+      <if test="pd_inqty != null">
+        pd_inqty,
+      </if>
+      <if test="pd_outqty != null">
+        pd_outqty,
+      </if>
+      <if test="pd_orderprice != null">
+        pd_orderprice,
+      </if>
+      <if test="pd_sendprice != null">
+        pd_sendprice,
+      </if>
+      <if test="pd_price != null">
+        pd_price,
+      </if>
+      <if test="pd_total != null">
+        pd_total,
+      </if>
+      <if test="pd_taxrate != null">
+        pd_taxrate,
+      </if>
+      <if test="pd_netprice != null">
+        pd_netprice,
+      </if>
+      <if test="pd_nettotal != null">
+        pd_nettotal,
+      </if>
+      <if test="pd_whid != null">
+        pd_whid,
+      </if>
+      <if test="pd_whcode != null">
+        pd_whcode,
+      </if>
+      <if test="pd_whname != null">
+        pd_whname,
+      </if>
+      <if test="pd_inwhid != null">
+        pd_inwhid,
+      </if>
+      <if test="pd_inwhcode != null">
+        pd_inwhcode,
+      </if>
+      <if test="pd_inwhname != null">
+        pd_inwhname,
+      </if>
+      <if test="pd_orderid != null">
+        pd_orderid,
+      </if>
+      <if test="pd_sdid != null">
+        pd_sdid,
+      </if>
+      <if test="pd_status != null">
+        pd_status,
+      </if>
+      <if test="companyId != null">
+        companyid,
+      </if>
+      <if test="updaterId != null">
+        updaterid,
+      </if>
+      <if test="updateTime != null">
+        updatetime,
+      </if>
+      <if test="pd_text1 != null">
+        pd_text1,
+      </if>
+      <if test="pd_text2 != null">
+        pd_text2,
+      </if>
+      <if test="pd_text3 != null">
+        pd_text3,
+      </if>
+      <if test="pd_text4 != null">
+        pd_text4,
+      </if>
+      <if test="pd_text5 != null">
+        pd_text5,
+      </if>
+      <if test="pd_ym != null">
+        pd_ym,
+      </if>
+      <if test="pd_yqty != null">
+        pd_yqty,
+      </if>
+      <if test="pd_remark != null">
+        pd_remark,
+      </if>
+      <if test="pd_ioid != null">
+        pd_ioid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="pd_piid != null">
+        #{pd_piid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_inoutno != null">
+        #{pd_inoutno,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_piclass != null">
+        #{pd_piclass,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_pdno != null">
+        #{pd_pdno,jdbcType=INTEGER},
+      </if>
+      <if test="pd_ordercode != null">
+        #{pd_ordercode,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_orderdetno != null">
+        #{pd_orderdetno,jdbcType=INTEGER},
+      </if>
+      <if test="pd_prodid != null">
+        #{pd_prodid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_prodcode != null">
+        #{pd_prodcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_unit != null">
+        #{pd_unit,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_inqty != null">
+        #{pd_inqty,jdbcType=INTEGER},
+      </if>
+      <if test="pd_outqty != null">
+        #{pd_outqty,jdbcType=INTEGER},
+      </if>
+      <if test="pd_orderprice != null">
+        #{pd_orderprice,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_sendprice != null">
+        #{pd_sendprice,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_price != null">
+        #{pd_price,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_total != null">
+        #{pd_total,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_taxrate != null">
+        #{pd_taxrate,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_netprice != null">
+        #{pd_netprice,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_nettotal != null">
+        #{pd_nettotal,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_whid != null">
+        #{pd_whid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_whcode != null">
+        #{pd_whcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_whname != null">
+        #{pd_whname,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_inwhid != null">
+        #{pd_inwhid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_inwhcode != null">
+        #{pd_inwhcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_inwhname != null">
+        #{pd_inwhname,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_orderid != null">
+        #{pd_orderid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_sdid != null">
+        #{pd_sdid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_status != null">
+        #{pd_status,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="updaterId != null">
+        #{updaterId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pd_text1 != null">
+        #{pd_text1,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_text2 != null">
+        #{pd_text2,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_text3 != null">
+        #{pd_text3,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_text4 != null">
+        #{pd_text4,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_text5 != null">
+        #{pd_text5,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_ym != null">
+        #{pd_ym,jdbcType=INTEGER},
+      </if>
+      <if test="pd_yqty != null">
+        #{pd_yqty,jdbcType=INTEGER},
+      </if>
+      <if test="pd_remark != null">
+        #{pd_remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="pd_ioid != null">
+        #{pd_ioid,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.usoftchina.saas.purchase.po.ProdIODetailExample" resultType="java.lang.Long">
+    select count(*) from prodiodetail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update prodiodetail
+    <set>
+      <if test="record.pd_id != null">
+        pd_id = #{record.pd_id,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_piid != null">
+        pd_piid = #{record.pd_piid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_inoutno != null">
+        pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_piclass != null">
+        pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_pdno != null">
+        pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_ordercode != null">
+        pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_orderdetno != null">
+        pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_prodid != null">
+        pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_prodcode != null">
+        pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_unit != null">
+        pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_inqty != null">
+        pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_outqty != null">
+        pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_orderprice != null">
+        pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_sendprice != null">
+        pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_price != null">
+        pd_price = #{record.pd_price,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_total != null">
+        pd_total = #{record.pd_total,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_taxrate != null">
+        pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_netprice != null">
+        pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_nettotal != null">
+        pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_whid != null">
+        pd_whid = #{record.pd_whid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_whcode != null">
+        pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_whname != null">
+        pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_inwhid != null">
+        pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_inwhcode != null">
+        pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_inwhname != null">
+        pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_orderid != null">
+        pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_sdid != null">
+        pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_status != null">
+        pd_status = #{record.pd_status,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyid != null">
+        companyid = #{record.companyid,jdbcType=INTEGER},
+      </if>
+      <if test="record.updaterid != null">
+        updaterid = #{record.updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.pd_text1 != null">
+        pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_text2 != null">
+        pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_text3 != null">
+        pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_text4 != null">
+        pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_text5 != null">
+        pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_ym != null">
+        pd_ym = #{record.pd_ym,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_yqty != null">
+        pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_remark != null">
+        pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.pd_ioid != null">
+        pd_ioid = #{record.pd_ioid,jdbcType=INTEGER},
+      </if>
+
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update prodiodetail
+    set pd_id = #{record.pd_id,jdbcType=INTEGER},
+      pd_piid = #{record.pd_piid,jdbcType=INTEGER},
+      pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
+      pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
+      pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
+      pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
+      pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
+      pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
+      pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
+      pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
+      pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
+      pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
+      pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
+      pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
+      pd_price = #{record.pd_price,jdbcType=DOUBLE},
+      pd_total = #{record.pd_total,jdbcType=DOUBLE},
+      pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
+      pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
+      pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
+      pd_whid = #{record.pd_whid,jdbcType=INTEGER},
+      pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
+      pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
+      pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
+      pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
+      pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
+      pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
+      pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
+      pd_status = #{record.pd_status,jdbcType=INTEGER},
+      companyid = #{record.companyid,jdbcType=INTEGER},
+      updaterid = #{record.updaterid,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
+      pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
+      pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
+      pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
+      pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
+      pd_ym = #{record.pd_ym,jdbcType=INTEGER},
+      pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
+      pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
+      pd_ioid = #{record.pd_ioid,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update prodiodetail
+    set pd_id = #{record.pd_id,jdbcType=INTEGER},
+      pd_piid = #{record.pd_piid,jdbcType=INTEGER},
+      pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
+      pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
+      pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
+      pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
+      pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
+      pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
+      pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
+      pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
+      pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
+      pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
+      pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
+      pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
+      pd_price = #{record.pd_price,jdbcType=DOUBLE},
+      pd_total = #{record.pd_total,jdbcType=DOUBLE},
+      pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
+      pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
+      pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
+      pd_whid = #{record.pd_whid,jdbcType=INTEGER},
+      pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
+      pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
+      pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
+      pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
+      pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
+      pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
+      pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
+      pd_status = #{record.pd_status,jdbcType=INTEGER},
+      companyid = #{record.companyid,jdbcType=INTEGER},
+      updaterid = #{record.updaterid,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
+      pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
+      pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
+      pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
+      pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
+      pd_ym = #{record.pd_ym,jdbcType=INTEGER},
+      pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
+      pd_ioid = #{record.pd_ioid,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail">
+    update prodiodetail
+    <set>
+      <if test="pd_piid != null">
+        pd_piid = #{pd_piid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_inoutno != null">
+        pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_piclass != null">
+        pd_piclass = #{pd_piclass,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_pdno != null">
+        pd_pdno = #{pd_pdno,jdbcType=INTEGER},
+      </if>
+      <if test="pd_ordercode != null">
+        pd_ordercode = #{pd_ordercode,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_orderdetno != null">
+        pd_orderdetno = #{pd_orderdetno,jdbcType=INTEGER},
+      </if>
+      <if test="pd_prodid != null">
+        pd_prodid = #{pd_prodid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_prodcode != null">
+        pd_prodcode = #{pd_prodcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_unit != null">
+        pd_unit = #{pd_unit,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_inqty != null">
+        pd_inqty = #{pd_inqty,jdbcType=INTEGER},
+      </if>
+      <if test="pd_outqty != null">
+        pd_outqty = #{pd_outqty,jdbcType=INTEGER},
+      </if>
+      <if test="pd_orderprice != null">
+        pd_orderprice = #{pd_orderprice,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_sendprice != null">
+        pd_sendprice = #{pd_sendprice,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_price != null">
+        pd_price = #{pd_price,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_total != null">
+        pd_total = #{pd_total,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_taxrate != null">
+        pd_taxrate = #{pd_taxrate,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_netprice != null">
+        pd_netprice = #{pd_netprice,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_nettotal != null">
+        pd_nettotal = #{pd_nettotal,jdbcType=DOUBLE},
+      </if>
+      <if test="pd_whid != null">
+        pd_whid = #{pd_whid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_whcode != null">
+        pd_whcode = #{pd_whcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_whname != null">
+        pd_whname = #{pd_whname,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_inwhid != null">
+        pd_inwhid = #{pd_inwhid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_inwhcode != null">
+        pd_inwhcode = #{pd_inwhcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_inwhname != null">
+        pd_inwhname = #{pd_inwhname,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_orderid != null">
+        pd_orderid = #{pd_orderid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_sdid != null">
+        pd_sdid = #{pd_sdid,jdbcType=INTEGER},
+      </if>
+      <if test="pd_status != null">
+        pd_status = #{pd_status,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null">
+        companyid = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="updaterId != null">
+        updaterid = #{updaterId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        updatetime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pd_text1 != null">
+        pd_text1 = #{pd_text1,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_text2 != null">
+        pd_text2 = #{pd_text2,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_text3 != null">
+        pd_text3 = #{pd_text3,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_text4 != null">
+        pd_text4 = #{pd_text4,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_text5 != null">
+        pd_text5 = #{pd_text5,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_ym != null">
+        pd_ym = #{pd_ym,jdbcType=INTEGER},
+      </if>
+      <if test="pd_yqty != null">
+        pd_yqty = #{pd_yqty,jdbcType=INTEGER},
+      </if>
+      <if test="pd_remark != null">
+        pd_remark = #{pd_remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="pd_ioid != null">
+        pd_ioid = #{pd_ioid,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where pd_id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail">
+    update prodiodetail
+    set pd_piid = #{pd_piid,jdbcType=INTEGER},
+      pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
+      pd_piclass = #{pd_piclass,jdbcType=VARCHAR},
+      pd_pdno = #{pd_pdno,jdbcType=INTEGER},
+      pd_ordercode = #{pd_ordercode,jdbcType=VARCHAR},
+      pd_orderdetno = #{pd_orderdetno,jdbcType=INTEGER},
+      pd_prodid = #{pd_prodid,jdbcType=INTEGER},
+      pd_prodcode = #{pd_prodcode,jdbcType=VARCHAR},
+      pd_unit = #{pd_unit,jdbcType=VARCHAR},
+      pd_inqty = #{pd_inqty,jdbcType=INTEGER},
+      pd_outqty = #{pd_outqty,jdbcType=INTEGER},
+      pd_orderprice = #{pd_orderprice,jdbcType=DOUBLE},
+      pd_sendprice = #{pd_sendprice,jdbcType=DOUBLE},
+      pd_price = #{pd_price,jdbcType=DOUBLE},
+      pd_total = #{pd_total,jdbcType=DOUBLE},
+      pd_taxrate = #{pd_taxrate,jdbcType=DOUBLE},
+      pd_netprice = #{pd_netprice,jdbcType=DOUBLE},
+      pd_nettotal = #{pd_nettotal,jdbcType=DOUBLE},
+      pd_whid = #{pd_whid,jdbcType=INTEGER},
+      pd_whcode = #{pd_whcode,jdbcType=VARCHAR},
+      pd_whname = #{pd_whname,jdbcType=VARCHAR},
+      pd_inwhid = #{pd_inwhid,jdbcType=INTEGER},
+      pd_inwhcode = #{pd_inwhcode,jdbcType=VARCHAR},
+      pd_inwhname = #{pd_inwhname,jdbcType=VARCHAR},
+      pd_orderid = #{pd_orderid,jdbcType=INTEGER},
+      pd_sdid = #{pd_sdid,jdbcType=INTEGER},
+      pd_status = #{pd_status,jdbcType=INTEGER},
+      companyid = #{companyid,jdbcType=INTEGER},
+      updaterid = #{updaterid,jdbcType=INTEGER},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      pd_text1 = #{pd_text1,jdbcType=VARCHAR},
+      pd_text2 = #{pd_text2,jdbcType=VARCHAR},
+      pd_text3 = #{pd_text3,jdbcType=VARCHAR},
+      pd_text4 = #{pd_text4,jdbcType=VARCHAR},
+      pd_text5 = #{pd_text5,jdbcType=VARCHAR},
+      pd_ym = #{pd_ym,jdbcType=INTEGER},
+      pd_yqty = #{pd_yqty,jdbcType=INTEGER},
+      pd_remark = #{pd_remark,jdbcType=LONGVARCHAR},
+      pd_ioid = #{pd_ioid,jdbcType=INTEGER}
+    where pd_id = #{pd_id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail">
+    update prodiodetail
+    set pd_piid = #{pd_piid,jdbcType=INTEGER},
+      pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
+      pd_piclass = #{pd_piclass,jdbcType=VARCHAR},
+      pd_pdno = #{pd_pdno,jdbcType=INTEGER},
+      pd_ordercode = #{pd_ordercode,jdbcType=VARCHAR},
+      pd_orderdetno = #{pd_orderdetno,jdbcType=INTEGER},
+      pd_prodid = #{pd_prodid,jdbcType=INTEGER},
+      pd_prodcode = #{pd_prodcode,jdbcType=VARCHAR},
+      pd_unit = #{pd_unit,jdbcType=VARCHAR},
+      pd_inqty = #{pd_inqty,jdbcType=INTEGER},
+      pd_outqty = #{pd_outqty,jdbcType=INTEGER},
+      pd_orderprice = #{pd_orderprice,jdbcType=DOUBLE},
+      pd_sendprice = #{pd_sendprice,jdbcType=DOUBLE},
+      pd_price = #{pd_price,jdbcType=DOUBLE},
+      pd_total = #{pd_total,jdbcType=DOUBLE},
+      pd_taxrate = #{pd_taxrate,jdbcType=DOUBLE},
+      pd_netprice = #{pd_netprice,jdbcType=DOUBLE},
+      pd_nettotal = #{pd_nettotal,jdbcType=DOUBLE},
+      pd_whid = #{pd_whid,jdbcType=INTEGER},
+      pd_whcode = #{pd_whcode,jdbcType=VARCHAR},
+      pd_whname = #{pd_whname,jdbcType=VARCHAR},
+      pd_inwhid = #{pd_inwhid,jdbcType=INTEGER},
+      pd_inwhcode = #{pd_inwhcode,jdbcType=VARCHAR},
+      pd_inwhname = #{pd_inwhname,jdbcType=VARCHAR},
+      pd_orderid = #{pd_orderid,jdbcType=INTEGER},
+      pd_sdid = #{pd_sdid,jdbcType=INTEGER},
+      pd_status = #{pd_status,jdbcType=INTEGER},
+      companyid = #{companyid,jdbcType=INTEGER},
+      updaterid = #{updaterid,jdbcType=INTEGER},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      pd_text1 = #{pd_text1,jdbcType=VARCHAR},
+      pd_text2 = #{pd_text2,jdbcType=VARCHAR},
+      pd_text3 = #{pd_text3,jdbcType=VARCHAR},
+      pd_text4 = #{pd_text4,jdbcType=VARCHAR},
+      pd_text5 = #{pd_text5,jdbcType=VARCHAR},
+      pd_ym = #{pd_ym,jdbcType=INTEGER},
+      pd_yqty = #{pd_yqty,jdbcType=INTEGER},
+      pd_ioid = #{pd_ioid,jdbcType=INTEGER}
+    where pd_id = #{pd_id,jdbcType=INTEGER}
+  </update>
+
+  <insert id="batchInsert" parameterType="java.util.List" >
+    insert into prodiodetail
+    (
+    pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_ordercode,
+    pd_orderdetno,pd_prodid,pd_prodcode,pd_unit,
+    pd_inqty,pd_outqty,pd_orderprice,pd_sendprice,pd_price,
+    pd_total,pd_taxrate,pd_netprice,pd_nettotal,
+    pd_whid,pd_whcode,pd_whname,pd_inwhid,pd_inwhcode,
+    pd_inwhname,pd_orderid,pd_sdid,pd_status,pd_remark,
+    companyid,updaterid,updatetime,pd_text1,pd_text2,
+    pd_text3,pd_text4,pd_text5,pd_ym,pd_yqty
+    )
+    values
+    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+      (
+      #{item.pd_piid,jdbcType=INTEGER},#{item.pd_inoutno,jdbcType=VARCHAR},#{item.pd_piclass,jdbcType=VARCHAR},#{item.pd_pdno,jdbcType=INTEGER},#{item.pd_ordercode,jdbcType=VARCHAR},
+      #{item.pd_orderdetno,jdbcType=INTEGER},#{item.pd_prodid,jdbcType=INTEGER},#{item.pd_prodcode,jdbcType=VARCHAR},#{item.pd_unit,jdbcType=VARCHAR},
+      #{item.pd_inqty,jdbcType=INTEGER},#{item.pd_outqty,jdbcType=INTEGER},#{item.pd_orderprice,jdbcType=DOUBLE},#{item.pd_sendprice,jdbcType=DOUBLE},#{item.pd_price,jdbcType=DOUBLE},
+      #{item.pd_total,jdbcType=DOUBLE},#{item.pd_taxrate,jdbcType=DOUBLE},#{item.pd_netprice,jdbcType=DOUBLE},#{item.pd_nettotal,jdbcType=DOUBLE},
+      #{item.pd_whid,jdbcType=INTEGER},#{item.pd_whcode,jdbcType=VARCHAR},#{item.pd_whname,jdbcType=VARCHAR},#{item.pd_inwhid,jdbcType=INTEGER},#{item.pd_inwhcode,jdbcType=VARCHAR},
+      #{item.pd_inwhname,jdbcType=VARCHAR},#{item.pd_orderid,jdbcType=INTEGER},#{item.pd_sdid,jdbcType=INTEGER},#{item.pd_status,jdbcType=VARCHAR},#{item.pd_remark,jdbcType=VARCHAR},
+      #{item.companyId,jdbcType=INTEGER},#{item.updaterId,jdbcType=INTEGER},#{item.updateTime,jdbcType=TIMESTAMP},#{item.pd_text1,jdbcType=VARCHAR},#{item.pd_text2,jdbcType=VARCHAR},
+      #{item.pd_text3,jdbcType=VARCHAR},#{item.pd_text4,jdbcType=VARCHAR},#{item.pd_text5,jdbcType=VARCHAR},#{item.pd_ym,jdbcType=INTEGER},#{item.pd_yqty,jdbcType=INTEGER}
+      )
+    </foreach>
+  </insert>
+
+  <insert id="batchInsert1" parameterType="java.util.List" >
+    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+      insert into prodiodetail
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+        <if test="item.pd_piid != null">
+          pd_piid,
+        </if>
+        <if test="item.pd_inoutno != null">
+          pd_inoutno,
+        </if>
+        <if test="item.pd_piclass != null">
+          pd_piclass,
+        </if>
+        <if test="item.pd_pdno != null">
+          pd_pdno,
+        </if>
+        <if test="item.pd_ordercode != null">
+          pd_ordercode,
+        </if>
+        <if test="item.pd_orderdetno != null">
+          pd_orderdetno,
+        </if>
+        <if test="item.pd_prodid != null">
+          pd_prodid,
+        </if>
+        <if test="item.pd_prodcode != null">
+          pd_prodcode,
+        </if>
+        <if test="item.pd_unit != null">
+          pd_unit,
+        </if>
+        <if test="item.pd_inqty != null">
+          pd_inqty,
+        </if>
+        <if test="item.pd_outqty != null">
+          pd_outqty,
+        </if>
+        <if test="item.pd_orderprice != null">
+          pd_orderprice,
+        </if>
+        <if test="item.pd_sendprice != null">
+          pd_sendprice,
+        </if>
+        <if test="item.pd_price != null">
+          pd_price,
+        </if>
+        <if test="item.pd_total != null">
+          pd_total,
+        </if>
+        <if test="item.pd_taxrate != null">
+          pd_taxrate,
+        </if>
+        <if test="item.pd_netprice != null">
+          pd_netprice,
+        </if>
+        <if test="item.pd_nettotal != null">
+          pd_nettotal,
+        </if>
+        <if test="item.pd_whid != null">
+          pd_whid,
+        </if>
+        <if test="item.pd_whcode != null">
+          pd_whcode,
+        </if>
+        <if test="item.pd_whname != null">
+          pd_whname,
+        </if>
+        <if test="item.pd_inwhid != null">
+          pd_inwhid,
+        </if>
+        <if test="item.pd_inwhcode != null">
+          pd_inwhcode,
+        </if>
+        <if test="item.pd_inwhname != null">
+          pd_inwhname,
+        </if>
+        <if test="item.pd_orderid != null">
+          pd_orderid,
+        </if>
+        <if test="item.pd_sdid != null">
+          pd_sdid,
+        </if>
+        <if test="item.pd_status != null">
+          pd_status,
+        </if>
+        <if test="item.companyId != null">
+          companyid,
+        </if>
+        <if test="item.updaterId != null">
+          updaterid,
+        </if>
+        <if test="item.updateTime != null">
+          updatetime,
+        </if>
+        <if test="item.pd_text1 != null">
+          pd_text1,
+        </if>
+        <if test="item.pd_text2 != null">
+          pd_text2,
+        </if>
+        <if test="item.pd_text3 != null">
+          pd_text3,
+        </if>
+        <if test="item.pd_text4 != null">
+          pd_text4,
+        </if>
+        <if test="item.pd_text5 != null">
+          pd_text5,
+        </if>
+        <if test="item.pd_ym != null">
+          pd_ym,
+        </if>
+        <if test="item.pd_yqty != null">
+          pd_yqty,
+        </if>
+        <if test="item.pd_remark != null">
+          pd_remark,
+        </if>
+        <if test="item.pd_ioid != null">
+          pd_ioid,
+        </if>
+      </trim>
+      <trim prefix="values (" suffix=")" suffixOverrides=",">
+        <if test="item.pd_piid != null">
+          #{item.pd_piid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_inoutno != null">
+          #{item.pd_inoutno,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_piclass != null">
+          #{item.pd_piclass,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_pdno != null">
+          #{item.pd_pdno,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_ordercode != null">
+          #{item.pd_ordercode,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_orderdetno != null">
+          #{item.pd_orderdetno,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_prodid != null">
+          #{item.pd_prodid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_prodcode != null">
+          #{item.pd_prodcode,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_unit != null">
+          #{item.pd_unit,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_inqty != null">
+          #{item.pd_inqty,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_outqty != null">
+          #{item.pd_outqty,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_orderprice != null">
+          #{item.pd_orderprice,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_sendprice != null">
+          #{item.pd_sendprice,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_price != null">
+          #{item.pd_price,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_total != null">
+          #{item.pd_total,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_taxrate != null">
+          #{item.pd_taxrate,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_netprice != null">
+          #{item.pd_netprice,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_nettotal != null">
+          #{item.pd_nettotal,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_whid != null">
+          #{item.pd_whid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_whcode != null">
+          #{item.pd_whcode,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_whname != null">
+          #{item.pd_whname,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_inwhid != null">
+          #{item.pd_inwhid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_inwhcode != null">
+          #{item.pd_inwhcode,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_inwhname != null">
+          #{item.pd_inwhname,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_orderid != null">
+          #{item.pd_orderid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_sdid != null">
+          #{item.pd_sdid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_status != null">
+          #{item.pd_status,jdbcType=INTEGER},
+        </if>
+        <if test="item.companyId != null">
+          #{item.companyId,jdbcType=INTEGER},
+        </if>
+        <if test="item.updaterId != null">
+          #{item.updaterId,jdbcType=INTEGER},
+        </if>
+        <if test="item.updateTime != null">
+          #{item.updateTime,jdbcType=TIMESTAMP},
+        </if>
+        <if test="item.pd_text1 != null">
+          #{item.pd_text1,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_text2 != null">
+          #{item.pd_text2,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_text3 != null">
+          #{item.pd_text3,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_text4 != null">
+          #{item.pd_text4,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_text5 != null">
+          #{item.pd_text5,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_ym != null">
+          #{item.pd_ym,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_yqty != null">
+          #{item.pd_yqty,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_remark != null">
+          #{item.pd_remark,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="item.pd_ioid != null">
+          #{item.pd_ioid,jdbcType=INTEGER},
+        </if>
+      </trim>
+
+    </foreach>
+  </insert>
+
+
+
+
+
+
+
+
+
+  <update id="batchUpdate" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail" >
+    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+      update prodiodetail <set>
+      <if test="item.pd_piid !=null">
+        pd_piid = #{item.pd_piid},
+      </if>
+      <if test="item.pd_inoutno !=null">
+        pd_inoutno = #{item.pd_inoutno},
+      </if>
+      <if test="item.pd_piclass !=null">
+        pd_piclass = #{item.pd_piclass},
+      </if>
+      <if test="item.pd_pdno !=null">
+        pd_pdno = #{item.pd_pdno},
+      </if>
+      <if test="item.pd_ordercode !=null">
+        pd_ordercode = #{item.pd_ordercode},
+      </if>
+      <if test="item.pd_orderdetno !=null">
+        pd_orderdetno = #{item.pd_orderdetno},
+      </if>
+      <if test="item.pd_prodid !=null">
+        pd_prodid = #{item.pd_prodid},
+      </if>
+      <if test="item.pd_prodcode !=null">
+        pd_prodcode = #{item.pd_prodcode},
+      </if>
+      <if test="item.pd_unit !=null">
+        pd_unit = #{item.pd_unit},
+      </if>
+      <if test="item.pd_inqty !=null">
+        pd_inqty = #{item.pd_inqty},
+      </if>
+      <if test="item.pd_outqty !=null">
+        pd_outqty = #{item.pd_outqty},
+      </if>
+      <if test="item.pd_orderprice !=null">
+        pd_orderprice = #{item.pd_orderprice},
+      </if>
+      <if test="item.pd_sendprice !=null">
+        pd_sendprice = #{item.pd_sendprice},
+      </if>
+      <if test="item.pd_price !=null">
+        pd_price = #{item.pd_price},
+      </if>
+      <if test="item.pd_total !=null">
+        pd_total = #{item.pd_total},
+      </if>
+      <if test="item.pd_taxrate !=null">
+        pd_taxrate = #{item.pd_taxrate},
+      </if>
+      <if test="item.pd_netprice !=null">
+        pd_netprice = #{item.pd_netprice},
+      </if>
+      <if test="item.pd_nettotal !=null">
+        pd_nettotal = #{item.pd_nettotal},
+      </if>
+      <if test="item.pd_whid !=null">
+        pd_whid = #{item.pd_whid},
+      </if>
+      <if test="item.pd_whcode !=null">
+        pd_whcode = #{item.pd_whcode},
+      </if>
+      <if test="item.pd_whname !=null">
+        pd_whname = #{item.pd_whname},
+      </if>
+      <if test="item.pd_inwhid !=null">
+        pd_inwhid = #{item.pd_inwhid},
+      </if>
+      <if test="item.pd_inwhcode !=null">
+        pd_inwhcode = #{item.pd_inwhcode},
+      </if>
+      <if test="item.pd_inwhname !=null">
+        pd_inwhname = #{item.pd_inwhname},
+      </if>
+      <if test="item.pd_orderid !=null">
+        pd_orderid = #{item.pd_orderid},
+      </if>
+      <if test="item.pd_sdid !=null">
+        pd_sdid = #{item.pd_sdid},
+      </if>
+      <if test="item.pd_status !=null">
+        pd_status = #{item.pd_status},
+      </if>
+      <if test="item.pd_remark !=null">
+        pd_remark = #{item.pd_remark},
+      </if>
+      <if test="item.companyId!=null">
+        companyId = #{item.companyId},
+      </if>
+      <if test="item.updaterId!=null">
+        updaterId = #{item.updaterId},
+      </if>
+      <if test="item.updateTime!=null">
+        updateTime = #{item.updateTime},
+      </if>
+      pd_text1 = #{item.pd_text1},
+      pd_text2 = #{item.pd_text2},
+      pd_text3 = #{item.pd_text3},
+      pd_text4 = #{item.pd_text4},
+      pd_text5 = #{item.pd_text5},
+      <if test="item.pd_ym!=null">
+        pd_ym = #{item.pd_ym},
+      </if>
+      <if test="item.pd_yqty!=null">
+        pd_yqty = #{item.pd_yqty},
+      </if>
+    </set>
+      where PD_ID = #{item.id,jdbcType=INTEGER}
+    </foreach>
+  </update>
+
+  <update id="updatePurchaseYqty" parameterType="java.lang.Integer">
+
+update prodiodetail a
+set a.pd_yqty =ifnull((select  b.pd_outqty  from  (select pd_ioid,sum(pd_outqty) pd_outqty from  prodiodetail left join prodinout on pd_piid = pi_id where pd_piclass='采购验退单'
+and pi_puid=#{id,jdbcType=INTEGER}  GROUP BY pd_ioid) b where ifnull(b.pd_ioid ,0)= a.pd_id ),0)
+where a.pd_piid = (select pi_id from prodinout where pi_puid=#{id,jdbcType=INTEGER} and pi_class='采购验收单')
+  </update>
+
+
+  <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
+    select * from prodiodetail a left join product b on b.pr_id= a.pd_prodid and a.companyid = b.companyid
+    where pd_piid=#{id} order by pd_pdno
+  </select>
+
+
+
+</mapper>

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

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usoftchina.saas.purchase.mapper.ProdInOutListMapper">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdInOutList">
+    <id column="pi_id" jdbcType="INTEGER" property="id" />
+    <result column="pi_inoutno" jdbcType="VARCHAR" property="pi_inoutno" />
+    <result column="pi_class" jdbcType="VARCHAR" property="pi_class" />
+    <result column="pi_date" jdbcType="TIMESTAMP" property="pi_date" />
+    <result column="pi_vendid" jdbcType="INTEGER" property="pi_vendid" />
+    <result column="pi_vendcode" jdbcType="VARCHAR" property="pi_vendcode" />
+    <result column="pi_vendname" jdbcType="VARCHAR" property="pi_vendname" />
+    <result column="pi_custid" jdbcType="INTEGER" property="pi_custid" />
+    <result column="pi_custcode" jdbcType="VARCHAR" property="pi_custcode" />
+    <result column="pi_custname" jdbcType="VARCHAR" property="pi_custname" />
+    <result column="pi_puid" jdbcType="INTEGER" property="pi_puid" />
+    <result column="pi_pucode" jdbcType="VARCHAR" property="pi_pucode" />
+    <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
+    <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
+    <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
+    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
+    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
+    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />
+    <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
+    <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
+    <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
+    <result column="pi_printstatuscode" jdbcType="VARCHAR" property="pi_printstatuscode" />
+    <result column="pi_text1" jdbcType="VARCHAR" property="pi_text1" />
+    <result column="pi_text2" jdbcType="VARCHAR" property="pi_text2" />
+    <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_address" jdbcType="VARCHAR" property="pi_address" />
+    <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" />
+    <result column="pd_pdno" jdbcType="INTEGER" property="pd_pdno" />
+    <result column="pd_ordercode" jdbcType="VARCHAR" property="pd_ordercode" />
+    <result column="pd_orderdetno" jdbcType="INTEGER" property="pd_orderdetno" />
+    <result column="pd_prodid" jdbcType="INTEGER" property="pd_prodid" />
+    <result column="pd_prodcode" jdbcType="VARCHAR" property="pd_prodcode" />
+    <result column="pd_unit" jdbcType="VARCHAR" property="pd_unit" />
+    <result column="pd_inqty" jdbcType="INTEGER" property="pd_inqty" />
+    <result column="pd_outqty" jdbcType="INTEGER" property="pd_outqty" />
+    <result column="pd_orderprice" jdbcType="DOUBLE" property="pd_orderprice" />
+    <result column="pd_sendprice" jdbcType="DOUBLE" property="pd_sendprice" />
+    <result column="pd_price" jdbcType="DOUBLE" property="pd_price" />
+    <result column="pd_total" jdbcType="DOUBLE" property="pd_total" />
+    <result column="pd_taxrate" jdbcType="DOUBLE" property="pd_taxrate" />
+    <result column="pd_netprice" jdbcType="DOUBLE" property="pd_netprice" />
+    <result column="pd_nettotal" jdbcType="DOUBLE" property="pd_nettotal" />
+    <result column="pd_whid" jdbcType="INTEGER" property="pd_whid" />
+    <result column="pd_whcode" jdbcType="VARCHAR" property="pd_whcode" />
+    <result column="pd_whname" jdbcType="VARCHAR" property="pd_whname" />
+    <result column="pd_inwhid" jdbcType="INTEGER" property="pd_inwhid" />
+    <result column="pd_inwhcode" jdbcType="VARCHAR" property="pd_inwhcode" />
+    <result column="pd_inwhname" jdbcType="VARCHAR" property="pd_inwhname" />
+    <result column="pd_orderid" jdbcType="INTEGER" property="pd_orderid" />
+    <result column="pd_sdid" jdbcType="INTEGER" property="pd_sdid" />
+    <result column="pd_status" jdbcType="INTEGER" property="pd_status" />
+    <result column="companyid" jdbcType="INTEGER" property="companyId" />
+    <result column="updaterid" jdbcType="INTEGER" property="updaterId" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="pd_text1" jdbcType="VARCHAR" property="pd_text1" />
+    <result column="pd_text2" jdbcType="VARCHAR" property="pd_text2" />
+    <result column="pd_text3" jdbcType="VARCHAR" property="pd_text3" />
+    <result column="pd_text4" jdbcType="VARCHAR" property="pd_text4" />
+    <result column="pd_text5" jdbcType="VARCHAR" property="pd_text5" />
+    <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
+    <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
+    <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
+
+  </resultMap>
+
+
+  <select id="selectProdInOutListByCondition" parameterType="com.usoftchina.saas.storage.dto.ProdInOutReqDTO" resultMap="BaseResultMap">
+    select  *  from prodinout left join prodiodetail on pi_id = pd_piid
+    <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>
+      <if test="keyword != null">
+        AND ${keyword}
+      </if>
+    </where>
+  </select>
+
+  <select id="selectProdInOutBycondition" parameterType="com.usoftchina.saas.storage.dto.ProdInOutReqDTO" resultMap="BaseResultMap">
+    select  *  from prodinout
+    <where>
+      <if test="begin != null">
+        pu_date &gt;= ${begin}
+      </if>
+      <if test="end!= null">
+        AND  pu_date &lt;= ${end}
+      </if>
+      <if test="status != null">
+        AND pu_status=${status}
+      </if>
+      <if test="keyword != null">
+        AND ${keyword}
+      </if>
+    </where>
+  </select>
+
+
+
+
+</mapper>

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

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

base-servers/account/account-server/src/main/resources/application.yml

@@ -7,23 +7,8 @@ spring:
     user:
       name: admin
       password: select111***
-  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
   datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://192.168.253.12:3306/saas_account?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
@@ -46,7 +31,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
 server:
   port: 8580
   tomcat:

frontend/saas-web/app/util/FormUtil.js

@@ -115,7 +115,7 @@ Ext.define('saas.util.FormUtil', {
         }else{
             //取后台编号
             me.BaseUtil.request({
-                url: 'http://192.168.253.58:8900/number/getMaxnumber',
+                url: 'http://192.168.253.228:8900/number/getMaxnumber',
                 params: {
                     caller:form.caller
                 },

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -10,6 +10,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     columnWidth : 1.0, 
 
     requires: [
+        'Ext.grid.plugin.CellEditing',
         'Ext.selection.CellModel'
     ],
 

frontend/saas-web/app/view/core/grid/GridPanel.js

@@ -1,17 +0,0 @@
-Ext.define('saas.view.core.grid.GridPanel', {
-    extend: 'Ext.grid.Panel',
-    xtype: 'core-gridpanel',
-
-    GridUtil: Ext.create('saas.util.GridUtil'),
-
-    controller: 'core-grid-gridpanel',
-
-    configUrl: '',
-    dataUrl: '',
-
-    initComponent: function() {
-        var me = this;
-        me.configUrl && me.GridUtil.setColumns(me, me.configUrl);
-        me.callParent(arguments);
-    }
-});

frontend/saas-web/app/view/core/grid/GridPanelController.js

@@ -1,38 +0,0 @@
-Ext.define('saas.view.core.grid.GridPanelController', {
-    extend: 'Ext.app.ViewController',
-    alias: 'controller.core-grid-gridpanel',
-
-    control: {
-        'grid': {
-            afterSetColumns: '_initLoadData',
-            // itemClick: '_openDetail',
-        }
-    },
-
-    _initLoadData: function() {
-        var me = this,
-            grid = me.getView(),
-            GridUtil = grid.GridUtil,
-            dataUrl = grid.dataUrl;
-        
-        dataUrl && GridUtil.loadData(grid, dataUrl);
-    },
-
-    _openDetail: function(record) {
-        // console.log('grid1: click.....');
-        // var id = record.get('id');
-        // var mainTab = Ext.getCmp('main-tab-panel');
-        // var title = '采购单明细',
-        // existingItem = mainTab.down('[id=' + id + ']');
-
-        // lastView = mainTab.getActiveTab();
-
-        // if (!existingItem) {
-        //     var form = Ext.create('saas.view.purchase.panel.FormPanel', {
-        //         id,
-        //         title
-        //     });
-        //     mainTab.setActiveTab(mainTab.add(form));
-        // }
-    }
-});

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

@@ -186,6 +186,8 @@ Ext.define('saas.view.core.query.QueryPanel', {
             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 == 'combobox' || xtype == 'combo') {
+            conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {
             conditionValue = value.map(function(v) {
                 return '\'' + v.value + '\'';

frontend/saas-web/app/view/main/Navigation.js

@@ -59,11 +59,11 @@ Ext.define('saas.view.main.Navigation', {
         this.showNavMenu(view, record, item, index, e, eOpts);
     },
 
-    showNavMenu: function (view, record, item, index, e, eOpts) {
+    showNavMenu: function (navView, record, navItem, index, e, eOpts) {
         var me = this,
             recData = record.data,
             menuItems = recData.items || [],
-            itemBox = item.getBoundingClientRect(),
+            itemBox = navItem.getBoundingClientRect(),
             pos = [itemBox.left + itemBox.width, itemBox.top],
             id = recData.id,
             menuId = 'navMenu-' + id,
@@ -114,12 +114,19 @@ Ext.define('saas.view.main.Navigation', {
                         menu.setHeight(menuViewHeight);
                         menu.updateLayout();
 
+                        view.el.dom.addEventListener('mouseenter', function (e) {
+                            menu.navItem.classList.add(menu.navView.overItemCls);
+                        });
+
                         view.el.dom.addEventListener('mouseleave', function (e) {
                             var ex = e.clientX,
                                 ey = e.clientY,
-                                box = menuView.getBoundingClientRect();
+                                box = menuView.getBoundingClientRect(),
+                                navItem = menu.navItem,
+                                navBox = navItem.getBoundingClientRect();
 
-                            if (ey <= box.top || ex >= (box.left + box.width) || ey >= (box.top + box.height) || (ex <= box.left && ey >= (box.top + 64))) {
+                            if (ey <= box.top || ex >= (box.left + box.width) || ey >= (box.top + box.height) || (ex <= box.left && (ey <= navBox.top || ey >= (navBox.top + navBox.height)))) {
+                                menu.navItem.classList.remove(menu.navView.overItemCls);
                                 menu.hide();
                             }
                         });
@@ -140,6 +147,7 @@ Ext.define('saas.view.main.Navigation', {
                                     var tabTitle = text + (type == 'form' ? '' : '查询'),
                                         tabId = 'maintab-' + type + '-' + id;
 
+                                    menu.navItem.classList.remove(menu.navView.overItemCls);
                                     openTab(viewType, tabTitle, tabId);
                                     menu.hide();
                                 });
@@ -156,6 +164,7 @@ Ext.define('saas.view.main.Navigation', {
                                     var tabTitle = text + (type == 'form' ? '' : '查询'),
                                         tabId = 'maintab-' + type + '-' + id;
 
+                                    menu.navItem.classList.remove(menu.navView.overItemCls);
                                     openTab(viewType, tabTitle, tabId);
                                     menu.hide();
                                 });
@@ -165,6 +174,8 @@ Ext.define('saas.view.main.Navigation', {
                 }
             });
             var menu = Ext.create('Ext.menu.Menu', {
+                navView: navView,
+                navItem: navItem,
                 id: menuId,
                 width: window.innerWidth,
                 style: {

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchase.FormPanelController', {
+Ext.define('saas.view.money.paybalance.FormPanelController', {
     extend: 'saas.view.core.form.FormPanelController',
     alias: 'controller.money-paybalance-formpanel',
 

frontend/saas-web/app/view/money/payBalance/FormPanelModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.purchase.purchase.FormPanelModel', {
+Ext.define('saas.view.money.paybalance.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.money-paybalance-formpanel',
 

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -1,11 +1,11 @@
-Ext.define('saas.view.purchase.purchase.QueryPanel', {
+Ext.define('saas.view.money.paybalance.QueryPanel', {
     extend: 'saas.view.core.query.QueryPanel',
-    xtype: 'purchase-purchase-querypanel',
+    xtype: 'money-paybalance-querypanel',
 
-    controller: 'purchase-purchase-querypanel',
-    viewModel: 'purchase-purchase-querypanel',
+    controller: 'money-paybalance-querypanel',
+    viewModel: 'money-paybalance-querypanel',
 
-    viewName: 'purchase-purchase-querypanel',
+    viewName: 'money-paybalance-querypanel',
     
     queryFormItems: [{
         xtype: 'hidden',

frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -1,6 +1,6 @@
-Ext.define('saas.view.purchase.purchase.QueryPanelController', {
+Ext.define('saas.view.money.paybalance.QueryPanelController', {
     extend: 'saas.view.core.query.QueryPanelController',
-    alias: 'controller.purchase-purchase-querypanel',
+    alias: 'controller.money-paybalance-querypanel',
     
     init: function (form) {
         var me = this;

frontend/saas-web/app/view/money/payBalance/QueryPanelModel.js

@@ -1,5 +1,5 @@
-Ext.define('saas.view.purchase.purchase.QueryPanelModel', {
+Ext.define('saas.view.money.paybalance.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.purchase-purchase-querypanel'
+    alias: 'viewmodel.money-paybalance-querypanel'
 
 });

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -101,7 +101,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         addTitle: '采购单',
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'/purchase/purchase/',
+        baseVastUrl: basePath+'purchase/purchase/',
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.otherIn.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.stock-otherin-formpanel',
+    data: {
+        pi_class: '其它入库单'
+     }
 
 });