出入库单据代码优化

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

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

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Bankinformation.java

@@ -2,226 +2,188 @@ package com.usoftchina.saas.document.entities;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class Bankinformation extends CommonBaseEntity {
-    private Integer bkId;
+public class Bankinformation extends CommonBaseEntity implements Serializable {
 
-    private String bkBankcode;
+    private String bk_bankcode;
 
-    private String bkBankname;
+    private String bk_bankname;
 
-    private Date bkDate;
+    private Date bk_date;
 
-    private String bkType;
+    private String bk_type;
 
-    private Double bkBeginamount;
+    private Double bk_beginamount;
 
-    private Double bkThisamount;
+    private Double bk_thisamount;
 
-    private String bkStatus;
+    private String bk_status;
 
-    private String bkStatuscode;
+    private String bk_statuscode;
 
-    private Integer bkRecorderid;
+    private Integer bk_recorderid;
 
-    private String bkRecorder;
+    private String bk_recorder;
 
-    private Date bkRecorddate;
+    private Date bk_recorddate;
 
-    private Integer bkYm;
+    private Integer bk_ym;
 
-    private Integer companyid;
+    private String bk_text1;
 
-    private Integer updaterid;
+    private String bk_text2;
 
-    private Date updatetime;
+    private String bk_text3;
 
-    private String bkText1;
+    private String bk_text4;
 
-    private String bkText2;
+    private String bk_text5;
 
-    private String bkText3;
+    private String bk_remark;
 
-    private String bkText4;
-
-    private String bkText5;
-
-    private String bkRemark;
-
-    public Integer getBkId() {
-        return bkId;
-    }
-
-    public void setBkId(Integer bkId) {
-        this.bkId = bkId;
-    }
-
-    public String getBkBankcode() {
-        return bkBankcode;
-    }
-
-    public void setBkBankcode(String bkBankcode) {
-        this.bkBankcode = bkBankcode == null ? null : bkBankcode.trim();
-    }
-
-    public String getBkBankname() {
-        return bkBankname;
-    }
-
-    public void setBkBankname(String bkBankname) {
-        this.bkBankname = bkBankname == null ? null : bkBankname.trim();
-    }
-
-    public Date getBkDate() {
-        return bkDate;
-    }
-
-    public void setBkDate(Date bkDate) {
-        this.bkDate = bkDate;
-    }
-
-    public String getBkType() {
-        return bkType;
+    public String getBk_bankcode() {
+        return bk_bankcode;
     }
 
-    public void setBkType(String bkType) {
-        this.bkType = bkType == null ? null : bkType.trim();
+    public void setBk_bankcode(String bk_bankcode) {
+        this.bk_bankcode = bk_bankcode;
     }
 
-    public Double getBkBeginamount() {
-        return bkBeginamount;
+    public String getBk_bankname() {
+        return bk_bankname;
     }
 
-    public void setBkBeginamount(Double bkBeginamount) {
-        this.bkBeginamount = bkBeginamount;
+    public void setBk_bankname(String bk_bankname) {
+        this.bk_bankname = bk_bankname;
     }
 
-    public Double getBkThisamount() {
-        return bkThisamount;
+    public Date getBk_date() {
+        return bk_date;
     }
 
-    public void setBkThisamount(Double bkThisamount) {
-        this.bkThisamount = bkThisamount;
+    public void setBk_date(Date bk_date) {
+        this.bk_date = bk_date;
     }
 
-    public String getBkStatus() {
-        return bkStatus;
+    public String getBk_type() {
+        return bk_type;
     }
 
-    public void setBkStatus(String bkStatus) {
-        this.bkStatus = bkStatus == null ? null : bkStatus.trim();
+    public void setBk_type(String bk_type) {
+        this.bk_type = bk_type;
     }
 
-    public String getBkStatuscode() {
-        return bkStatuscode;
+    public Double getBk_beginamount() {
+        return bk_beginamount;
     }
 
-    public void setBkStatuscode(String bkStatuscode) {
-        this.bkStatuscode = bkStatuscode == null ? null : bkStatuscode.trim();
+    public void setBk_beginamount(Double bk_beginamount) {
+        this.bk_beginamount = bk_beginamount;
     }
 
-    public Integer getBkRecorderid() {
-        return bkRecorderid;
+    public Double getBk_thisamount() {
+        return bk_thisamount;
     }
 
-    public void setBkRecorderid(Integer bkRecorderid) {
-        this.bkRecorderid = bkRecorderid;
+    public void setBk_thisamount(Double bk_thisamount) {
+        this.bk_thisamount = bk_thisamount;
     }
 
-    public String getBkRecorder() {
-        return bkRecorder;
+    public String getBk_status() {
+        return bk_status;
     }
 
-    public void setBkRecorder(String bkRecorder) {
-        this.bkRecorder = bkRecorder == null ? null : bkRecorder.trim();
+    public void setBk_status(String bk_status) {
+        this.bk_status = bk_status;
     }
 
-    public Date getBkRecorddate() {
-        return bkRecorddate;
+    public String getBk_statuscode() {
+        return bk_statuscode;
     }
 
-    public void setBkRecorddate(Date bkRecorddate) {
-        this.bkRecorddate = bkRecorddate;
+    public void setBk_statuscode(String bk_statuscode) {
+        this.bk_statuscode = bk_statuscode;
     }
 
-    public Integer getBkYm() {
-        return bkYm;
+    public Integer getBk_recorderid() {
+        return bk_recorderid;
     }
 
-    public void setBkYm(Integer bkYm) {
-        this.bkYm = bkYm;
+    public void setBk_recorderid(Integer bk_recorderid) {
+        this.bk_recorderid = bk_recorderid;
     }
 
-    public Integer getCompanyid() {
-        return companyid;
+    public String getBk_recorder() {
+        return bk_recorder;
     }
 
-    public void setCompanyid(Integer companyid) {
-        this.companyid = companyid;
+    public void setBk_recorder(String bk_recorder) {
+        this.bk_recorder = bk_recorder;
     }
 
-    public Integer getUpdaterid() {
-        return updaterid;
+    public Date getBk_recorddate() {
+        return bk_recorddate;
     }
 
-    public void setUpdaterid(Integer updaterid) {
-        this.updaterid = updaterid;
+    public void setBk_recorddate(Date bk_recorddate) {
+        this.bk_recorddate = bk_recorddate;
     }
 
-    public Date getUpdatetime() {
-        return updatetime;
+    public Integer getBk_ym() {
+        return bk_ym;
     }
 
-    public void setUpdatetime(Date updatetime) {
-        this.updatetime = updatetime;
+    public void setBk_ym(Integer bk_ym) {
+        this.bk_ym = bk_ym;
     }
 
-    public String getBkText1() {
-        return bkText1;
+    public String getBk_text1() {
+        return bk_text1;
     }
 
-    public void setBkText1(String bkText1) {
-        this.bkText1 = bkText1 == null ? null : bkText1.trim();
+    public void setBk_text1(String bk_text1) {
+        this.bk_text1 = bk_text1;
     }
 
-    public String getBkText2() {
-        return bkText2;
+    public String getBk_text2() {
+        return bk_text2;
     }
 
-    public void setBkText2(String bkText2) {
-        this.bkText2 = bkText2 == null ? null : bkText2.trim();
+    public void setBk_text2(String bk_text2) {
+        this.bk_text2 = bk_text2;
     }
 
-    public String getBkText3() {
-        return bkText3;
+    public String getBk_text3() {
+        return bk_text3;
     }
 
-    public void setBkText3(String bkText3) {
-        this.bkText3 = bkText3 == null ? null : bkText3.trim();
+    public void setBk_text3(String bk_text3) {
+        this.bk_text3 = bk_text3;
     }
 
-    public String getBkText4() {
-        return bkText4;
+    public String getBk_text4() {
+        return bk_text4;
     }
 
-    public void setBkText4(String bkText4) {
-        this.bkText4 = bkText4 == null ? null : bkText4.trim();
+    public void setBk_text4(String bk_text4) {
+        this.bk_text4 = bk_text4;
     }
 
-    public String getBkText5() {
-        return bkText5;
+    public String getBk_text5() {
+        return bk_text5;
     }
 
-    public void setBkText5(String bkText5) {
-        this.bkText5 = bkText5 == null ? null : bkText5.trim();
+    public void setBk_text5(String bk_text5) {
+        this.bk_text5 = bk_text5;
     }
 
-    public String getBkRemark() {
-        return bkRemark;
+    public String getBk_remark() {
+        return bk_remark;
     }
 
-    public void setBkRemark(String bkRemark) {
-        this.bkRemark = bkRemark == null ? null : bkRemark.trim();
+    public void setBk_remark(String bk_remark) {
+        this.bk_remark = bk_remark;
     }
 }

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

@@ -6,6 +6,7 @@ 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;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @SpringBootApplication
@@ -14,10 +15,18 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @EnableTransactionManagement
 @EnableFeignClients("com.usoftchina.saas")
 @MapperScan("com.usoftchina.saas.document.mapper")
-public class DocumentApplication{
-
+public class DocumentApplication extends WebMvcConfigurerAdapter {
     public static void main(String[] args) {
-        SpringApplication.run(DocumentApplication.class);
+        SpringApplication.run(DocumentApplication.class, args);
+    }
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+
+        registry.addMapping("/**")
+                .allowCredentials(true)
+                .allowedHeaders("*")
+                .allowedOrigins("*")
+                .allowedMethods("*");
     }
 
 }

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

@@ -25,7 +25,7 @@ public class BankinformationController {
     }
 
     @PostMapping("/delete/{id}")
-    public Result delete(@PathVariable("id") int id){
+    public Result delete(@PathVariable("id")int id){
         bankinformationService.removeByPrimaryKey(id);
         return Result.success();
     }

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
-import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.service.WarehouseService;
 import com.usoftchina.saas.page.PageRequest;
@@ -81,6 +80,14 @@ public class WarehouseController {
         return Result.success(result);
     }
 
+    /**
+     * 获取列表
+     * @return
+     */
+    @GetMapping("/list")
+    public Result getList(){
+        return Result.success(warehouseService.selectAll());
+    }
 
     /**
      * 关闭

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

@@ -6,7 +6,7 @@ import com.usoftchina.saas.document.entities.Bankinformation;
 public interface BankinformationMapper extends CommonBaseMapper<Bankinformation> {
     int deleteByPrimaryKey(Integer bkId);
 
-    int insert(Bankinformation record);
+    Long insert(Bankinformation record);
 
     int insertSelective(Bankinformation record);
 

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

@@ -27,7 +27,7 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
     void unPost(Map<String, Object> map);
 
-    List<Warehouse> selectWarehouseListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    List<Warehouse> selectAll(@Param("companyId") Long companyId);
 
     int validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
 

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

@@ -12,4 +12,6 @@ public interface BankinformationService extends CommonBaseService<Bankinformatio
     boolean save(Bankinformation bankinformation);
 
     boolean removeByPrimaryKey(int id);
+
+
 }

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

@@ -2,13 +2,12 @@ package com.usoftchina.saas.document.service;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseService;
-import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
-import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
 import com.usoftchina.saas.page.PageRequest;
 
+import java.util.List;
 import java.util.Map;
 
 public interface WarehouseService extends CommonBaseService<WarehouseMapper, Warehouse> {
@@ -22,7 +21,8 @@ public interface WarehouseService extends CommonBaseService<WarehouseMapper, War
     DocBaseDTO insertSelective(Warehouse record);
 
     void unPost(Map<String, Object> map);
-    
+
+    List<Warehouse> selectAll();
 
     /**
      * 关闭

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

@@ -18,7 +18,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
 
     @Override
     public boolean save(Bankinformation bankinformation){
-        if(bankinformation.getBkId() == 0){
+        if(bankinformation.getId() == 0){
             bankinformationMapper.insertSelective(bankinformation);
         }else{
             bankinformationMapper.updateByPrimaryKeySelective(bankinformation);

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

@@ -7,7 +7,6 @@ import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
-import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
@@ -16,10 +15,10 @@ import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
 import com.usoftchina.saas.document.service.WarehouseService;
 import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.print.Doc;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -56,7 +55,7 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         if (null == con) {
             con = "1=1";
         }
-        list = getMapper().selectWarehouseListByCondition(con, companyId);
+        list = getMapper().selectCustomerListByCondition(con, companyId);
         return list;
     }
 
@@ -128,6 +127,10 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         getMapper().unPost(map);
     }
 
+    @Override
+    public List<Warehouse> selectAll() {
+        return getMapper().selectAll(BaseContextHolder.getCompanyId());
+    }
 
     @Override
     public DocBaseDTO close(Long id) {

applications/document/document-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}@127.0.0.1:8500/eureka/
 server:
   port: 9480
   tomcat:

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

@@ -2,35 +2,35 @@
 <!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.BankinformationMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Bankinformation" >
-    <id column="bk_id" property="bkId" jdbcType="INTEGER" />
-    <result column="bk_bankcode" property="bkBankcode" jdbcType="VARCHAR" />
-    <result column="bk_bankname" property="bkBankname" jdbcType="VARCHAR" />
-    <result column="bk_date" property="bkDate" jdbcType="TIMESTAMP" />
-    <result column="bk_type" property="bkType" jdbcType="VARCHAR" />
-    <result column="bk_beginamount" property="bkBeginamount" jdbcType="DOUBLE" />
-    <result column="bk_thisamount" property="bkThisamount" jdbcType="DOUBLE" />
-    <result column="bk_status" property="bkStatus" jdbcType="VARCHAR" />
-    <result column="bk_statuscode" property="bkStatuscode" jdbcType="VARCHAR" />
-    <result column="bk_recorderid" property="bkRecorderid" jdbcType="INTEGER" />
-    <result column="bk_recorder" property="bkRecorder" jdbcType="VARCHAR" />
-    <result column="bk_recorddate" property="bkRecorddate" jdbcType="TIMESTAMP" />
-    <result column="bk_ym" property="bkYm" jdbcType="INTEGER" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
-    <result column="updaterid" property="updaterid" jdbcType="INTEGER" />
-    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
-    <result column="bk_text1" property="bkText1" jdbcType="VARCHAR" />
-    <result column="bk_text2" property="bkText2" jdbcType="VARCHAR" />
-    <result column="bk_text3" property="bkText3" jdbcType="VARCHAR" />
-    <result column="bk_text4" property="bkText4" jdbcType="VARCHAR" />
-    <result column="bk_text5" property="bkText5" jdbcType="VARCHAR" />
+    <id column="bk_id" property="id" jdbcType="INTEGER" />
+    <result column="bk_bankcode" property="bk_bankcode" jdbcType="VARCHAR" />
+    <result column="bk_bankname" property="bk_bankname" jdbcType="VARCHAR" />
+    <result column="bk_date" property="bk_date" jdbcType="TIMESTAMP" />
+    <result column="bk_type" property="bk_type" jdbcType="VARCHAR" />
+    <result column="bk_beginamount" property="bk_beginamount" jdbcType="DOUBLE" />
+    <result column="bk_thisamount" property="bk_thisamount" jdbcType="DOUBLE" />
+    <result column="bk_status" property="bk_status" jdbcType="VARCHAR" />
+    <result column="bk_statuscode" property="bk_statuscode" jdbcType="VARCHAR" />
+    <result column="bk_recorderid" property="bk_recorderid" jdbcType="INTEGER" />
+    <result column="bk_recorder" property="bk_recorder" jdbcType="VARCHAR" />
+    <result column="bk_recorddate" property="bk_recorddate" jdbcType="TIMESTAMP" />
+    <result column="bk_ym" property="bk_ym" jdbcType="INTEGER" />
+    <result column="companyid" property="companyId" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="bk_text1" property="bk_text1" jdbcType="VARCHAR" />
+    <result column="bk_text2" property="bk_text2" jdbcType="VARCHAR" />
+    <result column="bk_text3" property="bk_text3" jdbcType="VARCHAR" />
+    <result column="bk_text4" property="bk_text4" jdbcType="VARCHAR" />
+    <result column="bk_text5" property="bk_text5" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.document.entities.Bankinformation" extends="BaseResultMap" >
-    <result column="bk_remark" property="bkRemark" jdbcType="LONGVARCHAR" />
+    <result column="bk_remark" property="bk_remark" jdbcType="LONGVARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount, 
     bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid, 
-    updaterid, updatetime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5
+    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5
   </sql>
   <sql id="Blob_Column_List" >
     bk_remark
@@ -41,237 +41,231 @@
     ,
     <include refid="Blob_Column_List" />
     from bankinformation
-    where bk_id = #{bkId,jdbcType=INTEGER}
+    where bk_id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from bankinformation
-    where bk_id = #{bkId,jdbcType=INTEGER}
+    where bk_id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     insert into bankinformation (bk_id, bk_bankcode, bk_bankname, 
       bk_date, bk_type, bk_beginamount, 
       bk_thisamount, bk_status, bk_statuscode, 
       bk_recorderid, bk_recorder, bk_recorddate, 
-      bk_ym, companyid, updaterid, 
-      updatetime, bk_text1, bk_text2, 
+      bk_ym, companyid, updaterId, 
+      updateTime, bk_text1, bk_text2, 
       bk_text3, bk_text4, bk_text5, 
       bk_remark)
-    values (#{bkId,jdbcType=INTEGER}, #{bkBankcode,jdbcType=VARCHAR}, #{bkBankname,jdbcType=VARCHAR}, 
-      #{bkDate,jdbcType=TIMESTAMP}, #{bkType,jdbcType=VARCHAR}, #{bkBeginamount,jdbcType=DOUBLE}, 
-      #{bkThisamount,jdbcType=DOUBLE}, #{bkStatus,jdbcType=VARCHAR}, #{bkStatuscode,jdbcType=VARCHAR}, 
-      #{bkRecorderid,jdbcType=INTEGER}, #{bkRecorder,jdbcType=VARCHAR}, #{bkRecorddate,jdbcType=TIMESTAMP}, 
-      #{bkYm,jdbcType=INTEGER}, #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
-      #{updatetime,jdbcType=TIMESTAMP}, #{bkText1,jdbcType=VARCHAR}, #{bkText2,jdbcType=VARCHAR}, 
-      #{bkText3,jdbcType=VARCHAR}, #{bkText4,jdbcType=VARCHAR}, #{bkText5,jdbcType=VARCHAR}, 
-      #{bkRemark,jdbcType=LONGVARCHAR})
+    values (#{bk_bankcode,jdbcType=VARCHAR}, #{bk_bankname,jdbcType=VARCHAR},
+      #{bk_date,jdbcType=TIMESTAMP}, #{bk_type,jdbcType=VARCHAR}, #{bk_beginamount,jdbcType=DOUBLE},
+      #{bk_thisamount,jdbcType=DOUBLE}, #{bk_status,jdbcType=VARCHAR}, #{bk_statuscode,jdbcType=VARCHAR},
+      #{bk_recorderid,jdbcType=INTEGER}, #{bk_recorder,jdbcType=VARCHAR}, #{bk_recorddate,jdbcType=TIMESTAMP},
+      #{bk_ym,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
+      #{updateTime,jdbcType=TIMESTAMP}, #{bk_text1,jdbcType=VARCHAR}, #{bk_text2,jdbcType=VARCHAR},
+      #{bk_text3,jdbcType=VARCHAR}, #{bk_text4,jdbcType=VARCHAR}, #{bk_text5,jdbcType=VARCHAR},
+      #{bk_remark,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     insert into bankinformation
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="bkId != null" >
-        bk_id,
-      </if>
-      <if test="bkBankcode != null" >
+      <if test="bk_bankcode != null" >
         bk_bankcode,
       </if>
-      <if test="bkBankname != null" >
+      <if test="bk_bankname != null" >
         bk_bankname,
       </if>
-      <if test="bkDate != null" >
+      <if test="bk_date != null" >
         bk_date,
       </if>
-      <if test="bkType != null" >
+      <if test="bk_type != null" >
         bk_type,
       </if>
-      <if test="bkBeginamount != null" >
+      <if test="bk_beginamount != null" >
         bk_beginamount,
       </if>
-      <if test="bkThisamount != null" >
+      <if test="bk_thisamount != null" >
         bk_thisamount,
       </if>
-      <if test="bkStatus != null" >
+      <if test="bk_status != null" >
         bk_status,
       </if>
-      <if test="bkStatuscode != null" >
+      <if test="bk_statuscode != null" >
         bk_statuscode,
       </if>
-      <if test="bkRecorderid != null" >
+      <if test="bk_recorderid != null" >
         bk_recorderid,
       </if>
-      <if test="bkRecorder != null" >
+      <if test="bk_recorder != null" >
         bk_recorder,
       </if>
-      <if test="bkRecorddate != null" >
+      <if test="bk_recorddate != null" >
         bk_recorddate,
       </if>
-      <if test="bkYm != null" >
+      <if test="bk_ym != null" >
         bk_ym,
       </if>
-      <if test="companyid != null" >
+      <if test="companyId != null" >
         companyid,
       </if>
-      <if test="updaterid != null" >
-        updaterid,
+      <if test="updaterId != null" >
+        updaterId,
       </if>
-      <if test="updatetime != null" >
-        updatetime,
+      <if test="updateTime != null" >
+        updateTime,
       </if>
-      <if test="bkText1 != null" >
+      <if test="bk_text1 != null" >
         bk_text1,
       </if>
-      <if test="bkText2 != null" >
+      <if test="bk_text2 != null" >
         bk_text2,
       </if>
-      <if test="bkText3 != null" >
+      <if test="bk_text3 != null" >
         bk_text3,
       </if>
-      <if test="bkText4 != null" >
+      <if test="bk_text4 != null" >
         bk_text4,
       </if>
-      <if test="bkText5 != null" >
+      <if test="bk_text5 != null" >
         bk_text5,
       </if>
-      <if test="bkRemark != null" >
+      <if test="bk_remark != null" >
         bk_remark,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="bkId != null" >
-        #{bkId,jdbcType=INTEGER},
+      <if test="bk_bankcode != null" >
+        #{bk_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="bkBankcode != null" >
-        #{bkBankcode,jdbcType=VARCHAR},
+      <if test="bk_bankname != null" >
+        #{bk_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="bkBankname != null" >
-        #{bkBankname,jdbcType=VARCHAR},
+      <if test="bk_date != null" >
+        #{bk_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="bkDate != null" >
-        #{bkDate,jdbcType=TIMESTAMP},
+      <if test="bk_type != null" >
+        #{bk_type,jdbcType=VARCHAR},
       </if>
-      <if test="bkType != null" >
-        #{bkType,jdbcType=VARCHAR},
+      <if test="bk_beginamount != null" >
+        #{bk_beginamount,jdbcType=DOUBLE},
       </if>
-      <if test="bkBeginamount != null" >
-        #{bkBeginamount,jdbcType=DOUBLE},
+      <if test="bk_thisamount != null" >
+        #{bk_thisamount,jdbcType=DOUBLE},
       </if>
-      <if test="bkThisamount != null" >
-        #{bkThisamount,jdbcType=DOUBLE},
+      <if test="bk_status != null" >
+        #{bk_status,jdbcType=VARCHAR},
       </if>
-      <if test="bkStatus != null" >
-        #{bkStatus,jdbcType=VARCHAR},
+      <if test="bk_statuscode != null" >
+        #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bkStatuscode != null" >
-        #{bkStatuscode,jdbcType=VARCHAR},
+      <if test="bk_recorderid != null" >
+        #{bk_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="bkRecorderid != null" >
-        #{bkRecorderid,jdbcType=INTEGER},
+      <if test="bk_recorder != null" >
+        #{bk_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="bkRecorder != null" >
-        #{bkRecorder,jdbcType=VARCHAR},
+      <if test="bk_recorddate != null" >
+        #{bk_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="bkRecorddate != null" >
-        #{bkRecorddate,jdbcType=TIMESTAMP},
+      <if test="bk_ym != null" >
+        #{bk_ym,jdbcType=INTEGER},
       </if>
-      <if test="bkYm != null" >
-        #{bkYm,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updaterid != null" >
-        #{updaterid,jdbcType=INTEGER},
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updatetime != null" >
-        #{updatetime,jdbcType=TIMESTAMP},
+      <if test="bk_text1 != null" >
+        #{bk_text1,jdbcType=VARCHAR},
       </if>
-      <if test="bkText1 != null" >
-        #{bkText1,jdbcType=VARCHAR},
+      <if test="bk_text2 != null" >
+        #{bk_text2,jdbcType=VARCHAR},
       </if>
-      <if test="bkText2 != null" >
-        #{bkText2,jdbcType=VARCHAR},
+      <if test="bk_text3 != null" >
+        #{bk_text3,jdbcType=VARCHAR},
       </if>
-      <if test="bkText3 != null" >
-        #{bkText3,jdbcType=VARCHAR},
+      <if test="bk_text4 != null" >
+        #{bk_text4,jdbcType=VARCHAR},
       </if>
-      <if test="bkText4 != null" >
-        #{bkText4,jdbcType=VARCHAR},
+      <if test="bk_text5 != null" >
+        #{bk_text5,jdbcType=VARCHAR},
       </if>
-      <if test="bkText5 != null" >
-        #{bkText5,jdbcType=VARCHAR},
-      </if>
-      <if test="bkRemark != null" >
-        #{bkRemark,jdbcType=LONGVARCHAR},
+      <if test="bk_remark != null" >
+        #{bk_remark,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     update bankinformation
     <set >
-      <if test="bkBankcode != null" >
-        bk_bankcode = #{bkBankcode,jdbcType=VARCHAR},
+      <if test="bk_bankcode != null" >
+        bk_bankcode = #{bk_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="bkBankname != null" >
-        bk_bankname = #{bkBankname,jdbcType=VARCHAR},
+      <if test="bk_bankname != null" >
+        bk_bankname = #{bk_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="bkDate != null" >
-        bk_date = #{bkDate,jdbcType=TIMESTAMP},
+      <if test="bk_date != null" >
+        bk_date = #{bk_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="bkType != null" >
-        bk_type = #{bkType,jdbcType=VARCHAR},
+      <if test="bk_type != null" >
+        bk_type = #{bk_type,jdbcType=VARCHAR},
       </if>
-      <if test="bkBeginamount != null" >
-        bk_beginamount = #{bkBeginamount,jdbcType=DOUBLE},
+      <if test="bk_beginamount != null" >
+        bk_beginamount = #{bk_beginamount,jdbcType=DOUBLE},
       </if>
-      <if test="bkThisamount != null" >
-        bk_thisamount = #{bkThisamount,jdbcType=DOUBLE},
+      <if test="bk_thisamount != null" >
+        bk_thisamount = #{bk_thisamount,jdbcType=DOUBLE},
       </if>
-      <if test="bkStatus != null" >
-        bk_status = #{bkStatus,jdbcType=VARCHAR},
+      <if test="bk_status != null" >
+        bk_status = #{bk_status,jdbcType=VARCHAR},
       </if>
-      <if test="bkStatuscode != null" >
-        bk_statuscode = #{bkStatuscode,jdbcType=VARCHAR},
+      <if test="bk_statuscode != null" >
+        bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bkRecorderid != null" >
-        bk_recorderid = #{bkRecorderid,jdbcType=INTEGER},
+      <if test="bk_recorderid != null" >
+        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="bkRecorder != null" >
-        bk_recorder = #{bkRecorder,jdbcType=VARCHAR},
+      <if test="bk_recorder != null" >
+        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="bkRecorddate != null" >
-        bk_recorddate = #{bkRecorddate,jdbcType=TIMESTAMP},
+      <if test="bk_recorddate != null" >
+        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="bkYm != null" >
-        bk_ym = #{bkYm,jdbcType=INTEGER},
+      <if test="bk_ym != null" >
+        bk_ym = #{bk_ym,jdbcType=INTEGER},
       </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 test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatetime != null" >
-        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="bkText1 != null" >
-        bk_text1 = #{bkText1,jdbcType=VARCHAR},
+      <if test="bk_text1 != null" >
+        bk_text1 = #{bk_text1,jdbcType=VARCHAR},
       </if>
-      <if test="bkText2 != null" >
-        bk_text2 = #{bkText2,jdbcType=VARCHAR},
+      <if test="bk_text2 != null" >
+        bk_text2 = #{bk_text2,jdbcType=VARCHAR},
       </if>
-      <if test="bkText3 != null" >
-        bk_text3 = #{bkText3,jdbcType=VARCHAR},
+      <if test="bk_text3 != null" >
+        bk_text3 = #{bk_text3,jdbcType=VARCHAR},
       </if>
-      <if test="bkText4 != null" >
-        bk_text4 = #{bkText4,jdbcType=VARCHAR},
+      <if test="bk_text4 != null" >
+        bk_text4 = #{bk_text4,jdbcType=VARCHAR},
       </if>
-      <if test="bkText5 != null" >
-        bk_text5 = #{bkText5,jdbcType=VARCHAR},
+      <if test="bk_text5 != null" >
+        bk_text5 = #{bk_text5,jdbcType=VARCHAR},
       </if>
-      <if test="bkRemark != null" >
-        bk_remark = #{bkRemark,jdbcType=LONGVARCHAR},
+      <if test="bk_remark != null" >
+        bk_remark = #{bk_remark,jdbcType=LONGVARCHAR},
       </if>
     </set>
-    where bk_id = #{bkId,jdbcType=INTEGER}
+    where bk_id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     update bankinformation
@@ -287,9 +281,9 @@
       bk_recorder = #{bkRecorder,jdbcType=VARCHAR},
       bk_recorddate = #{bkRecorddate,jdbcType=TIMESTAMP},
       bk_ym = #{bkYm,jdbcType=INTEGER},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updaterid = #{updaterid,jdbcType=INTEGER},
-      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      companyid = #{companyId,jdbcType=INTEGER},
+      updaterId = #{updaterId,jdbcType=INTEGER},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
       bk_text1 = #{bkText1,jdbcType=VARCHAR},
       bk_text2 = #{bkText2,jdbcType=VARCHAR},
       bk_text3 = #{bkText3,jdbcType=VARCHAR},
@@ -312,15 +306,15 @@
       bk_recorder = #{bkRecorder,jdbcType=VARCHAR},
       bk_recorddate = #{bkRecorddate,jdbcType=TIMESTAMP},
       bk_ym = #{bkYm,jdbcType=INTEGER},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updaterid = #{updaterid,jdbcType=INTEGER},
-      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      companyid = #{companyId,jdbcType=INTEGER},
+      updaterId = #{updaterId,jdbcType=INTEGER},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
       bk_text1 = #{bkText1,jdbcType=VARCHAR},
       bk_text2 = #{bkText2,jdbcType=VARCHAR},
       bk_text3 = #{bkText3,jdbcType=VARCHAR},
       bk_text4 = #{bkText4,jdbcType=VARCHAR},
       bk_text5 = #{bkText5,jdbcType=VARCHAR}
-    where bk_id = #{bkId,jdbcType=INTEGER}
+    where bk_id = #{bk_id,jdbcType=INTEGER}
   </update>
 
   <select id="selectAll" resultMap="BaseResultMap">

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

@@ -309,16 +309,8 @@
         where wh_id = #{wh_id,jdbcType=INTEGER}
     </update>
 
-    <select id="selectWarehouseListByCondition"  resultMap="WarehouseResultMapper">
-        select  *  from Warehouse
-        <where>
-            <if test="con != null">
-                ${con}
-            </if>
-            <if test="companyId != null">
-                and   companyid = #{companyId}
-            </if>
-        </where>  order by wh_id
+    <select id="selectAll" resultType="com.usoftchina.saas.document.entities.Warehouse">
+        SELECT * FROM WAREHOUSE WHERE COMPANYID = #{companyId}
     </select>
 
     <select id="validateCodeWhenInsert" resultType="int">

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

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -14,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verification", description = "核销单")
-public class VerificationDTO extends CommonBaseEntity implements Serializable {
+public class VerificationDTO implements Serializable {
     private Integer vc_id;
 
     private String vc_code;
@@ -57,9 +58,9 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
 
     private Date vc_recorddate;
 
-    private Integer vc_status;
+    private String vc_status;
 
-    private BigDecimal vc_statuscode;
+    private String vc_statuscode;
 
     private String vc_remark;
 
@@ -241,19 +242,19 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
         this.vc_recorddate = vc_recorddate;
     }
 
-    public Integer getVc_status() {
+    public String getVc_status() {
         return vc_status;
     }
 
-    public void setVc_status(Integer vc_status) {
+    public void setVc_status(String vc_status) {
         this.vc_status = vc_status;
     }
 
-    public BigDecimal getVc_statuscode() {
+    public String getVc_statuscode() {
         return vc_statuscode;
     }
 
-    public void setVc_statuscode(BigDecimal vc_statuscode) {
+    public void setVc_statuscode(String vc_statuscode) {
         this.vc_statuscode = vc_statuscode;
     }
 
@@ -304,4 +305,5 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
     public void setVc_text5(String vc_text5) {
         this.vc_text5 = vc_text5 == null ? null : vc_text5.trim();
     }
+
 }

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

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verificationdet", description = "核销单明细一")
-public class VerificationdetDTO extends CommonBaseEntity implements Serializable {
+public class VerificationdetDTO  implements Serializable {
     private Integer vd_id;
 
     private Integer vd_vcid;

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

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verificationdetail", description = "核销单明细二")
-public class VerificationdetailDTO extends CommonBaseEntity implements Serializable {
+public class VerificationdetailDTO implements Serializable {
     private Integer vcd_id;
 
     private Integer vcd_vcid;

applications/money/money-server/pom.xml

@@ -91,6 +91,12 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-server</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -2,6 +2,8 @@ package com.usoftchina.saas.money.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Fundtran;
 import com.usoftchina.saas.money.po.Fundtransfer;
 import com.usoftchina.saas.money.service.FundtransferService;
@@ -14,33 +16,39 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/25 19:21
  **/
 @RestController
-@RequestMapping("/money/fundtransfer")
+@RequestMapping("/fundtransfer")
 public class FundtransferController {
     @Autowired
     private FundtransferService fundtransferService;
 
     @RequestMapping("/save")
     public Result insert(@RequestBody Fundtran body) {
-        int id = fundtransferService.insert(body);
-        return Result.success(id);
+        DocBaseDTO docBaseDTO = fundtransferService.insert(body);
+        return Result.success(docBaseDTO);
     }
 
 
-    @PostMapping("/delete")
-    public Result delete(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") int id){
         fundtransferService.delete(id);
         return Result.success();
     }
 
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
+        fundtransferService.deleteItem(id);
+        return Result.success();
+    }
+
 
-    @GetMapping("/read")
-    public Result read(int id){
+    @GetMapping("/read/{id}")
+    public Result read(@PathVariable("id")int id){
         return Result.success(fundtransferService.select(id));
     }
 
-    @GetMapping("/List")
-    public Result getList(PageRequest page){
-        PageInfo<Fundtransfer> list = fundtransferService.selectList(page);
+    @GetMapping("/list")
+    public Result getList(PageRequest page, ListReqDTO condition){
+        PageInfo<Fundtransfer> list = fundtransferService.selectList(page, condition);
         return Result.success(list);
     }
 

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/24 17:26
  **/
 @RestController
-@RequestMapping("/money/othreceipts")
+@RequestMapping("/othreceipts")
 public class OthreceiptsController {
     @Autowired
     private OthreceiptsService othreceiptsService;
@@ -28,12 +28,17 @@ public class OthreceiptsController {
     }
 
 
-    @PostMapping("/delete")
-    public Result deletePaybalance(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result deletePaybalance(@PathVariable("id") int id){
         othreceiptsService.delete(id);
         return Result.success();
     }
 
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
+        othreceiptsService.deleteItem(id);
+        return Result.success();
+    }
 
     @GetMapping("/read/{id}")
     public Result getPaybalance(@PathVariable("id")int id){

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

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/24 22:15
  **/
 @RestController
-@RequestMapping("/money/othspengdings")
+@RequestMapping("/othspengdings")
 public class OthspengdingsController {
     @Autowired
     private OthspendingsService othspendingsService;
@@ -31,14 +31,14 @@ public class OthspengdingsController {
     }
 
 
-    @PostMapping("/delete")
-    public Result deletePaybalance(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result deletePaybalance(@PathVariable("id") int id){
         othspendingsService.delete(id);
         return Result.success();
     }
 
-    @PostMapping("/deleteItem")
-    public Result deleteItem(@RequestBody int id){
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
         othspendingsService.deleteItem(id);
         return Result.success();
     }

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/22 15:03
  **/
 @RestController
-@RequestMapping("/money/paybalance")
+@RequestMapping("/paybalance")
 public class PaybalanceController {
     @Autowired
     private PaybalanceService paybalanceService;
@@ -28,18 +28,24 @@ public class PaybalanceController {
     }
 
 
-    @PostMapping("/delete")
-    public Result deletePaybalance(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result deletePaybalance(@PathVariable("id") int id){
         paybalanceService.delete(id);
         return Result.success();
     }
 
-    @PostMapping("/deleteItem/")
-    public Result deleteItem(@RequestBody int id){
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
         paybalanceService.deleteItem(id);
         return Result.success();
     }
 
+    @PostMapping("/deleteDetai2/{id}")
+    public Result deleteItems(@PathVariable("id") int id){
+        paybalanceService.deleteItems(id);
+        return Result.success();
+    }
+
     @GetMapping("/read/{id}")
     public Result getPaybalance(@PathVariable("id")int id){
         return Result.success(paybalanceService.select(id));

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/23 15:40
  **/
 @RestController
-@RequestMapping("/money/recbalance")
+@RequestMapping("/recbalance")
 public class RecbalanceContorller {
     @Autowired
     private RecbalanceService recbalanceService;
@@ -25,20 +25,20 @@ public class RecbalanceContorller {
         return Result.success(docBaseDTO);
     }
 
-    @PostMapping("/delete")
-    public Result delete(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") int id){
         recbalanceService.delect(id);
         return Result.success();
     }
 
-    @PostMapping("/deleteItems1")
-    public Result deleteItem(@RequestBody int id){
+    @PostMapping("/deleteDetail1/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
         recbalanceService.deleteItem(id);
         return Result.success();
     }
 
-    @PostMapping("/deleteItems2")
-    public Result deleteItems(@RequestBody int id){
+    @PostMapping("/deleteDetail2/{id}")
+    public Result deleteItems(@PathVariable("id") int id){
         recbalanceService.deleteItems(id);
         return Result.success();
     }

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

@@ -73,6 +73,28 @@ public class VerificationController {
         return Result.success();
     }
 
+    /**
+     * 核销单明细1删除
+     * @param id
+     * @return
+     */
+    @RequestMapping("/deleteDetail1/{id}")
+    public Result deleteDetail1(@PathVariable("id") Long id) {
+        verificationService.deleteDetail1(id);
+        return Result.success();
+    }
+
+    /**
+     * 核销单明细2删除
+     * @param id
+     * @return
+     */
+    @RequestMapping("/deleteDetail2/{id}")
+    public Result deleteDetail2(@PathVariable("id") Long id) {
+        verificationService.deleteDetail2(id);
+        return Result.success();
+    }
+
     @RequestMapping("/audit")
     public Result audit(@RequestBody VerificationFormDTO formDTO) {
         DocSavedDTO audit = verificationService.audit(formDTO);

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

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.money.po.Fundtransfer;
+import com.usoftchina.saas.money.po.Othreceipts;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,4 +20,12 @@ public interface FundtransferMapper {
     int updateByPrimaryKeySelective(Fundtransfer record);
 
     int updateByPrimaryKey(Fundtransfer record);
+
+    Integer validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
+
+    Integer validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id,
+                                   @Param("companyId") Long companyId);
+
+    List<Fundtransfer> selectFundtransferBycondition(@Param("con") String con, @Param("companyId") Long companyId);
+    List<Fundtransfer> selectFundtransferListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -2,6 +2,8 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.money.po.Fundtransferdetail;
 
+import java.util.List;
+
 public interface FundtransferdetailMapper {
     int deleteByPrimaryKey(Integer ftdId);
     int deleteItem(int id);
@@ -10,7 +12,7 @@ public interface FundtransferdetailMapper {
 
     int insertSelective(Fundtransferdetail record);
 
-    Fundtransferdetail selectByPrimaryKey(Integer ftdId);
+    List<Fundtransferdetail> selectByPrimaryKey(Integer ftdId);
 
     int updateByPrimaryKeySelective(Fundtransferdetail record);
 

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

@@ -17,7 +17,7 @@ public interface VerificationMapper extends CommonBaseMapper<Verification> {
 
     int deleteByPrimaryKey(Integer vc_id);
 
-    Long insert(Verification record);
+//    Long insert(Verification record);
 
     int insertSelective(Verification record);
 

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

@@ -17,7 +17,7 @@ public interface VerificationdetMapper extends CommonBaseMapper<Verificationdet>
 
     int deleteByPrimaryKey(Integer vd_id);
 
-    Long insert(Verificationdet record);
+//    Long insert(Verificationdet record);
 
     int insertSelective(Verificationdet record);
 

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

@@ -18,7 +18,7 @@ public interface VerificationdetailMapper extends CommonBaseMapper<Verificationd
 
     int deleteByPrimaryKey(Integer vcd_id);
 
-    Long insert(Verificationdetail record);
+//    Long insert(Verificationdetail record);
 
     int insertSelective(Verificationdetail record);
 

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

@@ -1,128 +1,102 @@
 package com.usoftchina.saas.money.po;
 
-import java.util.Date;
-
-public class Fundtransfer {
-    private Integer ftId;
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
-    private String ftCode;
+import java.io.Serializable;
+import java.util.Date;
 
-    private Date ftDate;
+public class Fundtransfer extends CommonBaseEntity implements Serializable {
 
-    private Integer ftRecorderid;
+    private String ft_code;
 
-    private String ftRecorder;
+    private Date ft_date;
 
-    private Date ftRecorddate;
+    private Integer ft_recorderid;
 
-    private String ftStatus;
+    private String ft_recorder;
 
-    private String ftStatuscode;
+    private Date ft_recorddate;
 
-    private String ftRemark;
+    private String ft_status;
 
-    private Integer companyid;
+    private String ft_statuscode;
 
-    private Integer updaterid;
+    private String ft_remark;
 
     private Date updatedate;
 
-    private String ftText1;
-
-    private String ftText2;
+    private String ft_text1;
 
-    private String ftText3;
+    private String ft_text2;
 
-    private String ftText4;
+    private String ft_text3;
 
-    private String ftText5;
-
-    public Integer getFtId() {
-        return ftId;
-    }
-
-    public void setFtId(Integer ftId) {
-        this.ftId = ftId;
-    }
+    private String ft_text4;
 
-    public String getFtCode() {
-        return ftCode;
-    }
-
-    public void setFtCode(String ftCode) {
-        this.ftCode = ftCode == null ? null : ftCode.trim();
-    }
-
-    public Date getFtDate() {
-        return ftDate;
-    }
-
-    public void setFtDate(Date ftDate) {
-        this.ftDate = ftDate;
-    }
+    private String ft_text5;
 
-    public Integer getFtRecorderid() {
-        return ftRecorderid;
+    public String getFt_code() {
+        return ft_code;
     }
 
-    public void setFtRecorderid(Integer ftRecorderid) {
-        this.ftRecorderid = ftRecorderid;
+    public void setFt_code(String ft_code) {
+        this.ft_code = ft_code;
     }
 
-    public String getFtRecorder() {
-        return ftRecorder;
+    public Date getFt_date() {
+        return ft_date;
     }
 
-    public void setFtRecorder(String ftRecorder) {
-        this.ftRecorder = ftRecorder == null ? null : ftRecorder.trim();
+    public void setFt_date(Date ft_date) {
+        this.ft_date = ft_date;
     }
 
-    public Date getFtRecorddate() {
-        return ftRecorddate;
+    public Integer getFt_recorderid() {
+        return ft_recorderid;
     }
 
-    public void setFtRecorddate(Date ftRecorddate) {
-        this.ftRecorddate = ftRecorddate;
+    public void setFt_recorderid(Integer ft_recorderid) {
+        this.ft_recorderid = ft_recorderid;
     }
 
-    public String getFtStatus() {
-        return ftStatus;
+    public String getFt_recorder() {
+        return ft_recorder;
     }
 
-    public void setFtStatus(String ftStatus) {
-        this.ftStatus = ftStatus == null ? null : ftStatus.trim();
+    public void setFt_recorder(String ft_recorder) {
+        this.ft_recorder = ft_recorder;
     }
 
-    public String getFtStatuscode() {
-        return ftStatuscode;
+    public Date getFt_recorddate() {
+        return ft_recorddate;
     }
 
-    public void setFtStatuscode(String ftStatuscode) {
-        this.ftStatuscode = ftStatuscode == null ? null : ftStatuscode.trim();
+    public void setFt_recorddate(Date ft_recorddate) {
+        this.ft_recorddate = ft_recorddate;
     }
 
-    public String getFtRemark() {
-        return ftRemark;
+    public String getFt_status() {
+        return ft_status;
     }
 
-    public void setFtRemark(String ftRemark) {
-        this.ftRemark = ftRemark == null ? null : ftRemark.trim();
+    public void setFt_status(String ft_status) {
+        this.ft_status = ft_status;
     }
 
-    public Integer getCompanyid() {
-        return companyid;
+    public String getFt_statuscode() {
+        return ft_statuscode;
     }
 
-    public void setCompanyid(Integer companyid) {
-        this.companyid = companyid;
+    public void setFt_statuscode(String ft_statuscode) {
+        this.ft_statuscode = ft_statuscode;
     }
 
-    public Integer getUpdaterid() {
-        return updaterid;
+    public String getFt_remark() {
+        return ft_remark;
     }
 
-    public void setUpdaterid(Integer updaterid) {
-        this.updaterid = updaterid;
+    public void setFt_remark(String ft_remark) {
+        this.ft_remark = ft_remark;
     }
 
     public Date getUpdatedate() {
@@ -133,43 +107,43 @@ public class Fundtransfer {
         this.updatedate = updatedate;
     }
 
-    public String getFtText1() {
-        return ftText1;
+    public String getFt_text1() {
+        return ft_text1;
     }
 
-    public void setFtText1(String ftText1) {
-        this.ftText1 = ftText1 == null ? null : ftText1.trim();
+    public void setFt_text1(String ft_text1) {
+        this.ft_text1 = ft_text1;
     }
 
-    public String getFtText2() {
-        return ftText2;
+    public String getFt_text2() {
+        return ft_text2;
     }
 
-    public void setFtText2(String ftText2) {
-        this.ftText2 = ftText2 == null ? null : ftText2.trim();
+    public void setFt_text2(String ft_text2) {
+        this.ft_text2 = ft_text2;
     }
 
-    public String getFtText3() {
-        return ftText3;
+    public String getFt_text3() {
+        return ft_text3;
     }
 
-    public void setFtText3(String ftText3) {
-        this.ftText3 = ftText3 == null ? null : ftText3.trim();
+    public void setFt_text3(String ft_text3) {
+        this.ft_text3 = ft_text3;
     }
 
-    public String getFtText4() {
-        return ftText4;
+    public String getFt_text4() {
+        return ft_text4;
     }
 
-    public void setFtText4(String ftText4) {
-        this.ftText4 = ftText4 == null ? null : ftText4.trim();
+    public void setFt_text4(String ft_text4) {
+        this.ft_text4 = ft_text4;
     }
 
-    public String getFtText5() {
-        return ftText5;
+    public String getFt_text5() {
+        return ft_text5;
     }
 
-    public void setFtText5(String ftText5) {
-        this.ftText5 = ftText5 == null ? null : ftText5.trim();
+    public void setFt_text5(String ft_text5) {
+        this.ft_text5 = ft_text5;
     }
 }

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

@@ -1,178 +1,152 @@
 package com.usoftchina.saas.money.po;
 
-import java.util.Date;
-
-public class Fundtransferdetail {
-    private Integer ftdId;
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
-    private Integer ftdFtid;
+import java.io.Serializable;
+import java.util.Date;
 
-    private Integer ftdDetno;
+public class Fundtransferdetail extends CommonBaseEntity implements Serializable {
 
-    private Integer ftdYm;
+    private Integer ftd_ftid;
 
-    private Integer ftdBankid;
+    private Integer ftd_detno;
 
-    private String ftdBankcode;
+    private Integer ftd_ym;
 
-    private String ftdBankname;
+    private Integer ftd_bankid;
 
-    private Integer ftdInbankid;
+    private String ftd_bankcode;
 
-    private String ftdInbankcode;
+    private String ftd_bankname;
 
-    private String ftdInbankname;
+    private Integer ftd_inbankid;
 
-    private Double ftdNowbalance;
+    private String ftd_inbankcode;
 
-    private String ftdPaymethod;
+    private String ftd_inbankname;
 
-    private String ftdPaycode;
+    private Double ftd_nowbalance;
 
-    private String ftdRemark;
+    private String ftd_paymethod;
 
-    private Integer companyid;
+    private String ftd_paycode;
 
-    private Integer updaterid;
+    private String ftd_remark;
 
     private Date updatedate;
 
-    private String ftdText1;
-
-    private String ftdText2;
+    private String ftd_text1;
 
-    private String ftdText3;
+    private String ftd_text2;
 
-    private String ftdText4;
+    private String ftd_text3;
 
-    private String ftdText5;
-
-    public Integer getFtdId() {
-        return ftdId;
-    }
-
-    public void setFtdId(Integer ftdId) {
-        this.ftdId = ftdId;
-    }
+    private String ftd_text4;
 
-    public Integer getFtdFtid() {
-        return ftdFtid;
-    }
-
-    public void setFtdFtid(Integer ftdFtid) {
-        this.ftdFtid = ftdFtid;
-    }
-
-    public Integer getFtdDetno() {
-        return ftdDetno;
-    }
-
-    public void setFtdDetno(Integer ftdDetno) {
-        this.ftdDetno = ftdDetno;
-    }
+    private String ftd_text5;
 
-    public Integer getFtdYm() {
-        return ftdYm;
+    public Integer getFtd_ftid() {
+        return ftd_ftid;
     }
 
-    public void setFtdYm(Integer ftdYm) {
-        this.ftdYm = ftdYm;
+    public void setFtd_ftid(Integer ftd_ftid) {
+        this.ftd_ftid = ftd_ftid;
     }
 
-    public Integer getFtdBankid() {
-        return ftdBankid;
+    public Integer getFtd_detno() {
+        return ftd_detno;
     }
 
-    public void setFtdBankid(Integer ftdBankid) {
-        this.ftdBankid = ftdBankid;
+    public void setFtd_detno(Integer ftd_detno) {
+        this.ftd_detno = ftd_detno;
     }
 
-    public String getFtdBankcode() {
-        return ftdBankcode;
+    public Integer getFtd_ym() {
+        return ftd_ym;
     }
 
-    public void setFtdBankcode(String ftdBankcode) {
-        this.ftdBankcode = ftdBankcode == null ? null : ftdBankcode.trim();
+    public void setFtd_ym(Integer ftd_ym) {
+        this.ftd_ym = ftd_ym;
     }
 
-    public String getFtdBankname() {
-        return ftdBankname;
+    public Integer getFtd_bankid() {
+        return ftd_bankid;
     }
 
-    public void setFtdBankname(String ftdBankname) {
-        this.ftdBankname = ftdBankname == null ? null : ftdBankname.trim();
+    public void setFtd_bankid(Integer ftd_bankid) {
+        this.ftd_bankid = ftd_bankid;
     }
 
-    public Integer getFtdInbankid() {
-        return ftdInbankid;
+    public String getFtd_bankcode() {
+        return ftd_bankcode;
     }
 
-    public void setFtdInbankid(Integer ftdInbankid) {
-        this.ftdInbankid = ftdInbankid;
+    public void setFtd_bankcode(String ftd_bankcode) {
+        this.ftd_bankcode = ftd_bankcode;
     }
 
-    public String getFtdInbankcode() {
-        return ftdInbankcode;
+    public String getFtd_bankname() {
+        return ftd_bankname;
     }
 
-    public void setFtdInbankcode(String ftdInbankcode) {
-        this.ftdInbankcode = ftdInbankcode == null ? null : ftdInbankcode.trim();
+    public void setFtd_bankname(String ftd_bankname) {
+        this.ftd_bankname = ftd_bankname;
     }
 
-    public String getFtdInbankname() {
-        return ftdInbankname;
+    public Integer getFtd_inbankid() {
+        return ftd_inbankid;
     }
 
-    public void setFtdInbankname(String ftdInbankname) {
-        this.ftdInbankname = ftdInbankname == null ? null : ftdInbankname.trim();
+    public void setFtd_inbankid(Integer ftd_inbankid) {
+        this.ftd_inbankid = ftd_inbankid;
     }
 
-    public Double getFtdNowbalance() {
-        return ftdNowbalance;
+    public String getFtd_inbankcode() {
+        return ftd_inbankcode;
     }
 
-    public void setFtdNowbalance(Double ftdNowbalance) {
-        this.ftdNowbalance = ftdNowbalance;
+    public void setFtd_inbankcode(String ftd_inbankcode) {
+        this.ftd_inbankcode = ftd_inbankcode;
     }
 
-    public String getFtdPaymethod() {
-        return ftdPaymethod;
+    public String getFtd_inbankname() {
+        return ftd_inbankname;
     }
 
-    public void setFtdPaymethod(String ftdPaymethod) {
-        this.ftdPaymethod = ftdPaymethod == null ? null : ftdPaymethod.trim();
+    public void setFtd_inbankname(String ftd_inbankname) {
+        this.ftd_inbankname = ftd_inbankname;
     }
 
-    public String getFtdPaycode() {
-        return ftdPaycode;
+    public Double getFtd_nowbalance() {
+        return ftd_nowbalance;
     }
 
-    public void setFtdPaycode(String ftdPaycode) {
-        this.ftdPaycode = ftdPaycode == null ? null : ftdPaycode.trim();
+    public void setFtd_nowbalance(Double ftd_nowbalance) {
+        this.ftd_nowbalance = ftd_nowbalance;
     }
 
-    public String getFtdRemark() {
-        return ftdRemark;
+    public String getFtd_paymethod() {
+        return ftd_paymethod;
     }
 
-    public void setFtdRemark(String ftdRemark) {
-        this.ftdRemark = ftdRemark == null ? null : ftdRemark.trim();
+    public void setFtd_paymethod(String ftd_paymethod) {
+        this.ftd_paymethod = ftd_paymethod;
     }
 
-    public Integer getCompanyid() {
-        return companyid;
+    public String getFtd_paycode() {
+        return ftd_paycode;
     }
 
-    public void setCompanyid(Integer companyid) {
-        this.companyid = companyid;
+    public void setFtd_paycode(String ftd_paycode) {
+        this.ftd_paycode = ftd_paycode;
     }
 
-    public Integer getUpdaterid() {
-        return updaterid;
+    public String getFtd_remark() {
+        return ftd_remark;
     }
 
-    public void setUpdaterid(Integer updaterid) {
-        this.updaterid = updaterid;
+    public void setFtd_remark(String ftd_remark) {
+        this.ftd_remark = ftd_remark;
     }
 
     public Date getUpdatedate() {
@@ -183,43 +157,43 @@ public class Fundtransferdetail {
         this.updatedate = updatedate;
     }
 
-    public String getFtdText1() {
-        return ftdText1;
+    public String getFtd_text1() {
+        return ftd_text1;
     }
 
-    public void setFtdText1(String ftdText1) {
-        this.ftdText1 = ftdText1 == null ? null : ftdText1.trim();
+    public void setFtd_text1(String ftd_text1) {
+        this.ftd_text1 = ftd_text1;
     }
 
-    public String getFtdText2() {
-        return ftdText2;
+    public String getFtd_text2() {
+        return ftd_text2;
     }
 
-    public void setFtdText2(String ftdText2) {
-        this.ftdText2 = ftdText2 == null ? null : ftdText2.trim();
+    public void setFtd_text2(String ftd_text2) {
+        this.ftd_text2 = ftd_text2;
     }
 
-    public String getFtdText3() {
-        return ftdText3;
+    public String getFtd_text3() {
+        return ftd_text3;
     }
 
-    public void setFtdText3(String ftdText3) {
-        this.ftdText3 = ftdText3 == null ? null : ftdText3.trim();
+    public void setFtd_text3(String ftd_text3) {
+        this.ftd_text3 = ftd_text3;
     }
 
-    public String getFtdText4() {
-        return ftdText4;
+    public String getFtd_text4() {
+        return ftd_text4;
     }
 
-    public void setFtdText4(String ftdText4) {
-        this.ftdText4 = ftdText4 == null ? null : ftdText4.trim();
+    public void setFtd_text4(String ftd_text4) {
+        this.ftd_text4 = ftd_text4;
     }
 
-    public String getFtdText5() {
-        return ftdText5;
+    public String getFtd_text5() {
+        return ftd_text5;
     }
 
-    public void setFtdText5(String ftdText5) {
-        this.ftdText5 = ftdText5 == null ? null : ftdText5.trim();
+    public void setFtd_text5(String ftd_text5) {
+        this.ftd_text5 = ftd_text5;
     }
 }

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

@@ -216,4 +216,31 @@ public class Othreceipts extends CommonBaseEntity implements Serializable {
     public void setOr_text5(String or_text5) {
         this.or_text5 = or_text5;
     }
+
+    @Override
+    public String toString() {
+        return "Othreceipts{" +
+                "or_code='" + or_code + '\'' +
+                ", or_date=" + or_date +
+                ", or_custid=" + or_custid +
+                ", or_custcode='" + or_custcode + '\'' +
+                ", or_custname='" + or_custname + '\'' +
+                ", or_bankcode='" + or_bankcode + '\'' +
+                ", or_bankid=" + or_bankid +
+                ", or_bankname='" + or_bankname + '\'' +
+                ", or_amount=" + or_amount +
+                ", or_recorderid=" + or_recorderid +
+                ", or_recorder='" + or_recorder + '\'' +
+                ", or_recorddate=" + or_recorddate +
+                ", or_status='" + or_status + '\'' +
+                ", or_statuscode='" + or_statuscode + '\'' +
+                ", or_remark='" + or_remark + '\'' +
+                ", updatedate=" + updatedate +
+                ", or_text1='" + or_text1 + '\'' +
+                ", or_text2='" + or_text2 + '\'' +
+                ", or_text3='" + or_text3 + '\'' +
+                ", or_text4='" + or_text4 + '\'' +
+                ", or_text5='" + or_text5 + '\'' +
+                '}';
+    }
 }

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

@@ -252,24 +252,4 @@ 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/Recbalance.java

@@ -253,23 +253,4 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
         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/Recbalancedet.java

@@ -173,23 +173,4 @@ public class Recbalancedet extends CommonBaseEntity implements Serializable{
         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/Verification.java

@@ -55,9 +55,9 @@ public class Verification extends CommonBaseEntity implements Serializable {
 
     private Date vc_recorddate;
 
-    private Integer vc_status;
+    private String vc_status;
 
-    private BigDecimal vc_statuscode;
+    private String vc_statuscode;
 
     private String vc_remark;
 
@@ -239,19 +239,19 @@ public class Verification extends CommonBaseEntity implements Serializable {
         this.vc_recorddate = vc_recorddate;
     }
 
-    public Integer getVc_status() {
+    public String getVc_status() {
         return vc_status;
     }
 
-    public void setVc_status(Integer vc_status) {
+    public void setVc_status(String vc_status) {
         this.vc_status = vc_status;
     }
 
-    public BigDecimal getVc_statuscode() {
+    public String getVc_statuscode() {
         return vc_statuscode;
     }
 
-    public void setVc_statuscode(BigDecimal vc_statuscode) {
+    public void setVc_statuscode(String vc_statuscode) {
         this.vc_statuscode = vc_statuscode;
     }
 
@@ -313,10 +313,6 @@ public class Verification extends CommonBaseEntity implements Serializable {
 
     }
 
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
 
     @Override
     public void setCompanyId(long companyId) {

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

@@ -102,37 +102,37 @@ public class VerificationList extends CommonBaseEntity implements Serializable {
     private String vd_text4;
 
     private String vd_text5;
-
-    private Integer vcd_id;
-
-    private Integer vcd_vcid;
-
-    private Integer vcd_detno;
-
-    private Integer vcd_ym;
-
-    private Integer vcd_slid;
-
-    private String vcd_slcode;
-
-    private String vcd_slkind;
-
-    private Date vcd_sldate;
-
-    private Double vcd_amount;
-
-    private Double vcd_nowbalance;
-
-    private String vcd_remark;
-
-    private String vcd_text1;
-
-    private String vcd_text2;
-
-    private String vcd_text3;
-
-    private String vcd_text4;
-
-    private String vcd_text5;
+//
+//    private Integer vcd_id;
+//
+//    private Integer vcd_vcid;
+//
+//    private Integer vcd_detno;
+//
+//    private Integer vcd_ym;
+//
+//    private Integer vcd_slid;
+//
+//    private String vcd_slcode;
+//
+//    private String vcd_slkind;
+//
+//    private Date vcd_sldate;
+//
+//    private Double vcd_amount;
+//
+//    private Double vcd_nowbalance;
+//
+//    private String vcd_remark;
+//
+//    private String vcd_text1;
+//
+//    private String vcd_text2;
+//
+//    private String vcd_text3;
+//
+//    private String vcd_text4;
+//
+//    private String vcd_text5;
 
 }

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

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Fundtran;
 import com.usoftchina.saas.money.po.Fundtransfer;
 import com.usoftchina.saas.page.PageRequest;
@@ -10,15 +12,16 @@ import com.usoftchina.saas.page.PageRequest;
  * @date 2018/10/25 19:26
  **/
 public interface FundtransferService {
-    int insert(Fundtran fundtran);
+    DocBaseDTO insert(Fundtran fundtran);
 
     void audit(Fundtran fundtran);
 
     void unAudit(int id);
 
     void delete(int id);
+    void deleteItem(int id);
 
     Fundtran select(int id);
 
-    PageInfo<Fundtransfer> selectList(PageRequest page);
+    PageInfo<Fundtransfer> selectList(PageRequest page, ListReqDTO reqDTO);
 }

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

@@ -23,6 +23,8 @@ public interface PaybalanceService {
 
     void deleteItem(int id);
 
+    void deleteItems(int id);
+
     Pay select(int id);
 
     PageInfo<Paybalance> selectList(PageRequest page, ListReqDTO reqDTO);

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

@@ -8,6 +8,7 @@ import com.usoftchina.saas.money.dto.VerificationListDTO;
 import com.usoftchina.saas.money.dto.VerificationReqDTO;
 import com.usoftchina.saas.money.po.VerificationList;
 import com.usoftchina.saas.page.PageRequest;
+import io.swagger.models.auth.In;
 
 /**
  * @author hx
@@ -43,6 +44,18 @@ public interface VerificationService {
      */
     void delete(Long id);
 
+    /**
+     * 删除核销单明细1
+     * @param id
+     */
+    void deleteDetail1(Long id);
+
+    /**
+     * 删除核销单明细2
+     * @param id
+     */
+    void deleteDetail2(Long id);
+
     /**
      * 审核核销单
      * @param formData

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

@@ -2,16 +2,25 @@ package com.usoftchina.saas.money.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.exception.BizExceptionCode;
+import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.FundtransferMapper;
 import com.usoftchina.saas.money.mapper.FundtransferdetailMapper;
 import com.usoftchina.saas.money.po.Fundtran;
 import com.usoftchina.saas.money.po.Fundtransfer;
 import com.usoftchina.saas.money.po.Fundtransferdetail;
+import com.usoftchina.saas.money.po.Paybalance;
 import com.usoftchina.saas.money.service.FundtransferService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.Iterator;
 import java.util.List;
@@ -26,34 +35,55 @@ public class FundtransferServiceImpl implements FundtransferService {
     private FundtransferMapper fundtransferMapper;
     @Autowired
     private FundtransferdetailMapper fundtransferdetailMapper;
+    @Autowired
+    private MaxnumberService maxnumberService;
 
     @Override
-    public int insert(Fundtran fundtran) {
+    public DocBaseDTO insert(Fundtran fundtran) {
         Fundtransfer fundtransfer = fundtran.getMain();
         List<Fundtransferdetail> fundtransferdetails = fundtran.getItems();
 
-        if (fundtransfer.getFtId() > 0){
+        String ft_code = fundtransfer.getFt_code();
+
+        //编号校验
+        ft_code = pushMaxnubmer(ft_code, fundtransfer.getId());
+
+        System.out.println("ft_code" + ft_code);
+        //单号赋值
+        fundtransfer.setFt_code(ft_code);
+
+        Long id = fundtransfer.getId();
+
+        if (fundtransfer.getId() > 0){
             fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
         }else {
-            fundtransferMapper.insert(fundtransfer);
+            fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
+            fundtransferMapper.insertSelective(fundtransfer);
+            id = fundtransfer.getId();
         }
 
         Iterator isdet = fundtransferdetails.iterator();
         while (isdet.hasNext()){
             Fundtransferdetail fundtransferdetail= (Fundtransferdetail) isdet.next();
-            if (fundtransferdetail.getFtdId() > 0 ){
+            fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
+            fundtransferdetail.setFtd_ftid(Math.toIntExact(id));
+            if (fundtransferdetail.getId() > 0 ){
                 fundtransferdetailMapper.updateByPrimaryKey(fundtransferdetail);
             }else {
                 fundtransferdetailMapper.insertSelective(fundtransferdetail);
             }
         }
-        return 0;
+        return new DocBaseDTO(id, ft_code, BillCodeSeq.FUNDTRANSFER.getCaller());
     }
 
     @Override
     public void audit(Fundtran fundtran) {
-        int id = fundtran.getMain().getFtId();
+        Long companyId = BaseContextHolder.getCompanyId();
+        int id = Math.toIntExact(fundtran.getMain().getId());
         Fundtransfer fundtransfer = fundtransferMapper.selectByPrimaryKey(id);
+        fundtransfer.setFt_status(Status.AUDITED.getDisplay());
+        fundtransfer.setFt_statuscode(Status.AUDITED.name());
+        fundtransfer.setCompanyId(companyId);
         if ( fundtransfer == null || "".equals(fundtransfer)){
             this.insert(fundtran);
         }else {
@@ -64,9 +94,9 @@ public class FundtransferServiceImpl implements FundtransferService {
     @Override
     public void unAudit(int id) {
         Fundtransfer fundtransfer = new Fundtransfer();
-        fundtransfer.setFtId(id);
-        fundtransfer.setFtStatus(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
-        fundtransfer.setFtStatuscode(Status.UNAUDITED.name());
+        fundtransfer.setId(Long.valueOf(id));
+        fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
+        fundtransfer.setFt_statuscode(Status.UNAUDITED.name());
         fundtransferMapper.updateByPrimaryKey(fundtransfer);
     }
 
@@ -85,12 +115,12 @@ public class FundtransferServiceImpl implements FundtransferService {
     public Fundtran select(int id) {
         Fundtran fundtran = new Fundtran();
         fundtran.setMain(fundtransferMapper.selectByPrimaryKey(id));
-        fundtran.setItems((List<Fundtransferdetail>) fundtransferdetailMapper.selectByPrimaryKey(id));
+        fundtran.setItems(fundtransferdetailMapper.selectByPrimaryKey(id));
         return fundtran;
     }
 
     @Override
-    public PageInfo<Fundtransfer> selectList(PageRequest page) {
+    public PageInfo<Fundtransfer> selectList(PageRequest page, ListReqDTO reqDTO) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -98,9 +128,44 @@ public class FundtransferServiceImpl implements FundtransferService {
             page.setSize(10);
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
-        List<Fundtransfer> fundtransfers = fundtransferMapper.selectList();
+        List<Fundtransfer> fundtransfers = this.getListByMode(reqDTO);
         //取分页信息
         PageInfo<Fundtransfer> pageInfo = new PageInfo<>(fundtransfers);
         return pageInfo;
     }
+
+    /**
+     * @Description: 检验获取并更新单号
+     * @Param: [code, id]
+     * @return: java.lang.String
+     * @Author: guq
+     * @Date: 2018/10/19
+     */
+    private String pushMaxnubmer(String code, Long id) {
+        if (null == code) {
+            throw new BizException(BizExceptionCode.NULL_CODE);
+        }
+        Long companyId = BaseContextHolder.getCompanyId();
+        Integer count = "0".equals(String.valueOf(id)) ? fundtransferMapper.validateCodeWhenInsert(code, companyId) :
+                fundtransferMapper.validateCodeWhenUpdate(code, id, companyId);
+        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.FUNDTRANSFER.getCaller()).getData();
+    }
+
+    private List<Fundtransfer> getListByMode(ListReqDTO req) {
+        List<Fundtransfer> fundtransferList = null;
+        Long companyId = BaseContextHolder.getCompanyId();
+        if (StringUtils.isEmpty(req)) {
+            return  null;
+        }
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
+        if (StringUtils.isEmpty(req.getMode()) || "MAIN".equals(req.getMode())) {
+            fundtransferList = fundtransferMapper.selectFundtransferBycondition(con, companyId);
+        } else {
+            fundtransferList = fundtransferMapper.selectFundtransferListByCondition(con, companyId);
+        }
+        return fundtransferList;
+    }
 }

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

@@ -41,10 +41,14 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         Othreceipts othreceipts = othte.getMain();
         List<Othreceiptsdetail> othreceiptsdetail = othte.getItems();
 
+        System.out.println("oth:" + othreceipts);
+
         String or_code = othreceipts.getOr_code();
 
         //编号校验
         or_code = pushMaxnubmer(or_code, othreceipts.getId());
+
+        System.out.println("or_code" + or_code);
         //单号赋值
         othreceipts.setOr_code(or_code);
 
@@ -69,7 +73,7 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
                 othreceiptsdetailMapper.insertSelective(othreceiptsdetail1);
             }
         }
-        return new DocBaseDTO(id, or_code, BillCodeSeq.OTHERIN.getCaller());
+        return new DocBaseDTO(id, or_code, BillCodeSeq.OTHRECEIPTS.getCaller());
     }
 
 //    @Override

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

@@ -121,10 +121,14 @@ public class PaybalanceServiceImpl implements PaybalanceService {
 
     @Override
     public void deleteItem(int id) {
-        paybalancedetailMapper.deleteItem(id);
         paybalancedetMapper.deleteItem(id);
     }
 
+    @Override
+    public void deleteItems(int id) {
+        paybalancedetailMapper.deleteItem(id);
+    }
+
     public Pay select(int id){
         Pay pay = new Pay();
         pay.setMain(paybalanceMapper.selectByPrimaryKey(id));

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

@@ -9,7 +9,9 @@ import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
+import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Operation;
+import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.dto.*;
@@ -31,8 +33,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
@@ -41,8 +43,8 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
     private VerificationdetailMapper verificationdetailMapper;
     @Autowired
     private VerificationListMapper verificationListMapper;
-//    @Autowired
- //   private MessageLogService messageLogService;
+    @Autowired
+    private MessageLogService messageLogService;
 
 
     @Override
@@ -117,15 +119,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         List<Verificationdet> updateDetails1 = new ArrayList<>();
         List<Verificationdetail> updateDetails2 = new ArrayList<>();
         DocSavedDTO saveDTO = new DocSavedDTO();
-        Long id = main.getId();
+        Long id = Long.valueOf(String.valueOf(main.getVc_id()));
         String code = main.getVc_code();
         Verification verification = BeanMapper.map(main,Verification.class);
         verification.setCompanyId(companyId);
         verification.setCreatorId(userId);
         verification.setCreateTime(new Date());
         //编号获取
-//        code = pushMaxnubmer(code,id);
-        code = "1";
+        code = pushMaxnubmer(code,id);
+//        code = "1";
         verification.setVc_code(code);
         saveDTO.setCode(code);
         //判断更新与保存动作
@@ -137,11 +139,13 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             for (VerificationdetDTO item : items1) {
                 Verificationdet detail = BeanMapper.map(item,Verificationdet.class);
                 detail.setVd_vcid(id);
+                detail.setCompanyId(companyId);
                 insertDetails1.add(detail);
             }
             for (VerificationdetailDTO item : items2) {
                 Verificationdetail detail = BeanMapper.map(item,Verificationdetail.class);
                 detail.setVcd_vcid(id);
+                detail.setCompanyId(companyId);
                 insertDetails2.add(detail);
             }
             //插入从表
@@ -160,6 +164,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         for (VerificationdetDTO item : items1) {
             Verificationdet detail = BeanMapper.map(item, Verificationdet.class);
             detail.setVd_vcid(id);
+            detail.setCompanyId(companyId);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 insertDetails1.add(detail);
             } else {
@@ -169,6 +174,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         for (VerificationdetailDTO item : items2) {
             Verificationdetail detail = BeanMapper.map(item, Verificationdetail.class);
             detail.setVcd_vcid(id);
+            detail.setCompanyId(companyId);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 insertDetails2.add(detail);
             } else {
@@ -206,9 +212,39 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             DocBaseDTO baseDTO = new DocBaseDTO();
             baseDTO.setId(id);
             baseDTO.setCode(code);
-            baseDTO.setName("Verification");
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
             //日志
-//            messageLogService.delete(baseDTO);
+            messageLogService.delete(baseDTO);
+        }
+    }
+
+    @Override
+    public void deleteDetail1(Long id) {
+        if (null != id) {
+            verificationdetMapper.deleteByParentPrimaryKey(Long.valueOf(String.valueOf(id)));
+            Verificationdet verificationdet = verificationdetMapper.selectByPrimaryKey(Integer.valueOf(String.valueOf(id)));
+            Verification verification = verificationMapper.selectByPrimaryKey(verificationdet.getVd_vcid());
+            DocBaseDTO baseDTO = new DocBaseDTO();
+            baseDTO.setId(id);
+            baseDTO.setCode(verification.getVc_code());
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
+            //日志
+            messageLogService.deleteDetail(baseDTO);
+        }
+    }
+
+    @Override
+    public void deleteDetail2(Long id) {
+        if (null != id) {
+            verificationdetailMapper.deleteByParentPrimaryKey(id);
+            Verificationdetail verificationdetail = verificationdetailMapper.selectByPrimaryKey(Integer.valueOf(String.valueOf(id)));
+            Verification verification = verificationMapper.selectByPrimaryKey(verificationdetail.getVcd_vcid());
+            DocBaseDTO baseDTO = new DocBaseDTO();
+            baseDTO.setId(id);
+            baseDTO.setCode(verification.getVc_code());
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
+            //日志
+            messageLogService.deleteDetail(baseDTO);
         }
     }
 
@@ -217,14 +253,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         Long id = null;
         DocSavedDTO savedDTO = new DocSavedDTO();
         if (null != formData) {
-            id = formData.getMain().getId();
+            id = Long.valueOf(String.valueOf(formData.getMain().getVc_id()));
             if (StringUtils.isEmpty(id)) {
                 DocSavedDTO saveDTO = saveFormData(formData);
                 id = saveDTO.getId();
             }
             Verification verification = new Verification();
-           // verification.setVc_status(Operation.AUDIT.getTitle());
-           // verification.setVc_statuscode(Status.AUDITED.name());
+            verification.setVc_status(Status.AUDITED.getDisplay());
+            verification.setVc_statuscode(Status.AUDITED.name());
+            verification.setVc_id(Integer.valueOf(String.valueOf(id)));
             verificationMapper.updateByPrimaryKeySelective(verification);
         }
         savedDTO.setId(id);
@@ -242,9 +279,9 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         }
         Verification verification = new Verification();
         //生成更新对象
-        verification.setId(id);
-//        verification.setVc_status();
-//        verification.setVc_statuscode();
+        verification.setVc_id(Integer.valueOf(String.valueOf(id)));
+        verification.setVc_status(Status.UNAUDITED.getDisplay());
+        verification.setVc_statuscode(Status.UNAUDITED.name());
         verification.setUpdateTime(new Date());
         verification.setUpdaterId(BaseContextHolder.getUserId());
         //更新存在字段
@@ -254,15 +291,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, BillCodeSeq.VERIFICATION.getCaller()).getData();
+    }
 }

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

@@ -2,34 +2,34 @@
 <!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.FundtransferMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Fundtransfer" >
-    <id column="ft_id" property="ftId" jdbcType="INTEGER" />
-    <result column="ft_code" property="ftCode" jdbcType="VARCHAR" />
-    <result column="ft_date" property="ftDate" jdbcType="TIMESTAMP" />
-    <result column="ft_recorderid" property="ftRecorderid" jdbcType="INTEGER" />
-    <result column="ft_recorder" property="ftRecorder" jdbcType="VARCHAR" />
-    <result column="ft_recorddate" property="ftRecorddate" jdbcType="TIMESTAMP" />
-    <result column="ft_status" property="ftStatus" jdbcType="VARCHAR" />
-    <result column="ft_statuscode" property="ftStatuscode" jdbcType="VARCHAR" />
-    <result column="ft_remark" property="ftRemark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
-    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <id column="ft_id" property="id" jdbcType="INTEGER" />
+    <result column="ft_code" property="ft_code" jdbcType="VARCHAR" />
+    <result column="ft_date" property="ft_date" jdbcType="TIMESTAMP" />
+    <result column="ft_recorderid" property="ft_recorderid" jdbcType="INTEGER" />
+    <result column="ft_recorder" property="ft_recorder" jdbcType="VARCHAR" />
+    <result column="ft_recorddate" property="ft_recorddate" jdbcType="TIMESTAMP" />
+    <result column="ft_status" property="ft_status" jdbcType="VARCHAR" />
+    <result column="ft_statuscode" property="ft_statuscode" jdbcType="VARCHAR" />
+    <result column="ft_remark" property="ft_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="ft_text1" property="ftText1" jdbcType="VARCHAR" />
-    <result column="ft_text2" property="ftText2" jdbcType="VARCHAR" />
-    <result column="ft_text3" property="ftText3" jdbcType="VARCHAR" />
-    <result column="ft_text4" property="ftText4" jdbcType="VARCHAR" />
-    <result column="ft_text5" property="ftText5" jdbcType="VARCHAR" />
+    <result column="ft_text1" property="ft_text1" jdbcType="VARCHAR" />
+    <result column="ft_text2" property="ft_text2" jdbcType="VARCHAR" />
+    <result column="ft_text3" property="ft_text3" jdbcType="VARCHAR" />
+    <result column="ft_text4" property="ft_text4" jdbcType="VARCHAR" />
+    <result column="ft_text5" property="ft_text5" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     ft_id, ft_code, ft_date, ft_recorderid, ft_recorder, ft_recorddate, ft_status, ft_statuscode, 
-    ft_remark, companyid, updaterId, updatedate, ft_text1, ft_text2, ft_text3, ft_text4, 
+    ft_remark, companyId, updaterId, updatedate, ft_text1, ft_text2, ft_text3, ft_text4, 
     ft_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from fundtransfer
-    where ft_id = #{ftId,jdbcType=INTEGER}
+    where ft_id = #{id,jdbcType=INTEGER}
   </select>
 
   <select id="selectList" resultMap="BaseResultMap" >
@@ -39,184 +39,181 @@
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from fundtransfer
-    where ft_id = #{ftId,jdbcType=INTEGER}
+    where ft_id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
     insert into fundtransfer (ft_id, ft_code, ft_date, 
       ft_recorderid, ft_recorder, ft_recorddate, 
       ft_status, ft_statuscode, ft_remark, 
-      companyid, updaterId, updatedate, 
+      companyId, updaterId, updatedate, 
       ft_text1, ft_text2, ft_text3, 
       ft_text4, ft_text5)
     values (#{ftId,jdbcType=INTEGER}, #{ftCode,jdbcType=VARCHAR}, #{ftDate,jdbcType=TIMESTAMP}, 
       #{ftRecorderid,jdbcType=INTEGER}, #{ftRecorder,jdbcType=VARCHAR}, #{ftRecorddate,jdbcType=TIMESTAMP}, 
       #{ftStatus,jdbcType=VARCHAR}, #{ftStatuscode,jdbcType=VARCHAR}, #{ftRemark,jdbcType=VARCHAR}, 
-      #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
+      #{companyId,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
       #{ftText1,jdbcType=VARCHAR}, #{ftText2,jdbcType=VARCHAR}, #{ftText3,jdbcType=VARCHAR}, 
       #{ftText4,jdbcType=VARCHAR}, #{ftText5,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
     insert into fundtransfer
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="ftId != null" >
-        ft_id,
-      </if>
-      <if test="ftCode != null" >
+      <if test="ft_code != null" >
         ft_code,
       </if>
-      <if test="ftDate != null" >
+      <if test="ft_date != null" >
         ft_date,
       </if>
-      <if test="ftRecorderid != null" >
+      <if test="ft_recorderid != null" >
         ft_recorderid,
       </if>
-      <if test="ftRecorder != null" >
+      <if test="ft_recorder != null" >
         ft_recorder,
       </if>
-      <if test="ftRecorddate != null" >
+      <if test="ft_recorddate != null" >
         ft_recorddate,
       </if>
-      <if test="ftStatus != null" >
+      <if test="ft_status != null" >
         ft_status,
       </if>
-      <if test="ftStatuscode != null" >
+      <if test="ft_statuscode != null" >
         ft_statuscode,
       </if>
-      <if test="ftRemark != null" >
+      <if test="ft_remark != null" >
         ft_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
-      <if test="updaterid != null" >
+      <if test="updaterId != null" >
         updaterId,
       </if>
       <if test="updatedate != null" >
         updatedate,
       </if>
-      <if test="ftText1 != null" >
+      <if test="ft_text1 != null" >
         ft_text1,
       </if>
-      <if test="ftText2 != null" >
+      <if test="ft_text2 != null" >
         ft_text2,
       </if>
-      <if test="ftText3 != null" >
+      <if test="ft_text3 != null" >
         ft_text3,
       </if>
-      <if test="ftText4 != null" >
+      <if test="ft_text4 != null" >
         ft_text4,
       </if>
-      <if test="ftText5 != null" >
+      <if test="ft_text5 != null" >
         ft_text5,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="ftId != null" >
-        #{ftId,jdbcType=INTEGER},
+      <if test="ft_code != null" >
+        #{ft_code,jdbcType=VARCHAR},
       </if>
-      <if test="ftCode != null" >
-        #{ftCode,jdbcType=VARCHAR},
+      <if test="ft_date != null" >
+        #{ft_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftDate != null" >
-        #{ftDate,jdbcType=TIMESTAMP},
+      <if test="ft_recorderid != null" >
+        #{ft_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="ftRecorderid != null" >
-        #{ftRecorderid,jdbcType=INTEGER},
+      <if test="ft_recorder != null" >
+        #{ft_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="ftRecorder != null" >
-        #{ftRecorder,jdbcType=VARCHAR},
+      <if test="ft_recorddate != null" >
+        #{ft_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftRecorddate != null" >
-        #{ftRecorddate,jdbcType=TIMESTAMP},
+      <if test="ft_status != null" >
+        #{ft_status,jdbcType=VARCHAR},
       </if>
-      <if test="ftStatus != null" >
-        #{ftStatus,jdbcType=VARCHAR},
+      <if test="ft_statuscode != null" >
+        #{ft_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="ftStatuscode != null" >
-        #{ftStatuscode,jdbcType=VARCHAR},
+      <if test="ft_remark != null" >
+        #{ft_remark,jdbcType=VARCHAR},
       </if>
-      <if test="ftRemark != null" >
-        #{ftRemark,jdbcType=VARCHAR},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
-      <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="updatedate != null" >
         #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftText1 != null" >
-        #{ftText1,jdbcType=VARCHAR},
+      <if test="ft_text1 != null" >
+        #{ft_text1,jdbcType=VARCHAR},
       </if>
-      <if test="ftText2 != null" >
-        #{ftText2,jdbcType=VARCHAR},
+      <if test="ft_text2 != null" >
+        #{ft_text2,jdbcType=VARCHAR},
       </if>
-      <if test="ftText3 != null" >
-        #{ftText3,jdbcType=VARCHAR},
+      <if test="ft_text3 != null" >
+        #{ft_text3,jdbcType=VARCHAR},
       </if>
-      <if test="ftText4 != null" >
-        #{ftText4,jdbcType=VARCHAR},
+      <if test="ft_text4 != null" >
+        #{ft_text4,jdbcType=VARCHAR},
       </if>
-      <if test="ftText5 != null" >
-        #{ftText5,jdbcType=VARCHAR},
+      <if test="ft_text5 != null" >
+        #{ft_text5,jdbcType=VARCHAR},
       </if>
     </trim>
+    <selectKey resultType="Long" keyProperty="id" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
     update fundtransfer
     <set >
-      <if test="ftCode != null" >
-        ft_code = #{ftCode,jdbcType=VARCHAR},
+      <if test="ft_code != null" >
+        ft_code = #{ft_code,jdbcType=VARCHAR},
       </if>
-      <if test="ftDate != null" >
-        ft_date = #{ftDate,jdbcType=TIMESTAMP},
+      <if test="ft_date != null" >
+        ft_date = #{ft_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftRecorderid != null" >
-        ft_recorderid = #{ftRecorderid,jdbcType=INTEGER},
+      <if test="ft_recorderid != null" >
+        ft_recorderid = #{ft_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="ftRecorder != null" >
-        ft_recorder = #{ftRecorder,jdbcType=VARCHAR},
+      <if test="ft_recorder != null" >
+        ft_recorder = #{ft_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="ftRecorddate != null" >
-        ft_recorddate = #{ftRecorddate,jdbcType=TIMESTAMP},
+      <if test="ft_recorddate != null" >
+        ft_recorddate = #{ft_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftStatus != null" >
-        ft_status = #{ftStatus,jdbcType=VARCHAR},
+      <if test="ft_status != null" >
+        ft_status = #{ft_status,jdbcType=VARCHAR},
       </if>
-      <if test="ftStatuscode != null" >
-        ft_statuscode = #{ftStatuscode,jdbcType=VARCHAR},
+      <if test="ft_statuscode != null" >
+        ft_statuscode = #{ft_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="ftRemark != null" >
-        ft_remark = #{ftRemark,jdbcType=VARCHAR},
+      <if test="ft_remark != null" >
+        ft_remark = #{ft_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 test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         updatedate = #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftText1 != null" >
-        ft_text1 = #{ftText1,jdbcType=VARCHAR},
+      <if test="ft_text1 != null" >
+        ft_text1 = #{ft_text1,jdbcType=VARCHAR},
       </if>
-      <if test="ftText2 != null" >
-        ft_text2 = #{ftText2,jdbcType=VARCHAR},
+      <if test="ft_text2 != null" >
+        ft_text2 = #{ft_text2,jdbcType=VARCHAR},
       </if>
-      <if test="ftText3 != null" >
-        ft_text3 = #{ftText3,jdbcType=VARCHAR},
+      <if test="ft_text3 != null" >
+        ft_text3 = #{ft_text3,jdbcType=VARCHAR},
       </if>
-      <if test="ftText4 != null" >
-        ft_text4 = #{ftText4,jdbcType=VARCHAR},
+      <if test="ft_text4 != null" >
+        ft_text4 = #{ft_text4,jdbcType=VARCHAR},
       </if>
-      <if test="ftText5 != null" >
-        ft_text5 = #{ftText5,jdbcType=VARCHAR},
+      <if test="ft_text5 != null" >
+        ft_text5 = #{ft_text5,jdbcType=VARCHAR},
       </if>
     </set>
-    where ft_id = #{ftId,jdbcType=INTEGER}
+    where ft_id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
     update fundtransfer
@@ -228,7 +225,7 @@
       ft_status = #{ftStatus,jdbcType=VARCHAR},
       ft_statuscode = #{ftStatuscode,jdbcType=VARCHAR},
       ft_remark = #{ftRemark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterid,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       ft_text1 = #{ftText1,jdbcType=VARCHAR},
@@ -238,4 +235,40 @@
       ft_text5 = #{ftText5,jdbcType=VARCHAR}
     where ft_id = #{ftId,jdbcType=INTEGER}
   </update>
+
+  <select id="validateCodeWhenInsert" resultType="int">
+    select count(1) from fundtransfer where ft_code = #{code} and companyId =#{companyId}
+  </select>
+  <select id="validateCodeWhenUpdate" resultType="int" >
+    select count(1) from fundtransfer where ft_code = #{code} and ft_id != #{id} and companyId =#{companyId}
+  </select>
+
+  <select id="selectFundtransferBycondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from Fundtransfer
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and   Fundtransfer.companyId = #{companyId}
+      </if>
+    </where>  order by ft_id
+  </select>
+
+  <select id="selectFundtransferListByCondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from fundtransfer
+    left join fundtransferdetail on ft_id=ftd_ftid
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and   fundtransfer.companyId = #{companyId}
+      </if>
+    </where>  order by ft_id
+  </select>
 </mapper>

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

@@ -2,48 +2,49 @@
 <!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.FundtransferdetailMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Fundtransferdetail" >
-    <id column="ftd_id" property="ftdId" jdbcType="INTEGER" />
-    <result column="ftd_ftid" property="ftdFtid" jdbcType="INTEGER" />
-    <result column="ftd_detno" property="ftdDetno" jdbcType="INTEGER" />
-    <result column="ftd_ym" property="ftdYm" jdbcType="INTEGER" />
-    <result column="ftd_bankid" property="ftdBankid" jdbcType="INTEGER" />
-    <result column="ftd_bankcode" property="ftdBankcode" jdbcType="VARCHAR" />
-    <result column="ftd_bankname" property="ftdBankname" jdbcType="VARCHAR" />
-    <result column="ftd_inbankid" property="ftdInbankid" jdbcType="INTEGER" />
-    <result column="ftd_inbankcode" property="ftdInbankcode" jdbcType="VARCHAR" />
-    <result column="ftd_inbankname" property="ftdInbankname" jdbcType="VARCHAR" />
-    <result column="ftd_nowbalance" property="ftdNowbalance" jdbcType="DOUBLE" />
-    <result column="ftd_paymethod" property="ftdPaymethod" jdbcType="VARCHAR" />
-    <result column="ftd_paycode" property="ftdPaycode" jdbcType="VARCHAR" />
-    <result column="ftd_remark" property="ftdRemark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
-    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <id column="ftd_id" property="id" jdbcType="INTEGER" />
+    <result column="ftd_ftid" property="ftd_ftid" jdbcType="INTEGER" />
+    <result column="ftd_detno" property="ftd_detno" jdbcType="INTEGER" />
+    <result column="ftd_ym" property="ftd_ym" jdbcType="INTEGER" />
+    <result column="ftd_bankid" property="ftd_bankid" jdbcType="INTEGER" />
+    <result column="ftd_bankcode" property="ftd_bankcode" jdbcType="VARCHAR" />
+    <result column="ftd_bankname" property="ftd_bankname" jdbcType="VARCHAR" />
+    <result column="ftd_inbankid" property="ftd_inbankid" jdbcType="INTEGER" />
+    <result column="ftd_inbankcode" property="ftd_inbankcode" jdbcType="VARCHAR" />
+    <result column="ftd_inbankname" property="ftd_inbankname" jdbcType="VARCHAR" />
+    <result column="ftd_nowbalance" property="ftd_nowbalance" jdbcType="DOUBLE" />
+    <result column="ftd_paymethod" property="ftd_paymethod" jdbcType="VARCHAR" />
+    <result column="ftd_paycode" property="ftd_paycode" jdbcType="VARCHAR" />
+    <result column="ftd_remark" property="ftd_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="ftd_text1" property="ftdText1" jdbcType="VARCHAR" />
-    <result column="ftd_text2" property="ftdText2" jdbcType="VARCHAR" />
-    <result column="ftd_text3" property="ftdText3" jdbcType="VARCHAR" />
-    <result column="ftd_text4" property="ftdText4" jdbcType="VARCHAR" />
-    <result column="ftd_text5" property="ftdText5" jdbcType="VARCHAR" />
+    <result column="ftd_text1" property="ftd_text1" jdbcType="VARCHAR" />
+    <result column="ftd_text2" property="ftd_text2" jdbcType="VARCHAR" />
+    <result column="ftd_text3" property="ftd_text3" jdbcType="VARCHAR" />
+    <result column="ftd_text4" property="ftd_text4" jdbcType="VARCHAR" />
+    <result column="ftd_text5" property="ftd_text5" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     ftd_id, ftd_ftid, ftd_detno, ftd_ym, ftd_bankid, ftd_bankcode, ftd_bankname, ftd_inbankid, 
     ftd_inbankcode, ftd_inbankname, ftd_nowbalance, ftd_paymethod, ftd_paycode, ftd_remark, 
-    companyid, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
+    companyId, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from fundtransferdetail
-    where ftd_id = #{ftdId,jdbcType=INTEGER}
+    where ftd_id = #{id,jdbcType=INTEGER}
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from fundtransferdetail
-    where ftd_id = #{ftdId,jdbcType=INTEGER}
+    where ftd_ftid = #{id,jdbcType=INTEGER}
   </delete>
 
   <delete id="deleteItem" parameterType="java.lang.Integer" >
     delete from fundtransferdetail
-    where ftd_ftid = #{ftdFtid,jdbcType=INTEGER}
+    where ftd_id = #{id,jdbcType=INTEGER}
   </delete>
 
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
@@ -51,7 +52,7 @@
       ftd_ym, ftd_bankid, ftd_bankcode, 
       ftd_bankname, ftd_inbankid, ftd_inbankcode, 
       ftd_inbankname, ftd_nowbalance, ftd_paymethod, 
-      ftd_paycode, ftd_remark, companyid, 
+      ftd_paycode, ftd_remark, companyId, 
       updaterId, updatedate, ftd_text1, 
       ftd_text2, ftd_text3, ftd_text4, 
       ftd_text5)
@@ -59,7 +60,7 @@
       #{ftdYm,jdbcType=INTEGER}, #{ftdBankid,jdbcType=INTEGER}, #{ftdBankcode,jdbcType=VARCHAR}, 
       #{ftdBankname,jdbcType=VARCHAR}, #{ftdInbankid,jdbcType=INTEGER}, #{ftdInbankcode,jdbcType=VARCHAR}, 
       #{ftdInbankname,jdbcType=VARCHAR}, #{ftdNowbalance,jdbcType=DOUBLE}, #{ftdPaymethod,jdbcType=VARCHAR}, 
-      #{ftdPaycode,jdbcType=VARCHAR}, #{ftdRemark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{ftdPaycode,jdbcType=VARCHAR}, #{ftdRemark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, 
       #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{ftdText1,jdbcType=VARCHAR}, 
       #{ftdText2,jdbcType=VARCHAR}, #{ftdText3,jdbcType=VARCHAR}, #{ftdText4,jdbcType=VARCHAR}, 
       #{ftdText5,jdbcType=VARCHAR})
@@ -67,210 +68,204 @@
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
     insert into fundtransferdetail
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="ftdId != null" >
-        ftd_id,
-      </if>
-      <if test="ftdFtid != null" >
+      <if test="ftd_ftid != null" >
         ftd_ftid,
       </if>
-      <if test="ftdDetno != null" >
+      <if test="ftd_detno != null" >
         ftd_detno,
       </if>
-      <if test="ftdYm != null" >
+      <if test="ftd_ym != null" >
         ftd_ym,
       </if>
-      <if test="ftdBankid != null" >
+      <if test="ftd_bankid != null" >
         ftd_bankid,
       </if>
-      <if test="ftdBankcode != null" >
+      <if test="ftd_bankcode != null" >
         ftd_bankcode,
       </if>
-      <if test="ftdBankname != null" >
+      <if test="ftd_bankname != null" >
         ftd_bankname,
       </if>
-      <if test="ftdInbankid != null" >
+      <if test="ftd_inbankid != null" >
         ftd_inbankid,
       </if>
-      <if test="ftdInbankcode != null" >
+      <if test="ftd_inbankcode != null" >
         ftd_inbankcode,
       </if>
-      <if test="ftdInbankname != null" >
+      <if test="ftd_inbankname != null" >
         ftd_inbankname,
       </if>
-      <if test="ftdNowbalance != null" >
+      <if test="ftd_nowbalance != null" >
         ftd_nowbalance,
       </if>
-      <if test="ftdPaymethod != null" >
+      <if test="ftd_paymethod != null" >
         ftd_paymethod,
       </if>
-      <if test="ftdPaycode != null" >
+      <if test="ftd_paycode != null" >
         ftd_paycode,
       </if>
-      <if test="ftdRemark != null" >
+      <if test="ftd_remark != null" >
         ftd_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
-      <if test="updaterid != null" >
+      <if test="updaterId != null" >
         updaterId,
       </if>
       <if test="updatedate != null" >
         updatedate,
       </if>
-      <if test="ftdText1 != null" >
+      <if test="ftd_text1 != null" >
         ftd_text1,
       </if>
-      <if test="ftdText2 != null" >
+      <if test="ftd_text2 != null" >
         ftd_text2,
       </if>
-      <if test="ftdText3 != null" >
+      <if test="ftd_text3 != null" >
         ftd_text3,
       </if>
-      <if test="ftdText4 != null" >
+      <if test="ftd_text4 != null" >
         ftd_text4,
       </if>
-      <if test="ftdText5 != null" >
+      <if test="ftd_text5 != null" >
         ftd_text5,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="ftdId != null" >
-        #{ftdId,jdbcType=INTEGER},
-      </if>
-      <if test="ftdFtid != null" >
-        #{ftdFtid,jdbcType=INTEGER},
+      <if test="ftd_ftid != null" >
+        #{ftd_ftid,jdbcType=INTEGER},
       </if>
-      <if test="ftdDetno != null" >
-        #{ftdDetno,jdbcType=INTEGER},
+      <if test="ftd_detno != null" >
+        #{ftd_detno,jdbcType=INTEGER},
       </if>
-      <if test="ftdYm != null" >
-        #{ftdYm,jdbcType=INTEGER},
+      <if test="ftd_ym != null" >
+        #{ftd_ym,jdbcType=INTEGER},
       </if>
-      <if test="ftdBankid != null" >
-        #{ftdBankid,jdbcType=INTEGER},
+      <if test="ftd_bankid != null" >
+        #{ftd_bankid,jdbcType=INTEGER},
       </if>
-      <if test="ftdBankcode != null" >
-        #{ftdBankcode,jdbcType=VARCHAR},
+      <if test="ftd_bankcode != null" >
+        #{ftd_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdBankname != null" >
-        #{ftdBankname,jdbcType=VARCHAR},
+      <if test="ftd_bankname != null" >
+        #{ftd_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="ftdInbankid != null" >
-        #{ftdInbankid,jdbcType=INTEGER},
+      <if test="ftd_inbankid != null" >
+        #{ftd_inbankid,jdbcType=INTEGER},
       </if>
-      <if test="ftdInbankcode != null" >
-        #{ftdInbankcode,jdbcType=VARCHAR},
+      <if test="ftd_inbankcode != null" >
+        #{ftd_inbankcode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdInbankname != null" >
-        #{ftdInbankname,jdbcType=VARCHAR},
+      <if test="ftd_inbankname != null" >
+        #{ftd_inbankname,jdbcType=VARCHAR},
       </if>
-      <if test="ftdNowbalance != null" >
-        #{ftdNowbalance,jdbcType=DOUBLE},
+      <if test="ftd_nowbalance != null" >
+        #{ftd_nowbalance,jdbcType=DOUBLE},
       </if>
-      <if test="ftdPaymethod != null" >
-        #{ftdPaymethod,jdbcType=VARCHAR},
+      <if test="ftd_paymethod != null" >
+        #{ftd_paymethod,jdbcType=VARCHAR},
       </if>
-      <if test="ftdPaycode != null" >
-        #{ftdPaycode,jdbcType=VARCHAR},
+      <if test="ftd_paycode != null" >
+        #{ftd_paycode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdRemark != null" >
-        #{ftdRemark,jdbcType=VARCHAR},
+      <if test="ftd_remark != null" >
+        #{ftd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updaterid != null" >
-        #{updaterid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftdText1 != null" >
-        #{ftdText1,jdbcType=VARCHAR},
+      <if test="ftd_text1 != null" >
+        #{ftd_text1,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText2 != null" >
-        #{ftdText2,jdbcType=VARCHAR},
+      <if test="ftd_text2 != null" >
+        #{ftd_text2,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText3 != null" >
-        #{ftdText3,jdbcType=VARCHAR},
+      <if test="ftd_text3 != null" >
+        #{ftd_text3,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText4 != null" >
-        #{ftdText4,jdbcType=VARCHAR},
+      <if test="ftd_text4 != null" >
+        #{ftd_text4,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText5 != null" >
-        #{ftdText5,jdbcType=VARCHAR},
+      <if test="ftd_text5 != null" >
+        #{ftd_text5,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
     update fundtransferdetail
     <set >
-      <if test="ftdFtid != null" >
-        ftd_ftid = #{ftdFtid,jdbcType=INTEGER},
+      <if test="ftd_ftid != null" >
+        ftd_ftid = #{ftd_ftid,jdbcType=INTEGER},
       </if>
-      <if test="ftdDetno != null" >
-        ftd_detno = #{ftdDetno,jdbcType=INTEGER},
+      <if test="ftd_detno != null" >
+        ftd_detno = #{ftd_detno,jdbcType=INTEGER},
       </if>
-      <if test="ftdYm != null" >
-        ftd_ym = #{ftdYm,jdbcType=INTEGER},
+      <if test="ftd_ym != null" >
+        ftd_ym = #{ftd_ym,jdbcType=INTEGER},
       </if>
-      <if test="ftdBankid != null" >
-        ftd_bankid = #{ftdBankid,jdbcType=INTEGER},
+      <if test="ftd_bankid != null" >
+        ftd_bankid = #{ftd_bankid,jdbcType=INTEGER},
       </if>
-      <if test="ftdBankcode != null" >
-        ftd_bankcode = #{ftdBankcode,jdbcType=VARCHAR},
+      <if test="ftd_bankcode != null" >
+        ftd_bankcode = #{ftd_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdBankname != null" >
-        ftd_bankname = #{ftdBankname,jdbcType=VARCHAR},
+      <if test="ftd_bankname != null" >
+        ftd_bankname = #{ftd_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="ftdInbankid != null" >
-        ftd_inbankid = #{ftdInbankid,jdbcType=INTEGER},
+      <if test="ftd_inbankid != null" >
+        ftd_inbankid = #{ftd_inbankid,jdbcType=INTEGER},
       </if>
-      <if test="ftdInbankcode != null" >
-        ftd_inbankcode = #{ftdInbankcode,jdbcType=VARCHAR},
+      <if test="ftd_inbankcode != null" >
+        ftd_inbankcode = #{ftd_inbankcode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdInbankname != null" >
-        ftd_inbankname = #{ftdInbankname,jdbcType=VARCHAR},
+      <if test="ftd_inbankname != null" >
+        ftd_inbankname = #{ftd_inbankname,jdbcType=VARCHAR},
       </if>
-      <if test="ftdNowbalance != null" >
-        ftd_nowbalance = #{ftdNowbalance,jdbcType=DOUBLE},
+      <if test="ftd_nowbalance != null" >
+        ftd_nowbalance = #{ftd_nowbalance,jdbcType=DOUBLE},
       </if>
-      <if test="ftdPaymethod != null" >
-        ftd_paymethod = #{ftdPaymethod,jdbcType=VARCHAR},
+      <if test="ftd_paymethod != null" >
+        ftd_paymethod = #{ftd_paymethod,jdbcType=VARCHAR},
       </if>
-      <if test="ftdPaycode != null" >
-        ftd_paycode = #{ftdPaycode,jdbcType=VARCHAR},
+      <if test="ftd_paycode != null" >
+        ftd_paycode = #{ftd_paycode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdRemark != null" >
-        ftd_remark = #{ftdRemark,jdbcType=VARCHAR},
+      <if test="ftd_remark != null" >
+        ftd_remark = #{ftd_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 test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         updatedate = #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftdText1 != null" >
-        ftd_text1 = #{ftdText1,jdbcType=VARCHAR},
+      <if test="ftd_text1 != null" >
+        ftd_text1 = #{ftd_text1,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText2 != null" >
-        ftd_text2 = #{ftdText2,jdbcType=VARCHAR},
+      <if test="ftd_text2 != null" >
+        ftd_text2 = #{ftd_text2,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText3 != null" >
-        ftd_text3 = #{ftdText3,jdbcType=VARCHAR},
+      <if test="ftd_text3 != null" >
+        ftd_text3 = #{ftd_text3,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText4 != null" >
-        ftd_text4 = #{ftdText4,jdbcType=VARCHAR},
+      <if test="ftd_text4 != null" >
+        ftd_text4 = #{ftd_text4,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText5 != null" >
-        ftd_text5 = #{ftdText5,jdbcType=VARCHAR},
+      <if test="ftd_text5 != null" >
+        ftd_text5 = #{ftd_text5,jdbcType=VARCHAR},
       </if>
     </set>
-    where ftd_id = #{ftdId,jdbcType=INTEGER}
+    where ftd_id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
     update fundtransferdetail
@@ -287,7 +282,7 @@
       ftd_paymethod = #{ftdPaymethod,jdbcType=VARCHAR},
       ftd_paycode = #{ftdPaycode,jdbcType=VARCHAR},
       ftd_remark = #{ftdRemark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterid,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       ftd_text1 = #{ftdText1,jdbcType=VARCHAR},

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

@@ -55,6 +55,9 @@
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Othreceiptsdetail" >
     insert into othreceiptsdetail
     <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="ord_orid != null" >
+        ord_orid,
+      </if>
       <if test="ord_detno != null" >
         ord_detno,
       </if>
@@ -96,6 +99,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="ord_orid != null" >
+        #{ord_orid,jdbcType=INTEGER},
+      </if>
       <if test="ord_detno != null" >
         #{ord_detno,jdbcType=INTEGER},
       </if>

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

@@ -45,8 +45,13 @@
         <result column="vd_remark" property="vd_remark" jdbcType="VARCHAR" />
 
     </resultMap>
+    <sql id="Base_Column_List">
+    vc_id, vc_code, vc_kind, vc_date, vc_vendid, vc_vendcode
+  </sql>
     <select id="selectVerificationListByCondition"  resultMap="BaseResultMap">
-        select  *  from verification left join verificationdet on vc_id=vd_vcid left join verificationdetail on vc_id=vcd_vcid
+        select
+        <include refid="Base_Column_List" />
+        from verification left join verificationdet on vc_id=vd_vcid
         <where>
             <if test="con != null">
                 ${con}
@@ -59,7 +64,9 @@
     </select>
 
     <select id="selectVerificationBycondition"  resultMap="BaseResultMap">
-        select  *  from Verification
+        select
+        <include refid="Base_Column_List" />
+        from Verification
         <where>
             <if test="con != null">
                 ${con}

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

@@ -120,7 +120,7 @@
     from verification
     where vc_id = #{vc_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
     delete from verification
     where vc_id = #{vc_id,jdbcType=INTEGER}
   </delete>
@@ -149,7 +149,7 @@
       #{vc_turnvendname,jdbcType=VARCHAR}, #{vc_turncustid,jdbcType=INTEGER}, #{vc_turncustcode,jdbcType=VARCHAR}, 
       #{vc_turncustname,jdbcType=VARCHAR}, #{vc_amount1,jdbcType=DOUBLE}, #{vc_amount2,jdbcType=DOUBLE}, 
       #{vc_recorderid,jdbcType=INTEGER}, #{vc_recorder,jdbcType=VARCHAR}, #{vc_recorddate,jdbcType=TIMESTAMP}, 
-      #{vc_status,jdbcType=INTEGER}, #{vc_statuscode,jdbcType=DECIMAL}, #{vc_remark,jdbcType=VARCHAR}, 
+      #{vc_status,jdbcType=VARCHAR}, #{vc_statuscode,jdbcType=VARCHAR}, #{vc_remark,jdbcType=VARCHAR},
       #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
       #{vc_text1,jdbcType=VARCHAR}, #{vc_text2,jdbcType=VARCHAR}, #{vc_text3,jdbcType=VARCHAR}, 
       #{vc_text4,jdbcType=VARCHAR}, #{vc_text5,jdbcType=VARCHAR})
@@ -319,10 +319,10 @@
         #{vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_status != null" >
-        #{vc_status,jdbcType=INTEGER},
+        #{vc_status,jdbcType=VARCHAR},
       </if>
       <if test="vc_statuscode != null" >
-        #{vc_statuscode,jdbcType=DECIMAL},
+        #{vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="vc_remark != null" >
         #{vc_remark,jdbcType=VARCHAR},
@@ -426,10 +426,10 @@
         vc_recorddate = #{record.vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vc_status != null" >
-        vc_status = #{record.vc_status,jdbcType=INTEGER},
+        vc_status = #{record.vc_status,jdbcType=VARCHAR},
       </if>
       <if test="record.vc_statuscode != null" >
-        vc_statuscode = #{record.vc_statuscode,jdbcType=DECIMAL},
+        vc_statuscode = #{record.vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="record.vc_remark != null" >
         vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
@@ -486,8 +486,8 @@
       vc_recorderid = #{record.vc_recorderid,jdbcType=INTEGER},
       vc_recorder = #{record.vc_recorder,jdbcType=VARCHAR},
       vc_recorddate = #{record.vc_recorddate,jdbcType=TIMESTAMP},
-      vc_status = #{record.vc_status,jdbcType=INTEGER},
-      vc_statuscode = #{record.vc_statuscode,jdbcType=DECIMAL},
+      vc_status = #{record.vc_status,jdbcType=VARCHAR},
+      vc_statuscode = #{record.vc_statuscode,jdbcType=VARCHAR},
       vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
     companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
@@ -565,10 +565,10 @@
         vc_recorddate = #{vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_status != null" >
-        vc_status = #{vc_status,jdbcType=INTEGER},
+        vc_status = #{vc_status,jdbcType=VARCHAR},
       </if>
       <if test="vc_statuscode != null" >
-        vc_statuscode = #{vc_statuscode,jdbcType=DECIMAL},
+        vc_statuscode = #{vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="vc_remark != null" >
         vc_remark = #{vc_remark,jdbcType=VARCHAR},
@@ -622,8 +622,8 @@
       vc_recorderid = #{vc_recorderid,jdbcType=INTEGER},
       vc_recorder = #{vc_recorder,jdbcType=VARCHAR},
       vc_recorddate = #{vc_recorddate,jdbcType=TIMESTAMP},
-      vc_status = #{vc_status,jdbcType=INTEGER},
-      vc_statuscode = #{vc_statuscode,jdbcType=DECIMAL},
+      vc_status = #{vc_status,jdbcType=VARCHAR},
+      vc_statuscode = #{vc_statuscode,jdbcType=VARCHAR},
       vc_remark = #{vc_remark,jdbcType=VARCHAR},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},

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

@@ -476,7 +476,7 @@
   </update>
   <delete id="deleteByParentPrimaryKey" parameterType="java.lang.Long" >
     delete from verificationdetail
-    where vd_id = #{vcd_vcid,jdbcType=INTEGER}
+    where vcd_id = #{vcd_vcid,jdbcType=INTEGER}
   </delete>
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
     select * from verificationdetail

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}@127.0.0.1:8500/eureka/
 server:
   port: 8800
   tomcat:

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDetailDTO.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.sale.dto;
 
 import com.usoftchina.saas.base.dto.CommonBaseDTO;
 
+import com.usoftchina.saas.document.dto.ProductDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -54,4 +55,6 @@ public class SaleDetailDTO extends CommonBaseDTO implements Serializable {
     private String sd_text4;
 
     private String sd_text5;
+
+    private ProductDTO productDTO;
 }

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

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.sale.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import com.usoftchina.saas.document.dto.ProductDTO;
+import com.usoftchina.saas.document.entities.Product;
 import lombok.Data;
 
 import java.util.Date;
@@ -52,4 +54,6 @@ public class SaleDetail extends CommonBaseEntity{
     private String sd_text4;
 
     private String sd_text5;
+
+    private ProductDTO productDTO;
 }

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

@@ -47,7 +47,7 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
-  port: 8900
+  port: 8820
   tomcat:
     uri-encoding: UTF-8
 info:

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

@@ -25,6 +25,36 @@
     <result column="sd_text3" property="sd_text3" jdbcType="VARCHAR" />
     <result column="sd_text4" property="sd_text4" jdbcType="VARCHAR" />
     <result column="sd_text5" property="sd_text5" jdbcType="VARCHAR" />
+    <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
+      <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>
   <sql id="Base_Column_List" >
     sd_id, sd_said, sd_detno, sd_prodid, sd_prodcode, sd_qty, sd_price, sd_total, sd_taxrate, 
@@ -336,7 +366,7 @@
   </delete>
 
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
-    select * from saledetail
+    select * from saledetail a left join product b on a.companyid=b.companyid and a.sd_prodid=b.pr_id
     where sd_said=#{id} order by sd_detno
   </select>
 </mapper>

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

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

frontend/saas-web/app/model/money/FundTransfer.js

@@ -0,0 +1,24 @@
+Ext.define('saas.model.money.FundTransfer', {
+    extend: 'saas.model.Base',
+    fields: [
+        { name: 'ftd_id', type: 'int' },
+        { name: 'ftd_ftid', type: 'int' },
+        { name: 'ftd_detno', type: 'int' },
+        { name: 'ftd_ym', type: 'int' },
+        { name: 'ftd_bankid', type: 'int' },
+        { name: 'ftd_bankcode', type: 'string' },
+        { name: 'ftd_bankname', type: 'string' },
+        { name: 'ftd_inbankid', type: 'int' },
+        { name: 'ftd_inbankcode', type: 'string' },
+        { name: 'ftd_inbankname', type: 'string' },
+        { name: 'ftd_nowbalance', type: 'float' },
+        { name: 'ftd_paymethod', type: 'string' },
+        { name: 'ftd_paycode', type: 'string' },
+        { name: 'ftd_remark', type: 'string' },
+        { name: 'ftd_text1', type: 'string' },
+        { name: 'ftd_text2', type: 'string' },
+        { name: 'ftd_text3', type: 'string' },
+        { name: 'ftd_text4', type: 'string' },
+        { name: 'ftd_text5', type: 'string' },
+    ]
+});

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

@@ -64,6 +64,11 @@ Ext.define('saas.util.FormUtil', {
                                 Ext.applyIf(c, {
                                     lockable: false
                                 });
+
+                                //必填
+                                if(c.logic=='necessaryField'){
+                                    c.cls = 'x-grid-necessary';
+                                }
                                 
                                 var editor = c.editor;
                                 if(editor && editor.xtype == 'numberfield') {

frontend/saas-web/app/view/core/base/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.core.base.BasePanelModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.core-base-basepanel',
-});

frontend/saas-web/app/view/core/base/BasePanel.js → frontend/saas-web/app/view/core/baseform/FormPanel.js

@@ -1,20 +1,20 @@
-Ext.define('saas.view.core.base.BasePanel', {
+Ext.define('saas.view.core.baseform.FormPanel', {
     extend: 'Ext.form.Panel',
-    xtype: 'core-base-basepanel',
-    
-    controller: 'core-base-basepanel',
-    viewModel: 'core-base-basepanel',
+    xtype: 'core-baseform-formpanel',
+    controller: 'core-baseform-formpanel',
+    viewModel: 'core-baseform-formpanel',
 
     //工具类
     FormUtil: Ext.create('saas.util.FormUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
 
     //基础属性
+    layout: 'column',
     autoScroll: true,
     border: 1,
     bodyPadding: 5,
-    layout: 'fit',
-    
+    searchField:[],
+
     fieldDefaults: {
         margin: '0 5 5 0',
         labelAlign: 'right',
@@ -22,18 +22,10 @@ Ext.define('saas.view.core.base.BasePanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
-    
-    searchField:[],
-    gridColumns: [],
 
     initComponent: function() {
 
-        var me = this,
-        gridConfig = me.gridConfig,
-        gridDataUrl = gridConfig.dataUrl,
-        gridIdField = gridConfig.idField,
-        gridCodeField = gridConfig.codeField,
-        gridColumns = gridConfig.columns;
+        var me = this;
 
         Ext.apply(me, {
             dockedItems: [{
@@ -48,16 +40,8 @@ Ext.define('saas.view.core.base.BasePanel', {
                     text: '查询',
                     handler: 'query'
                 }])
-            }],
-            items: [{
-                layout: 'fit',
-                xtype: 'core-base-gridpanel',
-                dataUrl: gridDataUrl,
-                idField: gridIdField,
-                codeField: gridCodeField,
-                columns: gridColumns
             }]
         });
         me.callParent(arguments);
-    },
+    }
 });

frontend/saas-web/app/view/core/base/BasePanelController.js → frontend/saas-web/app/view/core/baseform/FormPanelController.js

@@ -1,13 +1,13 @@
-Ext.define('saas.view.core.base.BasePanelController', {
+Ext.define('saas.view.core.baseform.FormPanelController', {
     extend: 'Ext.app.ViewController',
-    alias: 'controller.core-base-basepanel',
+    alias: 'controller.core-baseform-formpanel',
 
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     FormUtil: Ext.create('saas.util.FormUtil'),
 
     query: function() {
         var form = this.view;
-        var grid = form.down('core-baseform-gridpanel');
+        var grid = this.view.down('[name=baseGrid]');
         grid.condition = '';
         var fields = form.searchField.map(f => f.name);
         var items = [];

frontend/saas-web/app/view/core/baseform/FormPanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.core.baseform.FormPanelModel', {
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.core-baseform-formpanel',
+});

frontend/saas-web/app/view/core/base/GridPanel.js → frontend/saas-web/app/view/core/baseform/GridPanel.js

@@ -1,17 +1,17 @@
-Ext.define('saas.view.core.base.GridPanel', {
+Ext.define('saas.view.core.baseform.GridPanel', {
     extend: 'Ext.grid.Panel',
-    xtype: 'core-base-gridpanel',
+    xtype: 'core-baseform-gridpanel',
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+    dataUrl: '',
+    dbSearchFields: [],
+    condition:'',
 
     selModel: {
         checkOnly:true,
         type:'checkboxmodel',
         mode : "MULTI" ,
         ignoreRightMouseSelection : false
-    },
-    
-    dataUrl: '',
-    dbSearchFields: [],
-    condition:'',
+	},
 
     initComponent: function() {
         var me = this;
@@ -153,11 +153,11 @@ Ext.define('saas.view.core.base.GridPanel', {
                 })
                 .then(function() {
                     showToast('操作成功');
+                    grid.store.load();
                 })
                 .catch(function(response) {
                     showToast('操作失败');
                 });
-                grid.store.load();
         }else{
             showToast('请勾选至少一条明细。');
         }

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

@@ -62,7 +62,12 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                         }
                     },'->',{
                         xtype:'button',
-                        text:'新增'
+                        text:'新增',
+                        handler:function(b){
+                            var grid = me;
+                            var trigger = grid.ownerCt.trigger;
+                            openTab(trigger.addXtype, '新增'+trigger.addTitle,trigger.addXtype + '_add');
+                        }
                     }])
                 },{
                     xtype: 'pagingtoolbar',

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

@@ -30,7 +30,6 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     		var sfield='';
             var dbfinds=me.dbfinds;
             var dbtpls=me.dbtpls;
-            var dbCondition = me.dbCondition.replace(new RegExp("\\{0}","g"), queryString);
     		me.lastQueryValue=queryString;
             if(queryString.trim()==''){
                 me.collapse( );
@@ -72,10 +71,21 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                 }
                 //加载数据
                 var data;
+                var dbCondition = [{
+                    type:'string',
+                    field:this.dbtplfield,
+                    operation:'like',
+                    value:queryString
+                }];
                 Ext.Ajax.request({
                     url: me.dataUrl,
                     params: {
-                        keyword:dbCondition
+                        number: 1,
+                        size: 10,
+                        condition:JSON.stringify(dbCondition),
+                        page: 1,
+                        start: 0,
+                        limit: 10
                     },
                     method: 'GET',
                     success: function(response, opts) {

frontend/saas-web/app/view/core/dbfind/MultiDbfindGridPanel.js

@@ -90,7 +90,12 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                         }
                     },'->',{
                         xtype:'button',
-                        text:'新增'
+                        text:'新增',
+                        handler:function(b){
+                            var grid = me;
+                            var trigger = grid.ownerCt.trigger;
+                            openTab(trigger.addXtype, '新增'+trigger.addTitle,trigger.addXtype + '_add');
+                        }
                     },{
                         xtype:'button',
                         text:'确定',

frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -1,16 +0,0 @@
-Ext.define('saas.view.document.bom.BasePanel', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-bom-basepanel',
-
-    controller: 'document-bom-basepanel',
-    viewModel: 'document-bom-basepanel',
-
-    //字段属性
-    _title:'BOM资料',
-    _dataUrl:basePath + 'document/vendor/getVendorsByCondition',
-    _saveUrl:basePath + 'document/vendor/save',
-    _deleteUrl:basePath + 'document/vendor/delete',
-
-
-
-});

frontend/saas-web/app/view/document/bom/BasePanelController.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.bom.BasePanelController', {
-    extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-bom-basepanel',
-    
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/bom/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.bom.BasePanelModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.document-bom-basepanel'
-});

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -1,92 +0,0 @@
-Ext.define('saas.view.document.customer.BasePanel', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-customer-basepanel',
-
-    controller: 'document-customer-basepanel',
-    viewModel: 'document-customer-basepanel',
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl:basePath+'ducument/customerkind/getCombo',
-        name : "cu_type", 
-        emptyText : "请选择客户类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            customerkind:{
-                keyField:'id',
-                dataField:'ck_name',
-                reqUrl:basePath+'ducument/customerkind/save',
-                delUrl:basePath+'ducument/customerkind/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增客户类型'
-                },
-                dataKind:'customerkind',
-                belong:this.ownerCmp.etc['customerkind'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'document-customer-formpanel',
-    _title:'客户资料',
-    // _dataUrl:basePath+'ducument/customer/list',
-    _batchOpenUrl:basePath+'ducument/customer/batchOpen',
-    _batchCloseUrl:basePath+'ducument/customer/batchClose',
-    _batchDeleteUrl:basePath+'ducument/customer/batchDelete',
-
-    gridConfig: {
-        idField: 'id',
-        codeField: 'cu_code',
-        dataUrl: basePath+'ducument/customer/list',
-        columns : [{
-            text : "客户id", 
-            width : 0, 
-            dataIndex : "id", 
-            xtype : "numbercolumn", 
-        },{
-            text : "客户编号", 
-            width : 200.0, 
-            dataIndex : "cu_code", 
-        }, 
-        {
-            text : "客户名称", 
-            dataIndex : "cu_name", 
-            width : 120.0, 
-        }, 
-        {
-            text : "客户状态", 
-            dataIndex : "cu_status", 
-            width : 120.0, 
-        }, 
-        {
-            text : "客户UU", 
-            dataIndex : "cu_uu", 
-            width : 120.0, 
-        }, 
-        {
-            text : "默认客户地址", 
-            dataIndex : "ca_address", 
-            width : 120.0, 
-        }, 
-        {
-            text : "默认客户联系人", 
-            dataIndex : "cc_name", 
-            flex : 1.0, 
-        }]
-    },
-
-});

frontend/saas-web/app/view/document/customer/BasePanelController.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.customer.BasePanelController', {
-    extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-customer-basepanel',
-
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/customer/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.customer.BasePanelModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.document-customer-basepanel'
-});

frontend/saas-web/app/view/document/customer/FormModel.js

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.customer.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.document-customer-formpanel',
-
-    
-});

frontend/saas-web/app/view/document/customer/list/FormPanel.js

@@ -0,0 +1,112 @@
+Ext.define('saas.view.document.customer.list.FormPanel', {
+    extend: 'saas.view.core.baseform.FormPanel',
+    xtype: 'customer-list-formpanel',
+    controller: 'customer-list-formpanel',
+    viewModel: 'customer-list-formpanel',
+
+    fieldDefaults: {
+        margin: '0 5 5 0',
+        labelAlign: 'right',
+        labelWidth: 90,
+        blankText: '该字段不能为空'
+    },
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/customerkind/getCombo',
+        name : "cu_type", 
+        emptyText : "请选择客户类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            customerkind:{
+                keyField:'id',
+                dataField:'ck_name',
+                reqUrl:basePath+'ducument/customerkind/save',
+                delUrl:basePath+'ducument/customerkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增客户类型'
+                },
+                dataKind:'customerkind',
+                belong:this.ownerCmp.etc['customerkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'customer-panel-formpanel',
+    _title:'客户资料',
+    _dataUrl:basePath+'ducument/customer/list',
+    _batchOpenUrl:basePath+'ducument/customer/batchOpen',
+    _batchCloseUrl:basePath+'ducument/customer/batchClose',
+    _batchDeleteUrl:basePath+'ducument/customer/batchDelete',
+
+    initComponent: function () {
+        var me = this;
+        Ext.apply(me, {
+            items: [{
+                idField: 'id',
+                codeField: 'cu_code',
+                name : "baseGrid", 
+                xtype : "core-baseform-gridpanel", 
+                layout:'fit',
+                dataUrl:me._dataUrl,
+                columns : [{
+                    text : "客户id", 
+                    width : 0, 
+                    dataIndex : "id", 
+                    xtype : "numbercolumn", 
+                },{
+                    text : "客户编号", 
+                    width : 200.0, 
+                    dataIndex : "cu_code", 
+                    xtype : "", 
+                }, 
+                {
+                    text : "客户名称", 
+                    dataIndex : "cu_name", 
+                    width : 120.0, 
+                    xtype : "", 
+                }, 
+                {
+                    text : "客户状态", 
+                    dataIndex : "cu_status", 
+                    width : 120.0, 
+                    xtype : ""
+                }, 
+                {
+                    text : "客户UU", 
+                    dataIndex : "cu_uu", 
+                    width : 120.0, 
+                    xtype : "",
+                }, 
+                {
+                    text : "默认客户地址", 
+                    dataIndex : "ca_address", 
+                    width : 120.0, 
+                    xtype : "",
+                }, 
+                {
+                    text : "默认客户联系人", 
+                    dataIndex : "cc_name", 
+                    flex : 1.0, 
+                    xtype : "",
+                }]
+            }]
+        });
+        me.callParent(arguments);
+    }
+});

frontend/saas-web/app/view/document/customer/list/FormPanelController.js

@@ -0,0 +1,11 @@
+Ext.define('saas.view.document.customer.list.FormPanelController', {
+    extend: 'saas.view.core.baseform.FormPanelController',
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    alias: 'controller.customer-list-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/customer/list/FormPanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.customer.list.FormPanelModel', {
+    extend: 'saas.view.core.baseform.FormPanelModel',
+    alias: 'viewmodel.customer-list-formpanel'
+});

frontend/saas-web/app/view/document/customer/FormController.js → frontend/saas-web/app/view/document/customer/panel/FormController.js

@@ -1,7 +1,6 @@
-Ext.define('saas.view.document.customer.FormController', {
+Ext.define('saas.view.document.customer.panel.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.document-customer-formpanel',
-    
+    alias: 'controller.customer-panel-formpanel',
     init: function (form) {
         var me = this;
         this.control({});

frontend/saas-web/app/view/document/customer/panel/FormModel.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.customer.panel.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.customer-panel-formpanel',
+
+    
+});

frontend/saas-web/app/view/document/customer/FormPanel.js → frontend/saas-web/app/view/document/customer/panel/FormPanel.js

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.customer.FormPanel', {
+Ext.define('saas.view.document.customer.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'document-customer-formpanel',
+    xtype: 'customer-panel-formpanel',
 
-    controller: 'document-customer-formpanel',
-    viewModel: 'document-customer-formpanel',
+    controller: 'customer-panel-formpanel',
+    viewModel: 'customer-panel-formpanel',
     
     caller:'Customer',
 
@@ -149,7 +149,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'cc_detno',
         storeModel:'saas.model.document.customercontact',
-        _deleteDetailUrl:basePath+'ducument/customer/deletecontact/',
+        deleteDetailUrl:basePath+'ducument/customer/deletecontact/',
         columns : [
             {
                 text : "ID", 
@@ -240,7 +240,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
-        _deleteDetailUrl:basePath+'ducument/customer/deleteaddress/',
+        deleteDetailUrl:basePath+'ducument/customer/deleteaddress/',
         columns : [
             {
                 text : "ID", 
@@ -336,9 +336,9 @@ Ext.define('saas.view.document.customer.FormPanel', {
         statusCodeField = me._statusCodeField,
         viewModel = me.getViewModel();
         
-        viewModel.set('form.' + codeField, '--------------');
-        viewModel.set('form.createTime', new Date());
-        viewModel.set('form.updateTime', new Date());
+        viewModel.set(codeField, '');
+        viewModel.set('createTime', new Date());
+        viewModel.set('updateTime', new Date());
 
         if(statusCodeField) {
             var o = {};

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

@@ -110,6 +110,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         },
         storeinformation:{
             items:[{
+                xtype:'hidden',
+                name:'id'
+            },{
                 xtype:'textfield',
                 fieldLabel: '仓库编号',
                 name: 'wh_code'
@@ -121,7 +124,13 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 readOnly:true,
                 xtype:'textfield',
                 fieldLabel: '仓库状态',
-                name: 'wh_status'
+                name: 'wh_status',
+                value:'已开启'
+            },{
+                xtype:'hidden',
+                fieldLabel: '仓库状态码',
+                name: 'wh_statuscode',
+                value:'OPEN'
             }]
         }
     },

frontend/saas-web/app/view/document/kind/Kind.js

@@ -6,6 +6,9 @@ Ext.define('saas.view.document.kind.Kind', {
     xtype: 'document-kind',
     autoScroll: true,
     layout:'fit',
+    //工具类
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
     controller:'document-kind',
     viewModel: {
         type: 'document-kind'
@@ -151,9 +154,51 @@ Ext.define('saas.view.document.kind.Kind', {
                 dataIndex: 'wh_description',
                 width: 200
             },{
-                text: '仓库状态',
+                text: '仓库状态码',
                 dataIndex: 'wh_status',
-                width: 100
+                width: 0
+            },{
+                text: '仓库状态',
+                dataIndex: 'wh_statuscode',
+                width:90,
+                xtype: 'actioncolumn',
+                align : 'center',
+                items: [{
+                    icon:basePath + 'resource/images/16/lock_bg.png',
+                    tooltip: '锁定',
+                    iconCls:'',
+                    getClass: function(v, meta, rec) {
+                        if(rec.get('wh_statuscode')=='OPEN'){
+                            this.items[0].tooltip = '不启用';
+                            return 'x-grid-checkcolumn-checked';
+                        }else{
+                            this.items[0].tooltip = '启用';
+                            return 'x-grid-checkcolumn';
+                        }
+                    },
+                    handler: function(view, rowIndex, colIndex) {
+                        var rec = view.getStore().getAt(rowIndex);
+                        var type=rec.get('wh_statuscode')=='OPEN'?true:false;
+                        //  禁用/启用
+                        var form = this.ownerCt.ownerCt.ownerCt;
+                        var grid = this.ownerCt.ownerCt;
+                        form.BaseUtil.request({
+                            url: (!type?form._openUrl:form._closeUrl)+'/'+rec.get('id'),
+                            params: '',
+                            method: 'POST',
+                        })
+                        .then(function(localJson) {
+                            if(localJson.success){
+                                showToast('操作成功');
+                                grid.store.load();
+                            }
+                        })
+                        .catch(function(res) {
+                            console.error(res);
+                            showToast('操作失败: ' + res.message);
+                        });
+                    }
+                }]
             }],
             keyField:'id',
             reqUrl: basePath + 'document/warehouse/save',

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

@@ -40,7 +40,8 @@ Ext.define('saas.view.document.kind.KindController', {
         me.createDialog(dataKind);
     },
     onRefresh:function(){
-
+        var me = this;
+        me.view.items.items[0].store.load();
     },
     insertActionColumn:function(columns){
         var me=this;

frontend/saas-web/app/view/document/kind/KindModel.js

@@ -133,7 +133,8 @@ Ext.define('saas.view.document.kind.KindModel', {
                 {name: 'id', type: 'int'},
                 {name: 'wh_code',  type: 'string'},
                 {name: 'wh_description',  type: 'string'},
-                {name: 'wh_statuscode',  type: 'string'}
+                {name: 'wh_statuscode',  type: 'string'},
+                {name: 'wh_status',  type: 'string'}
             ],
             proxy: {
                 type: 'ajax',

frontend/saas-web/app/view/document/other/StoreInformation.js

@@ -4,6 +4,8 @@ Ext.define('saas.view.document.other.StoreInformation', {
     autoScroll: true,
     layout:'fit',
     defaultType:'storeinformation',
+    _openUrl:basePath + 'document/warehouse/open',
+    _closeUrl:basePath + 'document/warehouse/close',
     tbar: ['->',{
         xtype:'button',
         text:'新增',

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -1,86 +0,0 @@
-Ext.define('saas.view.document.product.BasePanel', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-product-basepanel',
-
-    controller: 'document-product-basepanel',
-    viewModel: 'document-product-basepanel',
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl: basePath + 'document/producttype/getCombo',
-        name : "pr_type", 
-        emptyText : "请选择物料类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            producttype:{
-                keyField:'id',
-                dataField:'pr_name',
-                reqUrl:basePath + 'document/producttype/save',
-                delUrl:basePath + 'document/producttype/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增物料类型'
-                },
-                dataKind:'producttype',
-                belong:this.ownerCmp.etc['producttype'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'document-product-formpanel',
-    _title:'物料资料',
-    // _dataUrl: basePath + 'document/product/list',
-    _batchOpenUrl: basePath + 'document/product/batchOpen',
-    _batchCloseUrl: basePath + 'document/product/batchClose',
-    _batchDeleteUrl: basePath + 'document/product/batchDelete',
-
-    gridConfig: {
-        idField: 'id',
-        codeField: 'pr_code',
-        dataUrl: basePath + 'document/product/list',
-        columns : [{
-            text : "id", 
-            width : 0, 
-            dataIndex : "id", 
-            xtype : "numbercolumn", 
-        },{
-            text : "物料编号", 
-            width : 200.0, 
-            dataIndex : "pr_code", 
-            xtype : "", 
-        }, 
-        {
-            text : "物料名称", 
-            dataIndex : "pr_detail", 
-            width : 120.0, 
-            xtype : "", 
-        }, 
-        {
-            text : "状态", 
-            dataIndex : "pr_status", 
-            width : 120.0, 
-            xtype : ""
-        }, 
-        {
-            text : "物料种类", 
-            dataIndex : "pr_type", 
-            width : 120.0, 
-            xtype : "",
-        }]
-    },
-
-});

frontend/saas-web/app/view/document/product/BasePanelController.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.product.BasePanelController', {
-    extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-product-basepanel',
-
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/product/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.product.BasePanelModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.document-product-basepanel'
-});

frontend/saas-web/app/view/document/product/FormModel.js

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.product.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.document-product-formpanel',
-
-    
-});

frontend/saas-web/app/view/document/product/list/FormPanel.js

@@ -0,0 +1,109 @@
+Ext.define('saas.view.document.product.list.FormPanel', {
+    extend: 'saas.view.core.baseform.FormPanel',
+    xtype: 'product-list-formpanel',
+    controller: 'product-list-formpanel',
+    viewModel: 'product-list-formpanel',
+
+    //工具类
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+
+    //基础属性
+    layout: 'fit',
+    autoScroll: true,
+    border: 1,
+
+    fieldDefaults: {
+        margin: '0 5 5 0',
+        labelAlign: 'right',
+        labelWidth: 90,
+        blankText: '该字段不能为空'
+    },
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl: basePath + 'document/producttype/getCombo',
+        name : "pr_type", 
+        emptyText : "请选择物料类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            producttype:{
+                keyField:'id',
+                dataField:'pr_name',
+                reqUrl:basePath + 'document/producttype/save',
+                delUrl:basePath + 'document/producttype/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增物料类型'
+                },
+                dataKind:'producttype',
+                belong:this.ownerCmp.etc['producttype'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'product-panel-formpanel',
+    _title:'物料资料',
+    _dataUrl:basePath + 'document/product/list',
+    _batchOpenUrl:basePath + 'document/product/batchOpen',
+    _batchCloseUrl:basePath + 'document/product/batchClose',
+    _batchDeleteUrl:basePath + 'document/product/batchDelete',
+
+    initComponent: function () {
+        var me = this;
+        Ext.apply(me, {
+            items: [{
+                idField: 'id',
+                codeField: 'pr_code',
+                name : "baseGrid", 
+                xtype : "core-baseform-gridpanel", 
+                layout:'fit',
+                dataUrl:me._dataUrl,
+                columns : [{
+                    text : "id", 
+                    width : 0, 
+                    dataIndex : "id", 
+                    xtype : "numbercolumn", 
+                },{
+                    text : "物料编号", 
+                    width : 200.0, 
+                    dataIndex : "pr_code", 
+                    xtype : "", 
+                }, 
+                {
+                    text : "物料名称", 
+                    dataIndex : "pr_detail", 
+                    width : 120.0, 
+                    xtype : "", 
+                }, 
+                {
+                    text : "状态", 
+                    dataIndex : "pr_status", 
+                    width : 120.0, 
+                    xtype : ""
+                }, 
+                {
+                    text : "物料种类", 
+                    dataIndex : "pr_type", 
+                    width : 120.0, 
+                    xtype : "",
+                }]
+            }]
+        });
+        me.callParent(arguments);
+    }
+});

frontend/saas-web/app/view/document/product/list/FormPanelController.js

@@ -0,0 +1,11 @@
+Ext.define('saas.view.document.product.list.FormPanelController', {
+    extend: 'saas.view.core.baseform.FormPanelController',
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    alias: 'controller.product-list-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/product/list/FormPanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.product.list.FormPanelModel', {
+    extend: 'saas.view.core.baseform.FormPanelModel',
+    alias: 'viewmodel.product-list-formpanel'
+});

frontend/saas-web/app/view/document/product/FormController.js → frontend/saas-web/app/view/document/product/panel/FormController.js

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.product.FormController', {
+Ext.define('saas.view.document.product.panel.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.document-product-formpanel',
+    alias: 'controller.product-panel-formpanel',
     init: function (form) {
         var me = this;
         this.control({

frontend/saas-web/app/view/document/product/panel/FormModel.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.product.panel.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.product-panel-formpanel',
+
+    
+});

frontend/saas-web/app/view/document/product/FormPanel.js → frontend/saas-web/app/view/document/product/panel/FormPanel.js

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.product.FormPanel', {
+Ext.define('saas.view.document.product.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'document-product-formpanel',
+    xtype: 'product-panel-formpanel',
 
-    controller: 'document-product-formpanel',
-    viewModel: 'document-product-formpanel',
+    controller: 'product-panel-formpanel',
+    viewModel: 'product-panel-formpanel',
     
     caller:'Product',
 
@@ -212,9 +212,9 @@ Ext.define('saas.view.document.product.FormPanel', {
         statusCodeField = me._statusCodeField,
         viewModel = me.getViewModel();
         
-        viewModel.set('form.' + codeField, '--------------');
-        viewModel.set('form.createTime', new Date());
-        viewModel.set('form.updateTime', new Date());
+        viewModel.set(codeField, '');
+        viewModel.set('createTime', new Date());
+        viewModel.set('updateTime', new Date());
 
         if(statusCodeField) {
             var o = {};

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -1,91 +0,0 @@
-Ext.define('saas.view.document.vendor.BasePanel', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-vendor-basepanel',
-    controller: 'document-vendor-basepanel',
-    viewModel: 'document-vendor-basepanel',
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl:basePath+'ducument/vendorkind/getCombo',
-        name : "ve_type", 
-        emptyText : "请选择供应商类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            vendorkind:{
-                keyField:'id',
-                dataField:'vk_name',
-                reqUrl:basePath+'ducument/vendorkind/save',
-                delUrl:basePath+'ducument/vendorkind/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增供应商类型'
-                },
-                dataKind:'vendorkind',
-                belong:this.ownerCmp.etc['vendorkind'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'document-vendor-formpanel',
-    _title:'供应商资料',
-    // _dataUrl:basePath+'ducument/vendor/list',
-    _deleteUrl:basePath+'ducument/vendor/delete/',
-    _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
-    _batchCloseUrl:basePath+'ducument/vendor/batchClose',
-    _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
-
-    gridConfig: {
-        idField: 'id',
-        codeField: 've_code',
-        dataUrl: basePath+'ducument/vendor/list',
-        columns : [{
-            text : "供应商id", 
-            width : 0, 
-            dataIndex : "id", 
-            xtype : "numbercolumn", 
-        },{
-            text : "供应商编号", 
-            width : 200.0, 
-            dataIndex : "ve_code", 
-            xtype : "", 
-        }, 
-        {
-            text : "供应商名称", 
-            dataIndex : "ve_name", 
-            width : 120.0, 
-            xtype : "", 
-        }, 
-        {
-            text : "供应商状态", 
-            dataIndex : "ve_status", 
-            width : 120.0, 
-            xtype : ""
-        }, 
-        {
-            text : "供应商UU", 
-            dataIndex : "ve_uu", 
-            width : 120.0, 
-            xtype : "",
-        }, 
-        {
-            text : "默认供应商联系人", 
-            dataIndex : "vc_name", 
-            flex : 1.0, 
-            xtype : "",
-        }]
-    },
-});

frontend/saas-web/app/view/document/vendor/BasePanelController.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.vendor.BasePanelController', {
-    extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-vendor-basepanel',
-
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/vendor/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.vendor.BasePanelModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.document-vendor-basepanel'
-});

frontend/saas-web/app/view/document/vendor/FormModel.js

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.vendor.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.document-vendor-formpanel',
-
-    
-});

frontend/saas-web/app/view/document/vendor/list/FormPanel.js

@@ -0,0 +1,116 @@
+Ext.define('saas.view.document.vendor.list.FormPanel', {
+    extend: 'saas.view.core.baseform.FormPanel',
+    xtype: 'vendor-list-formpanel',
+    controller: 'vendor-list-formpanel',
+    viewModel: 'vendor-list-formpanel',
+
+    //工具类
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+
+    //基础属性
+    layout: 'fit',
+    autoScroll: true,
+    border: 1,
+
+    fieldDefaults: {
+        margin: '0 5 5 0',
+        labelAlign: 'right',
+        labelWidth: 90,
+        blankText: '该字段不能为空'
+    },
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/vendorkind/getCombo',
+        name : "ve_type", 
+        emptyText : "请选择供应商类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            vendorkind:{
+                keyField:'id',
+                dataField:'vk_name',
+                reqUrl:basePath+'ducument/vendorkind/save',
+                delUrl:basePath+'ducument/vendorkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增供应商类型'
+                },
+                dataKind:'vendorkind',
+                belong:this.ownerCmp.etc['vendorkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'vendor-panel-formpanel',
+    _title:'供应商资料',
+    _dataUrl:basePath+'ducument/vendor/list',
+    _deleteUrl:basePath+'ducument/vendor/delete/',
+    _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
+    _batchCloseUrl:basePath+'ducument/vendor/batchClose',
+    _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
+
+    initComponent: function () {
+        var me = this;
+        Ext.apply(me, {
+            items: [{
+                idField: 'id',
+                codeField: 've_code',
+                name : "baseGrid", 
+                xtype : "core-baseform-gridpanel", 
+                layout:'fit',
+                dataUrl:me._dataUrl,
+                columns : [{
+                    text : "供应商id", 
+                    width : 0, 
+                    dataIndex : "id", 
+                    xtype : "numbercolumn", 
+                },{
+                    text : "供应商编号", 
+                    width : 200.0, 
+                    dataIndex : "ve_code", 
+                    xtype : "", 
+                }, 
+                {
+                    text : "供应商名称", 
+                    dataIndex : "ve_name", 
+                    width : 120.0, 
+                    xtype : "", 
+                }, 
+                {
+                    text : "供应商状态", 
+                    dataIndex : "ve_status", 
+                    width : 120.0, 
+                    xtype : ""
+                }, 
+                {
+                    text : "供应商UU", 
+                    dataIndex : "ve_uu", 
+                    width : 120.0, 
+                    xtype : "",
+                }, 
+                {
+                    text : "默认供应商联系人", 
+                    dataIndex : "vc_name", 
+                    flex : 1.0, 
+                    xtype : "",
+                }]
+            }]
+        });
+        me.callParent(arguments);
+    }
+});

frontend/saas-web/app/view/document/vendor/list/FormPanelController.js

@@ -0,0 +1,11 @@
+Ext.define('saas.view.document.vendor.list.FormPanelController', {
+    extend: 'saas.view.core.baseform.FormPanelController',
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    alias: 'controller.vendor-list-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});