Merge remote-tracking branch 'origin/dev' into dev

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -20,6 +21,16 @@ public class ListReqDTO implements Serializable {
 
     private String calculateFields;
 
+    private String ym;
+
+    public String getYm() {
+        return ym;
+    }
+
+    public void setYm(String ym) {
+        this.ym = ym;
+    }
+
     //将列拼成查询语句，直接查询出数据的格式为json
     public String getCalculateFieldsSql() {
         try {

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

@@ -33,8 +33,9 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BIZ_PRODWHCODE_REPEAT(79309, "明细仓库重复"),
     BIZ_UNENDPRODUCT(79310,"系统还未结账，不能反结账"),
     BIZ_RELUPDATE_CODEANDNAME(79311,"存在关联单据,不允许更新编号,名称"),
-    BIZ_RELUPDATE_AMOUNT(79312,"存在关联单据,不允许更新期初应收，期初预收"),
+    BIZ_RELUPDATE_AMOUNT(79312,"存在关联单据,不允许更新期初应收，期初预收，期初日期"),
     NO_OPRATIONDATA(79400,"无可操作单据"),
+
     BOM_SAVE(79401, "产品编号+版本号已存在"),
     REPEAT_NAME(79501, "名称重复"),
     REPEAT_CODE(79502, "编号重复"),
@@ -85,16 +86,20 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BANK_AMOUNT_NOTENOUGH(74004, "资金账号不足"),
     SUBLEDGER_NOT_EXIS(74005,"来源单据不存在"),
     CHECK_SETACOUNT_EXIS(74006, "不能删除单据日期小于等于结账期间<u>%s</u>的单据"),
-    VERIFICATION_CHECK_BALANCE(74007,"核销金额不能大于未核销金额"),
+    VERIFICATION_CHECK_BALANCE(74007,"本次核销金额不相等！"),
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
+    DOCUMENTS_AUDITED(74009,"存在已审核单据:%S"),
+    DOCUMENTS_UNAUDITED(74009,"存在未审核单据:%S"),
 
 
 
     //库存
     EMPTY_DATA(76100,"数据为空,请填写后再保存"),
+    STORAGE_POST_ERROR(76200,""),
     UNENOUGH_DETAIL_STOCK(76300, "行%s库存不足"),
     UNENOUGH_STOCK(76400, "%s :库存不足"),
-    STORAGE_POST_ERROR(76200,""),
+    UNPOSTSTOCKPROFIT_EXISTS(76500, "存在当前仓库+物料未审核的盘盈盘亏单"),
+    STOCKPROFIT_NULL(76600, "没有需要生成的盘盈盘亏单")
     ;
     private int code;
     private String message;

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/BillCodeSeq.java

@@ -40,7 +40,7 @@ public enum  BillCodeSeq {
 
     RECBALANCE("收款单", "RecBalance"),
 
-    VERIFICATION("核价单", "Verification"),
+    VERIFICATION("核销单", "Verification"),
 
     OTHRECEIPTS("其它收入单","OthReceipts"),
 
@@ -50,6 +50,8 @@ public enum  BillCodeSeq {
 
     BOM("BOM资料", "Bom");
 
+
+
     BillCodeSeq(String name, String caller) {
         this.name = name;
         this.caller = caller;

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Enterprise.java

@@ -20,12 +20,6 @@ public class Enterprise extends CommonBaseEntity implements Serializable {
 
     private String en_pricemethod;
 
-    private Integer en_recorderid;
-
-    private String en_recorder;
-
-    private Date en_recorddate;
-
     private byte[] en_signet;
 
     public String getEn_name() {
@@ -84,30 +78,6 @@ public class Enterprise extends CommonBaseEntity implements Serializable {
         this.en_pricemethod = en_pricemethod;
     }
 
-    public Integer getEn_recorderid() {
-        return en_recorderid;
-    }
-
-    public void setEn_recorderid(Integer en_recorderid) {
-        this.en_recorderid = en_recorderid;
-    }
-
-    public String getEn_recorder() {
-        return en_recorder;
-    }
-
-    public void setEn_recorder(String en_recorder) {
-        this.en_recorder = en_recorder;
-    }
-
-    public Date getEn_recorddate() {
-        return en_recorddate;
-    }
-
-    public void setEn_recorddate(Date en_recorddate) {
-        this.en_recorddate = en_recorddate;
-    }
-
     public byte[] getEn_signet() {
         return en_signet;
     }

applications/commons/commons-server/src/main/resources/mapper/EnterpriseMapper.xml

@@ -10,9 +10,6 @@
         <result column="en_postcodes" property="en_postcodes" jdbcType="VARCHAR" />
         <result column="en_begindate" property="en_begindate" jdbcType="TIMESTAMP" />
         <result column="en_pricemethod" property="en_pricemethod" jdbcType="VARCHAR" />
-        <result column="en_recorderid" property="en_recorderid" jdbcType="INTEGER" />
-        <result column="en_recorder" property="en_recorder" jdbcType="VARCHAR" />
-        <result column="en_recorddate" property="en_recorddate" jdbcType="TIMESTAMP" />
         <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     </resultMap>
@@ -47,15 +44,6 @@
             <if test="en_pricemethod != null" >
                 en_pricemethod,
             </if>
-            <if test="en_recorderid != null" >
-                en_recorderid,
-            </if>
-            <if test="en_recorder != null" >
-                en_recorder,
-            </if>
-            <if test="en_recorddate != null" >
-                en_recorddate,
-            </if>
             <if test="updaterId != null" >
                 updaterId,
             </if>
@@ -88,15 +76,6 @@
             <if test="en_pricemethod != null" >
                 #{en_pricemethod,jdbcType=VARCHAR},
             </if>
-            <if test="en_recorderid != null" >
-                #{en_recorderid,jdbcType=INTEGER},
-            </if>
-            <if test="en_recorder != null" >
-                #{en_recorder,jdbcType=VARCHAR},
-            </if>
-            <if test="en_recorddate != null" >
-                #{en_recorddate,jdbcType=TIMESTAMP},
-            </if>
             <if test="updaterId != null" >
                 #{updaterId,jdbcType=INTEGER},
             </if>
@@ -132,15 +111,6 @@
             <if test="en_pricemethod != null" >
                 en_pricemethod = #{en_pricemethod,jdbcType=VARCHAR},
             </if>
-            <if test="en_recorderid != null" >
-                en_recorderid = #{en_recorderid,jdbcType=INTEGER},
-            </if>
-            <if test="en_recorder != null" >
-                en_recorder = #{en_recorder,jdbcType=VARCHAR},
-            </if>
-            <if test="en_recorddate != null" >
-                en_recorddate = #{en_recorddate,jdbcType=TIMESTAMP},
-            </if>
             <if test="updaterId != null" >
                 updaterId = #{updaterId,jdbcType=INTEGER},
             </if>

applications/commons/commons-server/src/main/resources/mapper/HomePageMapper.xml

@@ -17,7 +17,7 @@
       (
 	  select concat('{"x":"其它","y":',ifnull(round((all_sum - five_sum)/10000,2),0),'}') other from (
 		(select sum(si_amount) all_sum from statsinfo  where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC')a,
-        (select sum(si_amount) five_sum from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC' ORDER BY si_amount desc limit 0,5) b)
+        (select sum(si_amount) five_sum from (select si_amount from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC' ORDER BY si_amount desc limit 0,5)e) b)
 	  ) b1
     </select>
 
@@ -72,7 +72,7 @@
     ) c)d,(
 
     select concat('{"x":"其它","y":',ifnull(round((all_sum - five_sum)/10000,2),0),'}') other from ( (select sum(si_amount) all_sum from statsinfo  where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='SALE')a,
-    (select sum(si_amount) five_sum from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='SALE' ORDER BY si_amount desc limit 0,5)b))e)
+    ( select sum(si_amount) five_sum from (select si_amount from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='SALE' ORDER BY si_amount desc limit 0,5)f)b))e)
     </select>
 
     <select id="getSaleFutureData" parameterType="long" resultType="string">

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

@@ -26,9 +26,6 @@ public class ProductDTO implements Serializable {
     private long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;

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

@@ -6,7 +6,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 public class Address extends CommonBaseEntity implements Serializable {
-    private Date ad_recorddate;
 
     private String ad_text1;
 
@@ -20,14 +19,6 @@ public class Address extends CommonBaseEntity implements Serializable {
 
     private String ad_address;
 
-    public Date getAd_recorddate() {
-        return ad_recorddate;
-    }
-
-    public void setAd_recorddate(Date ad_recorddate) {
-        this.ad_recorddate = ad_recorddate;
-    }
-
     public String getAd_text1() {
         return ad_text1;
     }

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

@@ -23,12 +23,6 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
 
     private String bk_statuscode;
 
-    private Integer bk_recorderid;
-
-    private String bk_recorder;
-
-    private Date bk_recorddate;
-
     private Integer bk_ym;
 
     private String bk_text1;
@@ -126,29 +120,6 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
         this.bk_statuscode = bk_statuscode;
     }
 
-    public Integer getBk_recorderid() {
-        return bk_recorderid;
-    }
-
-    public void setBk_recorderid(Integer bk_recorderid) {
-        this.bk_recorderid = bk_recorderid;
-    }
-
-    public String getBk_recorder() {
-        return bk_recorder;
-    }
-
-    public void setBk_recorder(String bk_recorder) {
-        this.bk_recorder = bk_recorder;
-    }
-
-    public Date getBk_recorddate() {
-        return bk_recorddate;
-    }
-
-    public void setBk_recorddate(Date bk_recorddate) {
-        this.bk_recorddate = bk_recorddate;
-    }
 
     public Integer getBk_ym() {
         return bk_ym;

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

@@ -19,12 +19,6 @@ public class Bom extends CommonBaseEntity implements Serializable {
 
     private String bo_statuscode;
 
-    private Integer bo_recorderid;
-
-    private String bo_recorder;
-
-    private Date bo_recorddate;
-
     private String bo_text1;
 
     private String bo_text2;
@@ -123,30 +117,6 @@ public class Bom extends CommonBaseEntity implements Serializable {
         this.bo_statuscode = bo_statuscode == null ? null : bo_statuscode.trim();
     }
 
-    public Integer getBo_recorderid() {
-        return bo_recorderid;
-    }
-
-    public void setBo_recorderid(Integer bo_recorderid) {
-        this.bo_recorderid = bo_recorderid;
-    }
-
-    public String getBo_recorder() {
-        return bo_recorder;
-    }
-
-    public void setBo_recorder(String bo_recorder) {
-        this.bo_recorder = bo_recorder == null ? null : bo_recorder.trim();
-    }
-
-    public Date getBo_recorddate() {
-        return bo_recorddate;
-    }
-
-    public void setBo_recorddate(Date bo_recorddate) {
-        this.bo_recorddate = bo_recorddate;
-    }
-
     public String getBo_text1() {
         return bo_text1;
     }

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

@@ -8,12 +8,6 @@ import java.util.Date;
 public class Customerkind extends CommonBaseEntity implements Serializable {
     private String ck_name;
 
-    private Integer ck_recordid;
-
-    private String ck_recorder;
-
-    private Date ck_date;
-
     public String getCk_name() {
         return ck_name;
     }
@@ -22,27 +16,4 @@ public class Customerkind extends CommonBaseEntity implements Serializable {
         this.ck_name = ck_name == null ? null : ck_name.trim();
     }
 
-    public Integer getCk_recordid() {
-        return ck_recordid;
-    }
-
-    public void setCk_recordid(Integer ck_recordid) {
-        this.ck_recordid = ck_recordid;
-    }
-
-    public String getCk_recorder() {
-        return ck_recorder;
-    }
-
-    public void setCk_recorder(String ck_recorder) {
-        this.ck_recorder = ck_recorder == null ? null : ck_recorder.trim();
-    }
-
-    public Date getCk_date() {
-        return ck_date;
-    }
-
-    public void setCk_date(Date ck_date) {
-        this.ck_date = ck_date;
-    }
 }

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

@@ -10,12 +10,6 @@ public class Fundinouttype extends CommonBaseEntity implements Serializable {
 
     private String ft_kind;
 
-    private Integer ft_recordid;
-
-    private String ft_recorder;
-
-    private Date ft_date;
-
     public String getFt_name() {
         return ft_name;
     }
@@ -32,27 +26,4 @@ public class Fundinouttype extends CommonBaseEntity implements Serializable {
         this.ft_kind = ft_kind == null ? null : ft_kind.trim();
     }
 
-    public Integer getFt_recordid() {
-        return ft_recordid;
-    }
-
-    public void setFt_recordid(Integer ft_recordid) {
-        this.ft_recordid = ft_recordid;
-    }
-
-    public String getFt_recorder() {
-        return ft_recorder;
-    }
-
-    public void setFt_recorder(String ft_recorder) {
-        this.ft_recorder = ft_recorder == null ? null : ft_recorder.trim();
-    }
-
-    public Date getFt_date() {
-        return ft_date;
-    }
-
-    public void setFt_date(Date ft_date) {
-        this.ft_date = ft_date;
-    }
 }

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

@@ -37,12 +37,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private Double pi_total;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

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

@@ -26,9 +26,6 @@ public class Product extends CommonBaseEntity implements Serializable {
     private Long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private Long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;
@@ -180,30 +177,6 @@ public class Product extends CommonBaseEntity implements Serializable {
         this.pr_vendcode = pr_vendcode;
     }
 
-    public Date getPr_docdate() {
-        return pr_docdate;
-    }
-
-    public void setPr_docdate(Date pr_docdate) {
-        this.pr_docdate = pr_docdate;
-    }
-
-    public Long getPr_recordmanid() {
-        return pr_recordmanid;
-    }
-
-    public void setPr_recordmanid(Long pr_recordmanid) {
-        this.pr_recordmanid = pr_recordmanid;
-    }
-
-    public String getPr_recordman() {
-        return pr_recordman;
-    }
-
-    public void setPr_recordman(String pr_recordman) {
-        this.pr_recordman = pr_recordman;
-    }
-
     public String getPr_status() {
         return pr_status;
     }

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

@@ -8,12 +8,6 @@ import java.util.Date;
 public class Productbrand extends CommonBaseEntity implements Serializable {
     private String pb_name;
 
-    private Integer pb_recordid;
-
-    private String pb_recorder;
-
-    private Date pb_date;
-
     public String getPb_name() {
         return pb_name;
     }
@@ -21,28 +15,4 @@ public class Productbrand extends CommonBaseEntity implements Serializable {
     public void setPb_name(String pb_name) {
         this.pb_name = pb_name == null ? null : pb_name.trim();
     }
-
-    public Integer getPb_recordid() {
-        return pb_recordid;
-    }
-
-    public void setPb_recordid(Integer pb_recordid) {
-        this.pb_recordid = pb_recordid;
-    }
-
-    public String getPb_recorder() {
-        return pb_recorder;
-    }
-
-    public void setPb_recorder(String pb_recorder) {
-        this.pb_recorder = pb_recorder == null ? null : pb_recorder.trim();
-    }
-
-    public Date getPb_date() {
-        return pb_date;
-    }
-
-    public void setPb_date(Date pb_date) {
-        this.pb_date = pb_date;
-    }
 }

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

@@ -9,12 +9,6 @@ public class Producttype extends CommonBaseEntity implements Serializable {
 
     private String pt_name;
 
-    private Integer pt_recordid;
-
-    private String pt_recorder;
-
-    private Date pt_date;
-
     public String getPt_name() {
         return pt_name;
     }
@@ -22,28 +16,4 @@ public class Producttype extends CommonBaseEntity implements Serializable {
     public void setPt_name(String pt_name) {
         this.pt_name = pt_name == null ? null : pt_name.trim();
     }
-
-    public Integer getPt_recordid() {
-        return pt_recordid;
-    }
-
-    public void setPt_recordid(Integer pt_recordid) {
-        this.pt_recordid = pt_recordid;
-    }
-
-    public String getPt_recorder() {
-        return pt_recorder;
-    }
-
-    public void setPt_recorder(String pt_recorder) {
-        this.pt_recorder = pt_recorder == null ? null : pt_recorder.trim();
-    }
-
-    public Date getPt_date() {
-        return pt_date;
-    }
-
-    public void setPt_date(Date pt_date) {
-        this.pt_date = pt_date;
-    }
 }

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

@@ -8,12 +8,6 @@ import java.util.Date;
 public class Productunit extends CommonBaseEntity implements Serializable {
     private String pu_name;
 
-    private Integer pu_recordid;
-
-    private String pu_recorder;
-
-    private Date pu_date;
-
     public String getPu_name() {
         return pu_name;
     }
@@ -21,28 +15,4 @@ public class Productunit extends CommonBaseEntity implements Serializable {
     public void setPu_name(String pu_name) {
         this.pu_name = pu_name == null ? null : pu_name.trim();
     }
-
-    public Integer getPu_recordid() {
-        return pu_recordid;
-    }
-
-    public void setPu_recordid(Integer pu_recordid) {
-        this.pu_recordid = pu_recordid;
-    }
-
-    public String getPu_recorder() {
-        return pu_recorder;
-    }
-
-    public void setPu_recorder(String pu_recorder) {
-        this.pu_recorder = pu_recorder == null ? null : pu_recorder.trim();
-    }
-
-    public Date getPu_date() {
-        return pu_date;
-    }
-
-    public void setPu_date(Date pu_date) {
-        this.pu_date = pu_date;
-    }
 }

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

@@ -68,18 +68,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
      * 状态码
      */
     private String ve_statuscode;
-    /**
-     * 录入人ID
-     */
-    private Long ve_recordid;
-    /**
-     * 录入人
-     */
-    private String ve_recordname;
-    /**
-     * 建立日期
-     */
-    private Date ve_initdate;
     /**
      * 自定义字段
      */
@@ -245,30 +233,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
         this.ve_statuscode = ve_statuscode;
     }
 
-    public Long getVe_recordid() {
-        return ve_recordid;
-    }
-
-    public void setVe_recordid(Long ve_recordid) {
-        this.ve_recordid = ve_recordid;
-    }
-
-    public String getVe_recordname() {
-        return ve_recordname;
-    }
-
-    public void setVe_recordname(String ve_recordname) {
-        this.ve_recordname = ve_recordname;
-    }
-
-    public Date getVe_initdate() {
-        return ve_initdate;
-    }
-
-    public void setVe_initdate(Date ve_initdate) {
-        this.ve_initdate = ve_initdate;
-    }
-
     public String getVe_text1() {
         return ve_text1;
     }

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

@@ -66,18 +66,6 @@ public class VendorList implements Serializable {
      * 状态码
      */
     private String ve_statuscode;
-    /**
-     * 录入人ID
-     */
-    private long ve_recordid;
-    /**
-     * 录入人
-     */
-    private String ve_recordname;
-    /**
-     * 建立日期
-     */
-    private Date ve_initdate;
     /**
      * 自定义字段
      */

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

@@ -17,21 +17,6 @@ public class Vendorkind extends CommonBaseEntity implements Serializable {
      */
     private String vk_name;
 
-    /**
-     * 录入人ID
-     */
-    private Integer vk_recordid;
-
-    /**
-     * 录入人
-     */
-    private String vk_recorder;
-
-    /**
-     * 录入日期
-     */
-    private Date vk_date;
-
     public String getVk_name() {
         return vk_name;
     }
@@ -40,27 +25,4 @@ public class Vendorkind extends CommonBaseEntity implements Serializable {
         this.vk_name = vk_name == null ? null : vk_name.trim();
     }
 
-    public Integer getVk_recordid() {
-        return vk_recordid;
-    }
-
-    public void setVk_recordid(Integer vk_recordid) {
-        this.vk_recordid = vk_recordid;
-    }
-
-    public String getVk_recorder() {
-        return vk_recorder;
-    }
-
-    public void setVk_recorder(String vk_recorder) {
-        this.vk_recorder = vk_recorder == null ? null : vk_recorder.trim();
-    }
-
-    public Date getVk_date() {
-        return vk_date;
-    }
-
-    public void setVk_date(Date vk_date) {
-        this.vk_date = vk_date;
-    }
 }

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

@@ -17,8 +17,6 @@ public class Warehouse extends CommonBaseEntity implements Serializable {
     private String wh_description;
     private String wh_statuscode;
     private String wh_status;
-    private long wh_recorderid;
-    private String wh_recorder;
     /**
      * 录入日期
      */
@@ -69,22 +67,6 @@ public class Warehouse extends CommonBaseEntity implements Serializable {
         this.wh_status = wh_status;
     }
 
-    public long getWh_recorderid() {
-        return wh_recorderid;
-    }
-
-    public void setWh_recorderid(long wh_recorderid) {
-        this.wh_recorderid = wh_recorderid;
-    }
-
-    public String getWh_recorder() {
-        return wh_recorder;
-    }
-
-    public void setWh_recorder(String wh_recorder) {
-        this.wh_recorder = wh_recorder;
-    }
-
     public Date getWh_date() {
         return wh_date;
     }

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

@@ -43,4 +43,5 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
     int selectCountByCode(@Param("code") String code, @Param("companyId") Long companyId, @Param("id") Long id);
 
+    int deleteCheckProdIO(@Param("id") Long id, @Param("companyId") Long companyId);
 }

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

@@ -38,6 +38,7 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
             address.setCompanyId(BaseContextHolder.getCompanyId());
             address.setCreateTime(new Date());
             address.setCreatorId(BaseContextHolder.getUserId());
+            address.setCreatorName(BaseContextHolder.getUserName());
             //验证名称是否重复
             validName(address.getAd_address(), address.getId());
             addressMapper.insertSelective(address);

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

@@ -47,6 +47,9 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         bankinformation.setCompanyId(BaseContextHolder.getCompanyId());
         bankinformation.setBk_income(new Double(0));
         bankinformation.setBk_spending(new Double(0));
+        bankinformation.setCreateTime(new Date());
+        bankinformation.setCreatorId(BaseContextHolder.getUserId());
+        bankinformation.setCreatorName(BaseContextHolder.getUserName());
         int bid = Math.toIntExact(bankinformation.getId());
 
         String bktion = bankinformationMapper.selectBankcode(bankinformation.getBk_bankcode());
@@ -59,6 +62,9 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             bankinformationMapper.insertSelective(bankinformation);
         }else {
+            bankinformation.setUpdaterId(BaseContextHolder.getUserId());
+            bankinformation.setUpdaterName(BaseContextHolder.getUserName());
+            bankinformation.setUpdateTime(new Date());
             //判断是否能修改期初金额
             Double beginamount = bankinformationMapper.selectamount(bankinformation.getId());
             Double fbeginamount = bankinformation.getBk_beginamount();

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

@@ -57,6 +57,9 @@ public class BomServiceImpl extends CommonBaseServiceImpl<BomMapper, Bom> implem
                 String code = bom.getBo_mothercode();
                 bom.setBo_mothercode(code);
                 bom.setCompanyId(companyId);
+                bom.setCreatorId(userId);
+                bom.setCreatorName(userName);
+                bom.setCreateTime(new Date());
                 //保存BOM
                 getMapper().insertSelective(bom);
                 id = bom.getId();
@@ -67,8 +70,9 @@ public class BomServiceImpl extends CommonBaseServiceImpl<BomMapper, Bom> implem
                     for (BomDetail bomDetail : bomDetailList) {
                         bomDetail.setBd_bomid(bom.getId());
                         bomDetail.setCompanyId(companyId);
-                        bomDetail.setCreatorId(BaseContextHolder.getUserId());
+                        bomDetail.setCreatorId(userId);
                         bomDetail.setCreateTime(new Date());
+                        bomDetail.setCreatorName(userName);
                     }
                     bomDetailMapper.batchInsert(bomDetailList);
                 }
@@ -92,13 +96,15 @@ public class BomServiceImpl extends CommonBaseServiceImpl<BomMapper, Bom> implem
                 for(BomDetail bomDetail : bomDetailList){
                     if (bomDetail.getId() == 0){
                         bomDetail.setCreateTime(new Date());
-                        bomDetail.setCompanyId(BaseContextHolder.getCompanyId());
-                        bomDetail.setCreatorId(BaseContextHolder.getUserId());
+                        bomDetail.setCompanyId(companyId);
+                        bomDetail.setCreatorId(userId);
+                        bomDetail.setCreatorName(userName);
                         bomDetail.setBd_bomid(bom.getId());
                         insertItems.add(bomDetail);
                     }else{
-                        bomDetail.setUpdaterId(BaseContextHolder.getUserId());
+                        bomDetail.setUpdaterId(companyId);
                         bomDetail.setUpdateTime(new Date());
+                        bomDetail.setUpdaterName(userName);
                         updateItems.add(bomDetail);
                     }
                 }

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

@@ -108,6 +108,8 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         Long companyId = BaseContextHolder.getCompanyId();
         //人员Id
         Long userId = BaseContextHolder.getUserId();
+        //人员名
+        String userName = BaseContextHolder.getUserName();
         //获取主表信息
         CustomerDTO main = data.getMain();
         //更新从表数据
@@ -127,6 +129,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         customer.setCompanyId(companyId);
         customer.setCreatorId(userId);
         customer.setCreateTime(new Date());
+        customer.setCreatorName(userName);
         //应付款余额
         Double beginapamount = main.getCu_beginaramount()==null?new Double(0):main.getCu_beginaramount();
         Double beginprepayamount = main.getCu_beginprerecamount()==null?new Double(0):main.getCu_beginprerecamount();
@@ -170,6 +173,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
                 detail1.setCompanyId(companyId);
                 detail1.setCreatorId(userId);
                 detail1.setCreateTime(new Date());
+                detail1.setCreatorName(userName);
                 insertDetail1.add(detail1);
             }
             //插入从表
@@ -183,6 +187,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
                 detail2.setCompanyId(companyId);
                 detail2.setCreatorId(userId);
                 detail2.setCreateTime(new Date());
+                detail2.setCreatorName(userName);
                 insertDetail2.add(detail2);
             }
             //插入从表

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

@@ -35,6 +35,7 @@ public class CustomerkindServiceImpl extends CommonBaseServiceImpl<CustomerkindM
             customerkind.setCompanyId(BaseContextHolder.getCompanyId());
             customerkind.setCreateTime(new Date());
             customerkind.setCreatorId(BaseContextHolder.getUserId());
+            customerkind.setCreatorName(BaseContextHolder.getUserName());
             //验证名称是否重复
             validName(customerkind.getCk_name(), customerkind.getId());
             customerkindMapper.insertSelective(customerkind);

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

@@ -70,6 +70,7 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
             employee.setCompanyId(BaseContextHolder.getCompanyId());
             employee.setCreatorId(BaseContextHolder.getUserId());
             employee.setCreateTime(new Date());
+            employee.setCreatorName(BaseContextHolder.getUserName());
             //检查电话号码
             int count = getMapper().validatePhoneWhenInsert(employee.getEm_mobile(),BaseContextHolder.getCompanyId());
             if (count>0) {

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

@@ -41,6 +41,7 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
             fundinouttype.setCompanyId(BaseContextHolder.getCompanyId());
             fundinouttype.setCreatorId(BaseContextHolder.getUserId());
             fundinouttype.setCreateTime(new Date());
+            fundinouttype.setCreatorName(BaseContextHolder.getUserName());
             //验证名称是否重复
             validName(fundinouttype.getFt_name(), fundinouttype.getId());
 

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

@@ -86,7 +86,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         DocBaseDTO docBaseDTO = null;
         Long companyId = BaseContextHolder.getCompanyId();
         Long userId = BaseContextHolder.getUserId();
-
+        String userName = BaseContextHolder.getUserName();
         //校验明细仓库是否重复
         validRepeatWarehouse(productDetailList);
 
@@ -98,6 +98,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             product.setCompanyId(companyId);
             product.setCreatorId(userId);
             product.setCreateTime(new Date());
+            product.setCreatorName(userName);
             product.setPr_code(code);
             //保存主表
             getMapper().insertSelective(product);
@@ -106,6 +107,9 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
                 for (ProductDetail productDetail : productDetailList){
                     productDetail.setPd_prodid(product.getId());
                     productDetail.setCompanyId(companyId);
+                    productDetail.setCreatorId(userId);
+                    productDetail.setCreatorName(userName);
+                    productDetail.setCreateTime(new Date());
                 }
 
                 productDetailMapper.batchInsert(productDetailList);
@@ -141,12 +145,18 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
                 for(ProductDetail productDetail : productDetailList){
                     if (productDetail.getId() == 0){
                         productDetail.setPd_prodid(product.getId());
+                        productDetail.setCompanyId(companyId);
+                        productDetail.setCreatorId(userId);
+                        productDetail.setCreateTime(new Date());
+                        productDetail.setCreatorName(userName);
                         productDetail.setUpdaterId(userId);
                         productDetail.setUpdateTime(new Date());
+                        productDetail.setUpdaterName(userName);
                         insertItems.add(productDetail);
                     }else{
                         productDetail.setUpdaterId(userId);
                         productDetail.setUpdateTime(new Date());
+                        productDetail.setUpdaterName(userName);
                         updateItems.add(productDetail);
                     }
                 }
@@ -214,6 +224,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     private void generateProdIOPost(Product product, List<ProductDetail> productDetailList) {
         Long companyId = BaseContextHolder.getCompanyId();
         Long userId = BaseContextHolder.getUserId();
+        String userName = BaseContextHolder.getUserName();
         //1.有明细数据变更
         if (productDetailList.size() > 0){
             //生成库存初始化单据主表
@@ -223,14 +234,14 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             prodInOut.setPi_class("库存初始化");
             prodInOut.setPi_date(new Date());
             //prodInOut.setPi_total();            //含税金额
-            prodInOut.setPi_recordman("");
-            prodInOut.setPi_recordmanid(userId);
-            prodInOut.setPi_recorddate(new Date());
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());
             prodInOut.setPi_text1(product.getPr_code());
             prodInOut.setCompanyId(companyId);
-
+            //创建时间创建人
+            prodInOut.setCreatorId(userId);
+            prodInOut.setCreatorName(userName);
+            prodInOut.setCreateTime(new Date());
             //主表插入
             getMapper().saveProdInOut(prodInOut);
             Long pi_id = prodInOut.getId();
@@ -294,6 +305,9 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         prodIODetail.setPd_whname(productDetail.getPd_whname());    //仓库名称
         prodIODetail.setPd_status(0);                               //状态
         prodIODetail.setCompanyId(BaseContextHolder.getCompanyId());//公司ID
+        prodIODetail.setCreatorId(BaseContextHolder.getUserId());
+        prodIODetail.setCreatorName(BaseContextHolder.getUserName());
+        prodIODetail.setCreateTime(new Date());
         return prodIODetail;
     }
 
@@ -448,9 +462,10 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     }
 
     @Override
+    @Transactional
     public boolean batchDelete(BatchDealBaseDTO baseDTOs) {
         for(DocBaseDTO docBaseDTO : baseDTOs.getBaseDTOs()){
-            getMapper().deleteByPrimaryKey(docBaseDTO.getId());
+            deleteByPrimaryKey(docBaseDTO.getId());
         }
         return true;
     }

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

@@ -34,6 +34,7 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
             productbrand.setCompanyId(BaseContextHolder.getCompanyId());
             productbrand.setCreatorId(BaseContextHolder.getUserId());
             productbrand.setCreateTime(new Date());
+            productbrand.setCreatorName(BaseContextHolder.getUserName());
             //验证名称是否重复
             validName(productbrand.getPb_name(), productbrand.getId());
 

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

@@ -37,6 +37,7 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
             producttype.setCompanyId(BaseContextHolder.getCompanyId());
             producttype.setCreatorId(BaseContextHolder.getUserId());
             producttype.setCreateTime(new Date());
+            producttype.setCreatorName(BaseContextHolder.getUserName());
             //验证名称是否重复
             validName(producttype.getPt_name(), producttype.getId());
             producttypeMapper.insertSelective(producttype);

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

@@ -29,6 +29,7 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
             productunit.setCompanyId(BaseContextHolder.getCompanyId());
             productunit.setCreatorId(BaseContextHolder.getUserId());
             productunit.setCreateTime(new Date());
+            productunit.setCreatorName(BaseContextHolder.getUserName());
             //验证名称是否重复
             validName(productunit.getPu_name(), productunit.getId());
 

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

@@ -112,6 +112,8 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
     @Transactional
     public DocBaseDTO saveFormData(VendorListDTO vendorListDTO) {
         Long companyId = BaseContextHolder.getCompanyId();
+        String userName= BaseContextHolder.getUserName();
+        Long userId = BaseContextHolder.getUserId();
         if (null == vendorListDTO || null == vendorListDTO.getMain()){
             throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
@@ -154,6 +156,8 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             Double payamount = main.getVe_payamount()==null? new Double(0):main.getVe_payamount();
             Double preamount = main.getVe_preamount()==null? new Double(0):main.getVe_preamount();
             main.setVe_leftamount(beginapamount-beginprepayamount+payamount-preamount);
+            //更新录入人录入时间ID
+            main.setCreatorId(BaseContextHolder.getUserId());
             getMapper().insertSelective(main);
             Long mainId = main.getId();
             //更新明细表vc_veid
@@ -162,6 +166,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
                 item.setCompanyId(BaseContextHolder.getCompanyId());
                 item.setCreatorId(BaseContextHolder.getUserId());
                 item.setCreateTime(new Date());
+
             }
             //保存明细表信息
             if (items.size() > 0){

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

@@ -32,6 +32,7 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
             vendorkind.setCompanyId(BaseContextHolder.getCompanyId());
             vendorkind.setCreatorId(BaseContextHolder.getUserId());
             vendorkind.setCreateTime(new Date());
+            vendorkind.setCreatorName(BaseContextHolder.getUserName());
             //验证名称是否重复
             validName(vendorkind.getVk_name(), vendorkind.getId());
             vendorkindMapper.insertSelective(vendorkind);

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

@@ -114,7 +114,7 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
             record.setCompanyId(BaseContextHolder.getCompanyId());
             record.setCreatorId(BaseContextHolder.getUserId());
             record.setCreateTime(new Date());
-
+            record.setCreatorName(BaseContextHolder.getUserName());
             //验证名称是否重复
             validName(record.getWh_description(), record.getId());
             //验证编号是否重复
@@ -244,6 +244,11 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         if (num > 0) {
             throw new BizException(BizExceptionCode.PRODUCTWH_HAS_WAREHOUSE);
         }
+        //校验出入库单据
+        num = warehouseMapper.deleteCheckProdIO(id, companyId);
+        if (num > 0){
+            throw new BizException(BizExceptionCode.BIZ_RELDELETE);
+        }
         singleDelete(id);
     }
 

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

@@ -3,7 +3,6 @@
 <mapper namespace="com.usoftchina.saas.document.mapper.AddressMapper">
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Address">
     <id column="ad_id" jdbcType="INTEGER" property="id" />
-    <result column="ad_recorddate" jdbcType="TIMESTAMP" property="ad_recorddate" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
@@ -17,7 +16,7 @@
     <result column="ad_address" jdbcType="LONGVARCHAR" property="ad_address" />
   </resultMap>
   <sql id="Base_Column_List">
-    ad_id, ad_recorddate, companyId, updaterId, updateTime, ad_text1, ad_text2, ad_text3, 
+    ad_id,  companyId, updaterId, updateTime, ad_text1, ad_text2, ad_text3,
     ad_text4, ad_text5
   </sql>
   <sql id="Blob_Column_List">
@@ -28,14 +27,16 @@
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
-    insert into address (ad_recorddate, companyId,
+    insert into address ( companyId,
       updaterId, updateTime, ad_text1, 
       ad_text2, ad_text3, ad_text4, 
-      ad_text5, ad_address)
-    values (#{ad_recorddate,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER},
+      ad_text5, ad_address,
+    creatorId,createTime,creatorName)
+    values (#{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{ad_text1,jdbcType=VARCHAR}, 
       #{ad_text2,jdbcType=VARCHAR}, #{ad_text3,jdbcType=VARCHAR}, #{ad_text4,jdbcType=VARCHAR}, 
-      #{ad_text5,jdbcType=VARCHAR}, #{ad_address,jdbcType=LONGVARCHAR})
+      #{ad_text5,jdbcType=VARCHAR}, #{ad_address,jdbcType=LONGVARCHAR},
+    #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Address">
     <selectKey resultType="java.lang.Long" keyProperty="id">
@@ -43,9 +44,6 @@
     </selectKey>
     insert into address
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="ad_recorddate != null">
-        ad_recorddate,
-      </if>
       <if test="companyId != null">
         companyId,
       </if>
@@ -73,11 +71,17 @@
       <if test="ad_address != null">
         ad_address,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="ad_recorddate != null">
-        #{ad_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -104,15 +108,20 @@
       </if>
       <if test="ad_address != null">
         #{ad_address,jdbcType=LONGVARCHAR},
+      </if><if test="creatorId != null" >
+      #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Address">
     update address
     <set>
-      <if test="ad_recorddate != null">
-        ad_recorddate = #{ad_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -145,7 +154,7 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.document.entities.Address">
     update address
-    set ad_recorddate = #{ad_recorddate,jdbcType=TIMESTAMP},
+    set
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},
@@ -159,7 +168,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Address">
     update address
-    set ad_recorddate = #{ad_recorddate,jdbcType=TIMESTAMP},
+    set
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},

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

@@ -11,9 +11,6 @@
     <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" />
@@ -32,7 +29,7 @@
   </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, 
+    bk_status, bk_statuscode, bk_ym, companyid,
     updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark
   </sql>
   <sql id="Blob_Column_List" >
@@ -53,20 +50,20 @@
   <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_thisamount, bk_status, bk_statuscode,
       bk_ym, companyid, updaterId, 
       updateTime, bk_text1, bk_text2, 
       bk_text3, bk_text4, bk_text5, 
-      bk_remark)
+      bk_remark,
+      creatorId,createTime,creatorName)
     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})
+      #{bk_remark,jdbcType=LONGVARCHAR},
+     #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     insert into bankinformation
@@ -95,15 +92,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode,
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid,
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder,
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate,
-      </if>
       <if test="bk_ym != null" >
         bk_ym,
       </if>
@@ -140,6 +128,15 @@
       <if test="bk_income != null" >
         bk_income,
       </if>
+      <if test="creatorId != null" >
+      creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="bk_bankcode != null" >
@@ -166,15 +163,6 @@
       <if test="bk_statuscode != null" >
         #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -211,6 +199,15 @@
       <if test="bk_income != null" >
         #{bk_income,jdbcType=DOUBLE},
       </if>
+      <if test="creatorId != null" >
+      #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
@@ -240,15 +237,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         bk_ym = #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -298,9 +286,6 @@
       bk_thisamount = #{bkThisamount,jdbcType=DOUBLE},
       bk_status = #{bkStatus,jdbcType=VARCHAR},
       bk_statuscode = #{bkStatuscode,jdbcType=VARCHAR},
-      bk_recorderid = #{bkRecorderid,jdbcType=INTEGER},
-      bk_recorder = #{bkRecorder,jdbcType=VARCHAR},
-      bk_recorddate = #{bkRecorddate,jdbcType=TIMESTAMP},
       bk_ym = #{bkYm,jdbcType=INTEGER},
       companyid = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},

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

@@ -19,7 +19,7 @@
         <result column="bl_remark" jdbcType="VARCHAR" property="bl_remark" />
         <result column="companyId" jdbcType="INTEGER" property="companyId" />
         <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-        <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
+        <result column="updatedate" jdbcType="TIMESTAMP" property="updateTime" />
         <result column="bl_orderamount" property="bl_orderamount" jdbcType="DOUBLE" />
         <result column="bl_assid" property="bl_assid" jdbcType="INTEGER" />
         <result column="bl_item" property="bl_item" jdbcType="VARCHAR" />
@@ -110,14 +110,16 @@
       bl_kind, bl_date, bl_asstype, 
       bl_asscode, bl_assname, bl_income, 
       bl_spending, bl_manname, bl_remark, 
-      companyId, updaterId, updatedate
+      companyId, updaterId, updatedate,
+      creatorId,createTime,creatorName
       )
     values (#{bl_id,jdbcType=INTEGER}, #{bl_ym,jdbcType=INTEGER}, #{bl_bankid,jdbcType=INTEGER}, 
       #{bl_bankcode,jdbcType=VARCHAR}, #{bl_bankname,jdbcType=VARCHAR}, #{bl_code,jdbcType=VARCHAR}, 
       #{bl_kind,jdbcType=VARCHAR}, #{bl_date,jdbcType=TIMESTAMP}, #{bl_asstype,jdbcType=VARCHAR}, 
       #{bl_asscode,jdbcType=VARCHAR}, #{bl_assname,jdbcType=VARCHAR}, #{bl_income,jdbcType=DOUBLE}, 
       #{bl_spending,jdbcType=DOUBLE}, #{bl_manname,jdbcType=VARCHAR}, #{bl_remark,jdbcType=VARCHAR}, 
-      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}
+      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP},
+      #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR}
       )
   </insert>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Banksubledger">
@@ -183,6 +185,15 @@
             <if test="bl_item != null" >
                 bl_item,
             </if>
+            <if test="creatorId != null" >
+                creatorId,
+            </if>
+            <if test="createTime != null" >
+                createTime,
+            </if>
+            <if test="creatorName != null" >
+                creatorName,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="bl_ym != null">
@@ -245,6 +256,15 @@
             <if test="bl_item != null" >
                 #{bl_item,jdbcType=VARCHAR},
             </if>
+            <if test="creatorId != null" >
+                #{creatorId,jdbcType=INTEGER},
+            </if>
+            <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="creatorName != null" >
+                #{creatorName,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Banksubledger">

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

@@ -39,9 +39,6 @@
         <result column="pr_vendid" property="pr_vendid" jdbcType="INTEGER" />
         <result column="pr_vendcode" property="pr_vendcode" jdbcType="VARCHAR" />
         <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR" />
-        <result column="pr_docdate" property="pr_docdate" jdbcType="TIMESTAMP" />
-        <result column="pr_recordmanid" property="pr_recordmanid" jdbcType="INTEGER" />
-        <result column="pr_recordman" property="pr_recordman" jdbcType="VARCHAR" />
         <result column="pr_status" property="pr_status" jdbcType="VARCHAR" />
         <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -72,13 +69,15 @@
       bd_baseqty, bd_replace, bd_remark, 
       companyId, updaterId, updateTime, 
       bd_text1, bd_text2, bd_text3, 
-      bd_text4, bd_text5)
+      bd_text4, bd_text5,
+      creatorId,createTime,creatorName)
     values ( #{bd_bomid,jdbcType=INTEGER}, #{bd_detno,jdbcType=INTEGER},
       #{bd_sonid,jdbcType=INTEGER}, #{bd_soncode,jdbcType=VARCHAR}, #{bd_unit,jdbcType=VARCHAR}, 
       #{bd_baseqty,jdbcType=INTEGER}, #{bd_replace,jdbcType=VARCHAR}, #{bd_remark,jdbcType=VARCHAR}, 
       #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{bd_text1,jdbcType=VARCHAR}, #{bd_text2,jdbcType=VARCHAR}, #{bd_text3,jdbcType=VARCHAR}, 
-      #{bd_text4,jdbcType=VARCHAR}, #{bd_text5,jdbcType=VARCHAR})
+      #{bd_text4,jdbcType=VARCHAR}, #{bd_text5,jdbcType=VARCHAR},
+      #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.BomDetail" >
     insert into bomdetail
@@ -131,6 +130,15 @@
       <if test="bd_text5 != null" >
         bd_text5,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="bd_bomid != null" >
@@ -181,6 +189,15 @@
       <if test="bd_text5 != null" >
         #{bd_text5,jdbcType=VARCHAR},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.BomDetail" >
@@ -263,7 +280,8 @@
     bd_baseqty, bd_replace, bd_remark,
     companyId, updaterId, updateTime,
     bd_text1, bd_text2, bd_text3,
-    bd_text4, bd_text5)
+    bd_text4, bd_text5,
+    creatorId,createTime,creatorName)
     values
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       (
@@ -272,7 +290,8 @@
       #{item.bd_baseqty,jdbcType=INTEGER}, #{item.bd_replace,jdbcType=VARCHAR}, #{item.bd_remark,jdbcType=VARCHAR},
       #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER}, #{item.updateTime,jdbcType=TIMESTAMP},
       #{item.bd_text1,jdbcType=VARCHAR}, #{item.bd_text2,jdbcType=VARCHAR}, #{item.bd_text3,jdbcType=VARCHAR},
-      #{item.bd_text4,jdbcType=VARCHAR}, #{item.bd_text5,jdbcType=VARCHAR}
+      #{item.bd_text4,jdbcType=VARCHAR}, #{item.bd_text5,jdbcType=VARCHAR},
+      #{item.creatorId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.creatorName,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>

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

@@ -9,9 +9,6 @@
     <result column="bo_version" property="bo_version" jdbcType="VARCHAR" />
     <result column="bo_status" property="bo_status" jdbcType="VARCHAR" />
     <result column="bo_statuscode" property="bo_statuscode" jdbcType="VARCHAR" />
-    <result column="bo_recorderid" property="bo_recorderid" jdbcType="INTEGER" />
-    <result column="bo_recorder" property="bo_recorder" jdbcType="VARCHAR" />
-    <result column="bo_recorddate" property="bo_recorddate" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updaterName" property="updaterName" jdbcType="VARCHAR" />
@@ -19,9 +16,6 @@
     <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
-
-
-
     <result column="bo_text1" property="bo_text1" jdbcType="VARCHAR" />
     <result column="bo_text2" property="bo_text2" jdbcType="VARCHAR" />
     <result column="bo_text3" property="bo_text3" jdbcType="VARCHAR" />
@@ -34,7 +28,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     bo_id, bo_motherid, bo_mothercode, bo_mothername, bo_version, bo_status, bo_statuscode, 
-    bo_recorderid, bo_recorder, bo_recorddate, companyId, updaterId,updaterName,updateTime, bo_text1,
+    companyId, updaterId,updaterName,updateTime, bo_text1,
     bo_text2, bo_text3, bo_text4, bo_text5,creatorName,creatorId,createTime
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -53,17 +47,17 @@
     </selectKey>
     insert into bom (bo_motherid, bo_mothercode,
       bo_mothername, bo_version, bo_status, 
-      bo_statuscode, bo_recorderid, bo_recorder, 
-      bo_recorddate, companyId, updaterId, 
+      bo_statuscode, companyId, updaterId,
       updateTime, bo_text1, bo_text2, 
-      bo_text3, bo_text4, bo_text5
+      bo_text3, bo_text4, bo_text5,
+      creatorId,createTime,creatorName
       )
     values (#{bo_motherid,jdbcType=INTEGER}, #{bo_mothercode,jdbcType=VARCHAR},
       #{bo_mothername,jdbcType=VARCHAR}, #{bo_version,jdbcType=VARCHAR}, #{bo_status,jdbcType=VARCHAR}, 
-      #{bo_statuscode,jdbcType=VARCHAR}, #{bo_recorderid,jdbcType=INTEGER}, #{bo_recorder,jdbcType=VARCHAR}, 
-      #{bo_recorddate,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
+      #{bo_statuscode,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{bo_text1,jdbcType=VARCHAR}, #{bo_text2,jdbcType=VARCHAR}, 
-      #{bo_text3,jdbcType=VARCHAR}, #{bo_text4,jdbcType=VARCHAR}, #{bo_text5,jdbcType=VARCHAR}
+      #{bo_text3,jdbcType=VARCHAR}, #{bo_text4,jdbcType=VARCHAR}, #{bo_text5,jdbcType=VARCHAR},
+      #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Bom" >
@@ -90,15 +84,6 @@
       <if test="bo_statuscode != null" >
         bo_statuscode,
       </if>
-      <if test="bo_recorderid != null" >
-        bo_recorderid,
-      </if>
-      <if test="bo_recorder != null" >
-        bo_recorder,
-      </if>
-      <if test="bo_recorddate != null" >
-        bo_recorddate,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -123,12 +108,15 @@
       <if test="bo_text5 != null" >
         bo_text5,
       </if>
-      <if test="bo_text5 != null" >
-        bo_text5,
-      </if>
       <if test="createTime != null" >
         createTime,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="bo_motherid != null" >
@@ -149,15 +137,6 @@
       <if test="bo_statuscode != null" >
         #{bo_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bo_recorderid != null" >
-        #{bo_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bo_recorder != null" >
-        #{bo_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bo_recorddate != null" >
-        #{bo_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -183,7 +162,13 @@
         #{bo_text5,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null" >
-        #{createTime,jdbcType=TIMESTAMP}
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR}
       </if>
     </trim>
   </insert>
@@ -208,15 +193,6 @@
       <if test="bo_statuscode != null" >
         bo_statuscode = #{bo_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bo_recorderid != null" >
-        bo_recorderid = #{bo_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bo_recorder != null" >
-        bo_recorder = #{bo_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bo_recorddate != null" >
-        bo_recorddate = #{bo_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -252,9 +228,6 @@
       bo_version = #{bo_version,jdbcType=VARCHAR},
       bo_status = #{bo_status,jdbcType=VARCHAR},
       bo_statuscode = #{bo_statuscode,jdbcType=VARCHAR},
-      bo_recorderid = #{bo_recorderid,jdbcType=INTEGER},
-      bo_recorder = #{bo_recorder,jdbcType=VARCHAR},
-      bo_recorddate = #{bo_recorddate,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},

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

@@ -33,7 +33,9 @@
     <result column="cc_qq" jdbcType="VARCHAR" property="cc_qq" />
     <result column="cc_email" jdbcType="VARCHAR" property="cc_email" />
     <result column="cc_default" jdbcType="INTEGER" property="cc_default" />
-
+    <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
+    <result column="updaterName" property="updaterName" jdbcType="VARCHAR" />
+    <result column="createTime" property="createTime" jdbcType="TIMESTAMP"/>
   </resultMap>
 
 

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

@@ -132,6 +132,15 @@
       <if test="cu_preamount != null">
         cu_preamount,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -213,6 +222,15 @@
       <if test="cu_preamount != null">
         #{cu_preamount,jdbcType=DOUBLE},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Customer">

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

@@ -86,6 +86,15 @@
       <if test="ca_address != null">
         ca_address,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -131,6 +140,15 @@
       <if test="ca_address != null">
         #{ca_address,jdbcType=LONGVARCHAR},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Customeraddress">
@@ -215,7 +233,8 @@
     insert into customeraddress
     (ca_cuid,ca_detno,ca_person,ca_address,ca_phone,
     ca_default,companyid,updaterid,updatetime,ca_text1,
-    ca_text2,ca_text3,ca_text4,ca_text5) VALUES
+    ca_text2,ca_text3,ca_text4,ca_text5,
+    creatorId,createTime,creatorName) VALUES
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       (
       #{item.ca_cuid,jdbcType=INTEGER},
@@ -231,7 +250,8 @@
       #{item.ca_text2,jdbcType=VARCHAR},
       #{item.ca_text3,jdbcType=VARCHAR},
       #{item.ca_text4,jdbcType=VARCHAR},
-      #{item.ca_text5,jdbcType=VARCHAR}
+      #{item.ca_text5,jdbcType=VARCHAR},
+      #{item.creatorId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.creatorName,jdbcType=VARCHAR}
        )
     </foreach>
   </insert>

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

@@ -85,6 +85,15 @@
       <if test="cc_default != null">
         cc_default,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -133,8 +142,15 @@
       <if test="cc_default != null">
         #{cc_default,jdbcType=INTEGER},
       </if>
-
-
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Customercontact">
@@ -200,7 +216,8 @@
     cc_name, cc_tel, cc_qq,
     cc_email, companyid, updaterid,
     updatetime, cc_text1, cc_text2,
-    cc_text3, cc_text4, cc_text5,cc_default
+    cc_text3, cc_text4, cc_text5,cc_default,
+    creatorId,createTime,creatorName
     )
     values
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
@@ -219,7 +236,8 @@
           #{item.cc_text3,jdbcType=VARCHAR},
           #{item.cc_text4,jdbcType=VARCHAR},
           #{item.cc_text5,jdbcType=VARCHAR},
-          #{item.cc_default,jdbcType=INTEGER}
+          #{item.cc_default,jdbcType=INTEGER},
+      #{item.creatorId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.creatorName,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>
@@ -274,6 +292,15 @@
         <if test="item.cc_default != null">
           cc_default,
         </if>
+        <if test="creatorId != null" >
+          creatorId,
+        </if>
+        <if test="createTime != null" >
+          createTime,
+        </if>
+        <if test="creatorName != null" >
+          creatorName,
+        </if>
       </trim>
       <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -322,6 +349,15 @@
         <if test="item.c_default != null">
           #{item.cc_default,jdbcType=INTEGER},
         </if>
+        <if test="creatorId != null" >
+          #{creatorId,jdbcType=INTEGER},
+        </if>
+        <if test="createTime != null" >
+          #{createTime,jdbcType=TIMESTAMP},
+        </if>
+        <if test="creatorName != null" >
+          #{creatorName,jdbcType=VARCHAR},
+        </if>
       </trim>
     </foreach>
   </insert>

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

@@ -4,9 +4,6 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Customerkind" >
     <id column="ck_id" property="id" jdbcType="INTEGER" />
     <result column="ck_name" property="ck_name" jdbcType="VARCHAR" />
-    <result column="ck_recordid" property="ck_recordid" jdbcType="INTEGER" />
-    <result column="ck_recorder" property="ck_recorder" jdbcType="VARCHAR" />
-    <result column="ck_date" property="ck_date" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -18,19 +15,19 @@
     where ck_id = #{id}
   </select>
   <sql id="Base_Column_List" >
-    ck_id, ck_name, ck_recordid, ck_recorder, ck_date, companyId, updaterId, updateTime
+    ck_id, ck_name, companyId, updaterId, updateTime
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
     delete from customerkind
     where ck_id = #{id}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
-    insert into customerkind (ck_name, ck_recordid,
-      ck_recorder, ck_date, companyId, 
-      updaterId, updateTime)
-    values (#{ck_name,jdbcType=VARCHAR}, #{ck_recordid,jdbcType=INTEGER},
-      #{ck_recorder,jdbcType=VARCHAR}, #{ck_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, 
-      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
+    insert into customerkind (ck_name, companyId,
+      updaterId, updateTime,
+    creatorId,createTime,creatorName)
+    values (#{ck_name,jdbcType=VARCHAR},#{companyId,jdbcType=INTEGER},
+      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
+    #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
     insert into customerkind
@@ -38,15 +35,6 @@
       <if test="ck_name != null" >
         ck_name,
       </if>
-      <if test="ck_recordid != null" >
-        ck_recordid,
-      </if>
-      <if test="ck_recorder != null" >
-        ck_recorder,
-      </if>
-      <if test="ck_date != null" >
-        ck_date,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -56,20 +44,20 @@
       <if test="updateTime != null" >
         updateTime,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="ck_name != null" >
         #{ck_name,jdbcType=VARCHAR},
       </if>
-      <if test="ck_recordid != null" >
-        #{ck_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ck_recorder != null" >
-        #{ck_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ck_date != null" >
-        #{ck_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -79,6 +67,15 @@
       <if test="updateTime != null" >
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
@@ -87,15 +84,6 @@
       <if test="ck_name != null" >
         ck_name = #{ck_name,jdbcType=VARCHAR},
       </if>
-      <if test="ck_recordid != null" >
-        ck_recordid = #{ck_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ck_recorder != null" >
-        ck_recorder = #{ck_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ck_date != null" >
-        ck_date = #{ck_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -111,9 +99,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
     update customerkind
     set ck_name = #{ck_name,jdbcType=VARCHAR},
-      ck_recordid = #{ck_recordid,jdbcType=INTEGER},
-      ck_recorder = #{ck_recorder,jdbcType=VARCHAR},
-      ck_date = #{ck_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -92,6 +92,15 @@
       <if test="em_text5 != null">
         em_text5,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -137,6 +146,15 @@
       <if test="em_text5 != null">
         #{em_text5,jdbcType=VARCHAR},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Employee">

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

@@ -5,15 +5,12 @@
     <id column="ft_id" property="id" jdbcType="INTEGER" />
     <result column="ft_name" property="ft_name" jdbcType="VARCHAR" />
     <result column="ft_kind" property="ft_kind" jdbcType="VARCHAR" />
-    <result column="ft_recordid" property="ft_recordid" jdbcType="INTEGER" />
-    <result column="ft_recorder" property="ft_recorder" jdbcType="VARCHAR" />
-    <result column="ft_date" property="ft_date" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    ft_id, ft_name, ft_kind, ft_recordid, ft_recorder, ft_date, companyId, updaterId, 
+    ft_id, ft_name, ft_kind, companyId, updaterId,
     updateTime
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -31,12 +28,12 @@
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
     insert into fundinouttype (ft_name, ft_kind,
-      ft_recordid, ft_recorder, ft_date, 
-      companyId, updaterId, updateTime
+      companyId, updaterId, updateTime,
+    creatorId,createTime,creatorName
       )
     values (#{ft_name,jdbcType=VARCHAR}, #{ft_kind,jdbcType=VARCHAR},
-      #{ft_recordid,jdbcType=INTEGER}, #{ft_recorder,jdbcType=VARCHAR}, #{ft_date,jdbcType=TIMESTAMP}, 
-      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}
+      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
+      #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Fundinouttype" >
@@ -51,15 +48,6 @@
       <if test="ft_kind != null" >
         ft_kind,
       </if>
-      <if test="ft_recordid != null" >
-        ft_recordid,
-      </if>
-      <if test="ft_recorder != null" >
-        ft_recorder,
-      </if>
-      <if test="ft_date != null" >
-        ft_date,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -69,6 +57,15 @@
       <if test="updateTime != null" >
         updateTime,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="ft_name != null" >
@@ -77,15 +74,6 @@
       <if test="ft_kind != null" >
         #{ft_kind,jdbcType=VARCHAR},
       </if>
-      <if test="ft_recordid != null" >
-        #{ft_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ft_recorder != null" >
-        #{ft_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ft_date != null" >
-        #{ft_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -95,6 +83,15 @@
       <if test="updateTime != null" >
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Fundinouttype" >
@@ -106,15 +103,6 @@
       <if test="ft_kind != null" >
         ft_kind = #{ft_kind,jdbcType=VARCHAR},
       </if>
-      <if test="ft_recordid != null" >
-        ft_recordid = #{ft_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ft_recorder != null" >
-        ft_recorder = #{ft_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ft_date != null" >
-        ft_date = #{ft_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -131,9 +119,6 @@
     update fundinouttype
     set ft_name = #{ft_name,jdbcType=VARCHAR},
       ft_kind = #{ft_kind,jdbcType=VARCHAR},
-      ft_recordid = #{ft_recordid,jdbcType=INTEGER},
-      ft_recorder = #{ft_recorder,jdbcType=VARCHAR},
-      ft_date = #{ft_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -45,14 +45,16 @@
       pd_whid, pd_price, pd_amount, 
       companyId, updaterId, updateTime, 
       pd_text1, pd_text2, pd_text3, 
-      pd_text4, pd_text5, pd_num
+      pd_text4, pd_text5, pd_num,
+      creatorId,createTime,creatorName
       )
     values ( #{pd_prodid,jdbcType=INTEGER}, #{pd_prodcode,jdbcType=VARCHAR},
       #{pd_detno,jdbcType=INTEGER}, #{pd_whcode,jdbcType=VARCHAR}, #{pd_whname,jdbcType=VARCHAR}, 
       #{pd_whid,jdbcType=INTEGER}, #{pd_price,jdbcType=DOUBLE}, #{pd_amount,jdbcType=DOUBLE}, 
       #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{pd_text1,jdbcType=VARCHAR}, #{pd_text2,jdbcType=VARCHAR}, #{pd_text3,jdbcType=VARCHAR}, 
-      #{pd_text4,jdbcType=VARCHAR}, #{pd_text5,jdbcType=VARCHAR}, #{pd_num,jdbcType=DOUBLE}
+      #{pd_text4,jdbcType=VARCHAR}, #{pd_text5,jdbcType=VARCHAR}, #{pd_num,jdbcType=DOUBLE},
+      #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.ProductDetail" >
@@ -251,7 +253,8 @@
         pd_whid, pd_price, pd_amount,
         companyId, updaterId, updateTime,
         pd_text1, pd_text2, pd_text3,
-        pd_text4, pd_text5, pd_num
+        pd_text4, pd_text5, pd_num,
+        creatorId,createTime,creatorName
         )
         VALUES
         <foreach collection="list" item="item" index="index" open="" close="" separator=",">
@@ -260,7 +263,8 @@
             #{item.pd_whid,jdbcType=INTEGER}, #{item.pd_price,jdbcType=DOUBLE}, #{item.pd_amount,jdbcType=DOUBLE},
             #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER}, #{item.updateTime,jdbcType=TIMESTAMP},
             #{item.pd_text1,jdbcType=VARCHAR}, #{item.pd_text2,jdbcType=VARCHAR}, #{item.pd_text3,jdbcType=VARCHAR},
-            #{item.pd_text4,jdbcType=VARCHAR}, #{item.pd_text5,jdbcType=VARCHAR}, #{item.pd_num,jdbcType=DOUBLE}
+            #{item.pd_text4,jdbcType=VARCHAR}, #{item.pd_text5,jdbcType=VARCHAR}, #{item.pd_num,jdbcType=DOUBLE},
+            #{item.creatorId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.creatorName,jdbcType=VARCHAR}
             )
         </foreach>
     </insert>

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

@@ -2,72 +2,70 @@
 <!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.ProductMapper">
     <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Product">
-        <id column="pr_id" property="id" jdbcType="INTEGER" />
-        <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />
-        <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
-        <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR" />
-        <result column="pr_unit" property="pr_unit" jdbcType="VARCHAR" />
-        <result column="pr_kind" property="pr_kind" jdbcType="VARCHAR" />
-        <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
-        <result column="pr_whid" property="pr_whid" jdbcType="INTEGER" />
-        <result column="pr_whcode" property="pr_whcode" jdbcType="VARCHAR" />
-        <result column="pr_whname" property="pr_whname" jdbcType="VARCHAR" />
-        <result column="pr_zxbzs" property="pr_zxbzs" jdbcType="INTEGER" />
-        <result column="pr_leadtime" property="pr_leadtime" jdbcType="INTEGER" />
-        <result column="pr_brand" property="pr_brand" jdbcType="VARCHAR" />
-        <result column="pr_standardprice" property="pr_standardprice" jdbcType="DOUBLE" />
-        <result column="pr_purcprice" property="pr_purcprice" jdbcType="DOUBLE" />
-        <result column="pr_saleprice" property="pr_saleprice" jdbcType="DOUBLE" />
-        <result column="pr_vendid" property="pr_vendid" jdbcType="INTEGER" />
-        <result column="pr_vendcode" property="pr_vendcode" jdbcType="VARCHAR" />
-        <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR" />
-        <result column="pr_docdate" property="pr_docdate" jdbcType="TIMESTAMP" />
-        <result column="pr_recordmanid" property="pr_recordmanid" jdbcType="INTEGER" />
-        <result column="pr_recordman" property="pr_recordman" jdbcType="VARCHAR" />
-        <result column="pr_status" property="pr_status" jdbcType="VARCHAR" />
-        <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR" />
-        <result column="companyId" property="companyId" jdbcType="INTEGER" />
-        <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-        <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
-        <result column="pr_text1" property="pr_text1" jdbcType="VARCHAR" />
-        <result column="pr_text2" property="pr_text2" jdbcType="VARCHAR" />
-        <result column="pr_text3" property="pr_text3" jdbcType="VARCHAR" />
-        <result column="pr_text4" property="pr_text4" jdbcType="VARCHAR" />
-        <result column="pr_text5" property="pr_text5" jdbcType="VARCHAR" />
+        <id column="pr_id" property="id" jdbcType="INTEGER"/>
+        <result column="pr_code" property="pr_code" jdbcType="VARCHAR"/>
+        <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR"/>
+        <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR"/>
+        <result column="pr_unit" property="pr_unit" jdbcType="VARCHAR"/>
+        <result column="pr_kind" property="pr_kind" jdbcType="VARCHAR"/>
+        <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR"/>
+        <result column="pr_whid" property="pr_whid" jdbcType="INTEGER"/>
+        <result column="pr_whcode" property="pr_whcode" jdbcType="VARCHAR"/>
+        <result column="pr_whname" property="pr_whname" jdbcType="VARCHAR"/>
+        <result column="pr_zxbzs" property="pr_zxbzs" jdbcType="INTEGER"/>
+        <result column="pr_leadtime" property="pr_leadtime" jdbcType="INTEGER"/>
+        <result column="pr_brand" property="pr_brand" jdbcType="VARCHAR"/>
+        <result column="pr_standardprice" property="pr_standardprice" jdbcType="DOUBLE"/>
+        <result column="pr_purcprice" property="pr_purcprice" jdbcType="DOUBLE"/>
+        <result column="pr_saleprice" property="pr_saleprice" jdbcType="DOUBLE"/>
+        <result column="pr_vendid" property="pr_vendid" jdbcType="INTEGER"/>
+        <result column="pr_vendcode" property="pr_vendcode" jdbcType="VARCHAR"/>
+        <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR"/>
+        <result column="pr_status" property="pr_status" jdbcType="VARCHAR"/>
+        <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR"/>
+        <result column="companyId" property="companyId" jdbcType="INTEGER"/>
+        <result column="updaterId" property="updaterId" jdbcType="INTEGER"/>
+        <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="pr_text1" property="pr_text1" jdbcType="VARCHAR"/>
+        <result column="pr_text2" property="pr_text2" jdbcType="VARCHAR"/>
+        <result column="pr_text3" property="pr_text3" jdbcType="VARCHAR"/>
+        <result column="pr_text4" property="pr_text4" jdbcType="VARCHAR"/>
+        <result column="pr_text5" property="pr_text5" jdbcType="VARCHAR"/>
     </resultMap>
     <resultMap id="ProductDTOResultMapper" type="com.usoftchina.saas.document.dto.ProductDTO">
-        <id column="pr_id" property="id" jdbcType="INTEGER" />
-        <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />
-        <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
-        <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR" />
-        <result column="pr_unit" property="pr_unit" jdbcType="VARCHAR" />
-        <result column="pr_whid" property="pr_whid" jdbcType="INTEGER" />
-        <result column="pr_whcode" property="pr_whcode" jdbcType="VARCHAR" />
-        <result column="pr_whname" property="pr_whname" jdbcType="VARCHAR" />
+        <id column="pr_id" property="id" jdbcType="INTEGER"/>
+        <result column="pr_code" property="pr_code" jdbcType="VARCHAR"/>
+        <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR"/>
+        <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR"/>
+        <result column="pr_unit" property="pr_unit" jdbcType="VARCHAR"/>
+        <result column="pr_whid" property="pr_whid" jdbcType="INTEGER"/>
+        <result column="pr_whcode" property="pr_whcode" jdbcType="VARCHAR"/>
+        <result column="pr_whname" property="pr_whname" jdbcType="VARCHAR"/>
         <!--productonhand-->
-        <result column="po_onhand" property="po_onhand" jdbcType="DOUBLE" />
+        <result column="po_onhand" property="po_onhand" jdbcType="DOUBLE"/>
         <!--productonhand-->
-        <result column="pr_kind" property="pr_kind" jdbcType="VARCHAR" />
-        <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
-        <result column="pr_brand" property="pr_brand" jdbcType="VARCHAR" />
-        <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR" />
-        <result column="pr_zxbzs" property="pr_zxbzs" jdbcType="VARCHAR" />
-        <result column="pr_leadtime" property="pr_leadtime" jdbcType="INTEGER" />
-        <result column="pr_status" property="pr_status" jdbcType="VARCHAR" />
-        <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR" />
+        <result column="pr_kind" property="pr_kind" jdbcType="VARCHAR"/>
+        <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR"/>
+        <result column="pr_brand" property="pr_brand" jdbcType="VARCHAR"/>
+        <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR"/>
+        <result column="pr_zxbzs" property="pr_zxbzs" jdbcType="VARCHAR"/>
+        <result column="pr_leadtime" property="pr_leadtime" jdbcType="INTEGER"/>
+        <result column="pr_status" property="pr_status" jdbcType="VARCHAR"/>
+        <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR"/>
     </resultMap>
 
 
     <!--查询所有物料信息-->
-    <select id="getProductsByCondition" resultMap="ProductDTOResultMapper" parameterType="com.usoftchina.saas.commons.dto.DocReqDTO">
+    <select id="getProductsByCondition" resultMap="ProductDTOResultMapper"
+            parameterType="com.usoftchina.saas.commons.dto.DocReqDTO">
         SELECT * FROM PRODUCT left join productonhand on pr_id = po_prodid
-        and  PRODUCT.companyid =  productonhand.companyid
+        and PRODUCT.companyid = productonhand.companyid
         <where>
             <if test="con != null">
                 ${con}
             </if>
             <if test="companyId != null">
-                and  PRODUCT.companyid = #{companyId}
+                and PRODUCT.companyid = #{companyId}
             </if>
         </where>
         ORDER BY PR_ID DESC
@@ -86,31 +84,31 @@
     <select id="validateCodeWhenInsert" resultType="int">
         select count(*) from PRODUCT where PR_CODE = #{code} and companyId =#{companyId}
     </select>
-    <select id="validateCodeWhenUpdate" resultType="int" >
+    <select id="validateCodeWhenUpdate" resultType="int">
         select count(*) from PRODUCT where PR_CODE = #{code} and PR_ID != #{id} and companyId =#{companyId}
     </select>
     <select id="getCodeById" resultType="string">
         SELECT PR_CODE FROM PRODUCT WHERE PR_ID=#{id}
     </select>
 
-    <sql id="Base_Column_List" >
+    <sql id="Base_Column_List">
         pr_id, pr_code, pr_detail, pr_spec, pr_unit, pr_kind, pr_orispeccode, pr_whid, pr_whcode,
         pr_whname, pr_zxbzs, pr_leadtime, pr_brand, pr_standardprice, pr_purcprice, pr_saleprice,
-        pr_vendid, pr_vendcode, pr_vendname, pr_docdate, pr_recordmanid, pr_recordman, pr_status,
+        pr_vendid, pr_vendcode, pr_vendname, pr_status,
         pr_statuscode, companyId, updaterId, updateTime, pr_text1, pr_text2, pr_text3,
         pr_text4, pr_text5
     </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from product
         where pr_id = #{id}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from product
         where pr_id = #{id}
     </delete>
-    <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Product" >
+    <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Product">
         <selectKey resultType="java.lang.Long" keyProperty="id">
             SELECT LAST_INSERT_ID() AS ID
         </selectKey>
@@ -120,8 +118,7 @@
         pr_whname, pr_zxbzs, pr_leadtime,
         pr_brand, pr_standardprice, pr_purcprice,
         pr_saleprice, pr_vendid, pr_vendcode,
-        pr_vendname, pr_docdate, pr_recordmanid,
-        pr_recordman, pr_status, pr_statuscode,
+        pr_vendname, pr_status, pr_statuscode,
         companyId, updaterId, updateTime,
         pr_text1, pr_text2, pr_text3,
         pr_text4, pr_text5)
@@ -131,308 +128,298 @@
         #{pr_whname,jdbcType=VARCHAR}, #{pr_zxbzs,jdbcType=DECIMAL}, #{pr_leadtime,jdbcType=DECIMAL},
         #{pr_brand,jdbcType=VARCHAR}, #{pr_standardprice,jdbcType=DECIMAL}, #{pr_purcprice,jdbcType=DECIMAL},
         #{pr_saleprice,jdbcType=DECIMAL}, #{pr_vendid,jdbcType=DECIMAL}, #{pr_vendcode,jdbcType=VARCHAR},
-        #{pr_vendname,jdbcType=VARCHAR}, #{pr_docdate,jdbcType=TIMESTAMP}, #{pr_recordmanid,jdbcType=DECIMAL},
-        #{pr_recordman,jdbcType=VARCHAR}, #{pr_status,jdbcType=VARCHAR}, #{pr_statuscode,jdbcType=VARCHAR},
+        #{pr_vendname,jdbcType=VARCHAR}, #{pr_status,jdbcType=VARCHAR}, #{pr_statuscode,jdbcType=VARCHAR},
         #{companyId,jdbcType=DECIMAL}, #{updaterId,jdbcType=DECIMAL}, #{updateTime,jdbcType=TIMESTAMP},
         #{pr_text1,jdbcType=VARCHAR}, #{pr_text2,jdbcType=VARCHAR}, #{pr_text3,jdbcType=VARCHAR},
         #{pr_text4,jdbcType=VARCHAR}, #{pr_text5,jdbcType=VARCHAR})
     </insert>
-    <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Product" >
+    <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Product">
         <selectKey resultType="java.lang.Long" keyProperty="id">
             SELECT LAST_INSERT_ID() AS ID
         </selectKey>
         insert into product
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-            <if test="pr_code != null" >
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="pr_code != null">
                 pr_code,
             </if>
-            <if test="pr_detail != null" >
+            <if test="pr_detail != null">
                 pr_detail,
             </if>
-            <if test="pr_spec != null" >
+            <if test="pr_spec != null">
                 pr_spec,
             </if>
-            <if test="pr_unit != null" >
+            <if test="pr_unit != null">
                 pr_unit,
             </if>
-            <if test="pr_kind != null" >
+            <if test="pr_kind != null">
                 pr_kind,
             </if>
-            <if test="pr_orispeccode != null" >
+            <if test="pr_orispeccode != null">
                 pr_orispeccode,
             </if>
-            <if test="pr_whid != null" >
+            <if test="pr_whid != null">
                 pr_whid,
             </if>
-            <if test="pr_whcode != null" >
+            <if test="pr_whcode != null">
                 pr_whcode,
             </if>
-            <if test="pr_whname != null" >
+            <if test="pr_whname != null">
                 pr_whname,
             </if>
-            <if test="pr_zxbzs != null" >
+            <if test="pr_zxbzs != null">
                 pr_zxbzs,
             </if>
-            <if test="pr_leadtime != null" >
+            <if test="pr_leadtime != null">
                 pr_leadtime,
             </if>
-            <if test="pr_brand != null" >
+            <if test="pr_brand != null">
                 pr_brand,
             </if>
-            <if test="pr_standardprice != null" >
+            <if test="pr_standardprice != null">
                 pr_standardprice,
             </if>
-            <if test="pr_purcprice != null" >
+            <if test="pr_purcprice != null">
                 pr_purcprice,
             </if>
-            <if test="pr_saleprice != null" >
+            <if test="pr_saleprice != null">
                 pr_saleprice,
             </if>
-            <if test="pr_vendid != null" >
+            <if test="pr_vendid != null">
                 pr_vendid,
             </if>
-            <if test="pr_vendcode != null" >
+            <if test="pr_vendcode != null">
                 pr_vendcode,
             </if>
-            <if test="pr_vendname != null" >
+            <if test="pr_vendname != null">
                 pr_vendname,
             </if>
-            <if test="pr_docdate != null" >
-                pr_docdate,
-            </if>
-            <if test="pr_recordmanid != null" >
-                pr_recordmanid,
-            </if>
-            <if test="pr_recordman != null" >
-                pr_recordman,
-            </if>
-            <if test="pr_status != null" >
+            <if test="pr_status != null">
                 pr_status,
             </if>
-            <if test="pr_statuscode != null" >
+            <if test="pr_statuscode != null">
                 pr_statuscode,
             </if>
-            <if test="companyId != null" >
+            <if test="companyId != null">
                 companyId,
             </if>
-            <if test="updaterId != null" >
+            <if test="updaterId != null">
                 updaterId,
             </if>
-            <if test="updateTime != null" >
+            <if test="updateTime != null">
                 updateTime,
             </if>
-            <if test="pr_text1 != null" >
+            <if test="pr_text1 != null">
                 pr_text1,
             </if>
-            <if test="pr_text2 != null" >
+            <if test="pr_text2 != null">
                 pr_text2,
             </if>
-            <if test="pr_text3 != null" >
+            <if test="pr_text3 != null">
                 pr_text3,
             </if>
-            <if test="pr_text4 != null" >
+            <if test="pr_text4 != null">
                 pr_text4,
             </if>
-            <if test="pr_text5 != null" >
+            <if test="pr_text5 != null">
                 pr_text5,
             </if>
+            <if test="creatorId != null" >
+                creatorId,
+            </if>
+            <if test="createTime != null" >
+                createTime,
+            </if>
+            <if test="creatorName != null" >
+                creatorName,
+            </if>
         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-            <if test="pr_code != null" >
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="pr_code != null">
                 #{pr_code,jdbcType=VARCHAR},
             </if>
-            <if test="pr_detail != null" >
+            <if test="pr_detail != null">
                 #{pr_detail,jdbcType=VARCHAR},
             </if>
-            <if test="pr_spec != null" >
+            <if test="pr_spec != null">
                 #{pr_spec,jdbcType=VARCHAR},
             </if>
-            <if test="pr_unit != null" >
+            <if test="pr_unit != null">
                 #{pr_unit,jdbcType=VARCHAR},
             </if>
-            <if test="pr_kind != null" >
+            <if test="pr_kind != null">
                 #{pr_kind,jdbcType=VARCHAR},
             </if>
-            <if test="pr_orispeccode != null" >
+            <if test="pr_orispeccode != null">
                 #{pr_orispeccode,jdbcType=VARCHAR},
             </if>
-            <if test="pr_whid != null" >
+            <if test="pr_whid != null">
                 #{pr_whid,jdbcType=DECIMAL},
             </if>
-            <if test="pr_whcode != null" >
+            <if test="pr_whcode != null">
                 #{pr_whcode,jdbcType=VARCHAR},
             </if>
-            <if test="pr_whname != null" >
+            <if test="pr_whname != null">
                 #{pr_whname,jdbcType=VARCHAR},
             </if>
-            <if test="pr_zxbzs != null" >
+            <if test="pr_zxbzs != null">
                 #{pr_zxbzs,jdbcType=DECIMAL},
             </if>
-            <if test="pr_leadtime != null" >
+            <if test="pr_leadtime != null">
                 #{pr_leadtime,jdbcType=DECIMAL},
             </if>
-            <if test="pr_brand != null" >
+            <if test="pr_brand != null">
                 #{pr_brand,jdbcType=VARCHAR},
             </if>
-            <if test="pr_standardprice != null" >
+            <if test="pr_standardprice != null">
                 #{pr_standardprice,jdbcType=DECIMAL},
             </if>
-            <if test="pr_purcprice != null" >
+            <if test="pr_purcprice != null">
                 #{pr_purcprice,jdbcType=DECIMAL},
             </if>
-            <if test="pr_saleprice != null" >
+            <if test="pr_saleprice != null">
                 #{pr_saleprice,jdbcType=DECIMAL},
             </if>
-            <if test="pr_vendid != null" >
+            <if test="pr_vendid != null">
                 #{pr_vendid,jdbcType=DECIMAL},
             </if>
-            <if test="pr_vendcode != null" >
+            <if test="pr_vendcode != null">
                 #{pr_vendcode,jdbcType=VARCHAR},
             </if>
-            <if test="pr_vendname != null" >
+            <if test="pr_vendname != null">
                 #{pr_vendname,jdbcType=VARCHAR},
             </if>
-            <if test="pr_docdate != null" >
-                #{pr_docdate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="pr_recordmanid != null" >
-                #{pr_recordmanid,jdbcType=DECIMAL},
-            </if>
-            <if test="pr_recordman != null" >
-                #{pr_recordman,jdbcType=VARCHAR},
-            </if>
-            <if test="pr_status != null" >
+            <if test="pr_status != null">
                 #{pr_status,jdbcType=VARCHAR},
             </if>
-            <if test="pr_statuscode != null" >
+            <if test="pr_statuscode != null">
                 #{pr_statuscode,jdbcType=VARCHAR},
             </if>
-            <if test="companyId != null" >
+            <if test="companyId != null">
                 #{companyId,jdbcType=DECIMAL},
             </if>
-            <if test="updaterId != null" >
+            <if test="updaterId != null">
                 #{updaterId,jdbcType=DECIMAL},
             </if>
-            <if test="updateTime != null" >
+            <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
-            <if test="pr_text1 != null" >
+            <if test="pr_text1 != null">
                 #{pr_text1,jdbcType=VARCHAR},
             </if>
-            <if test="pr_text2 != null" >
+            <if test="pr_text2 != null">
                 #{pr_text2,jdbcType=VARCHAR},
             </if>
-            <if test="pr_text3 != null" >
+            <if test="pr_text3 != null">
                 #{pr_text3,jdbcType=VARCHAR},
             </if>
-            <if test="pr_text4 != null" >
+            <if test="pr_text4 != null">
                 #{pr_text4,jdbcType=VARCHAR},
             </if>
-            <if test="pr_text5 != null" >
+            <if test="pr_text5 != null">
                 #{pr_text5,jdbcType=VARCHAR},
             </if>
+            <if test="creatorId != null" >
+                #{creatorId,jdbcType=INTEGER},
+            </if>
+            <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="creatorName != null" >
+                #{creatorName,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Product" >
+    <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Product">
         update product
-        <set >
-            <if test="pr_code != null" >
+        <set>
+            <if test="pr_code != null">
                 pr_code = #{pr_code,jdbcType=VARCHAR},
             </if>
-            <if test="pr_detail != null" >
+            <if test="pr_detail != null">
                 pr_detail = #{pr_detail,jdbcType=VARCHAR},
             </if>
-            <if test="pr_spec != null" >
+            <if test="pr_spec != null">
                 pr_spec = #{pr_spec,jdbcType=VARCHAR},
             </if>
-            <if test="pr_unit != null" >
+            <if test="pr_unit != null">
                 pr_unit = #{pr_unit,jdbcType=VARCHAR},
             </if>
-            <if test="pr_kind != null" >
+            <if test="pr_kind != null">
                 pr_kind = #{pr_kind,jdbcType=VARCHAR},
             </if>
-            <if test="pr_orispeccode != null" >
+            <if test="pr_orispeccode != null">
                 pr_orispeccode = #{pr_orispeccode,jdbcType=VARCHAR},
             </if>
-            <if test="pr_whid != null" >
+            <if test="pr_whid != null">
                 pr_whid = #{pr_whid,jdbcType=DECIMAL},
             </if>
-            <if test="pr_whcode != null" >
+            <if test="pr_whcode != null">
                 pr_whcode = #{pr_whcode,jdbcType=VARCHAR},
             </if>
-            <if test="pr_whname != null" >
+            <if test="pr_whname != null">
                 pr_whname = #{pr_whname,jdbcType=VARCHAR},
             </if>
-            <if test="pr_zxbzs != null" >
+            <if test="pr_zxbzs != null">
                 pr_zxbzs = #{pr_zxbzs,jdbcType=DECIMAL},
             </if>
-            <if test="pr_leadtime != null" >
+            <if test="pr_leadtime != null">
                 pr_leadtime = #{pr_leadtime,jdbcType=DECIMAL},
             </if>
-            <if test="pr_brand != null" >
+            <if test="pr_brand != null">
                 pr_brand = #{pr_brand,jdbcType=VARCHAR},
             </if>
-            <if test="pr_standardprice != null" >
+            <if test="pr_standardprice != null">
                 pr_standardprice = #{pr_standardprice,jdbcType=DECIMAL},
             </if>
-            <if test="pr_purcprice != null" >
+            <if test="pr_purcprice != null">
                 pr_purcprice = #{pr_purcprice,jdbcType=DECIMAL},
             </if>
-            <if test="pr_saleprice != null" >
+            <if test="pr_saleprice != null">
                 pr_saleprice = #{pr_saleprice,jdbcType=DECIMAL},
             </if>
-            <if test="pr_vendid != null" >
+            <if test="pr_vendid != null">
                 pr_vendid = #{pr_vendid,jdbcType=DECIMAL},
             </if>
-            <if test="pr_vendcode != null" >
+            <if test="pr_vendcode != null">
                 pr_vendcode = #{pr_vendcode,jdbcType=VARCHAR},
             </if>
-            <if test="pr_vendname != null" >
+            <if test="pr_vendname != null">
                 pr_vendname = #{pr_vendname,jdbcType=VARCHAR},
             </if>
-            <if test="pr_docdate != null" >
-                pr_docdate = #{pr_docdate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="pr_recordmanid != null" >
-                pr_recordmanid = #{pr_recordmanid,jdbcType=DECIMAL},
-            </if>
-            <if test="pr_recordman != null" >
-                pr_recordman = #{pr_recordman,jdbcType=VARCHAR},
-            </if>
-            <if test="pr_status != null" >
+            <if test="pr_status != null">
                 pr_status = #{pr_status,jdbcType=VARCHAR},
             </if>
-            <if test="pr_statuscode != null" >
+            <if test="pr_statuscode != null">
                 pr_statuscode = #{pr_statuscode,jdbcType=VARCHAR},
             </if>
-            <if test="companyId != null" >
+            <if test="companyId != null">
                 companyId = #{companyId,jdbcType=DECIMAL},
             </if>
-            <if test="updaterId != null" >
+            <if test="updaterId != null">
                 updaterId = #{updaterId,jdbcType=DECIMAL},
             </if>
-            <if test="updateTime != null" >
+            <if test="updateTime != null">
                 updateTime = #{updateTime,jdbcType=TIMESTAMP},
             </if>
-            <if test="pr_text1 != null" >
+            <if test="pr_text1 != null">
                 pr_text1 = #{pr_text1,jdbcType=VARCHAR},
             </if>
-            <if test="pr_text2 != null" >
+            <if test="pr_text2 != null">
                 pr_text2 = #{pr_text2,jdbcType=VARCHAR},
             </if>
-            <if test="pr_text3 != null" >
+            <if test="pr_text3 != null">
                 pr_text3 = #{pr_text3,jdbcType=VARCHAR},
             </if>
-            <if test="pr_text4 != null" >
+            <if test="pr_text4 != null">
                 pr_text4 = #{pr_text4,jdbcType=VARCHAR},
             </if>
-            <if test="pr_text5 != null" >
+            <if test="pr_text5 != null">
                 pr_text5 = #{pr_text5,jdbcType=VARCHAR},
             </if>
         </set>
         where pr_id = #{id}
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Product" >
+    <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Product">
         update product
         set pr_code = #{pr_code,jdbcType=VARCHAR},
         pr_detail = #{pr_detail,jdbcType=VARCHAR},
@@ -452,9 +439,6 @@
         pr_vendid = #{pr_vendid,jdbcType=DECIMAL},
         pr_vendcode = #{pr_vendcode,jdbcType=VARCHAR},
         pr_vendname = #{pr_vendname,jdbcType=VARCHAR},
-        pr_docdate = #{pr_docdate,jdbcType=TIMESTAMP},
-        pr_recordmanid = #{pr_recordmanid,jdbcType=DECIMAL},
-        pr_recordman = #{pr_recordman,jdbcType=VARCHAR},
         pr_status = #{pr_status,jdbcType=VARCHAR},
         pr_statuscode = #{pr_statuscode,jdbcType=VARCHAR},
         companyId = #{companyId,jdbcType=DECIMAL},
@@ -469,26 +453,26 @@
     </update>
 
     <resultMap id="ProdReserveCostResultMap" type="com.usoftchina.saas.document.dto.ProductReserveCostDTO">
-        <result column="pr_code" property="rc_prodCode" jdbcType="VARCHAR" />
-        <result column="pr_spec" property="rc_prodSpec" jdbcType="VARCHAR" />
-        <result column="pr_detail" property="rc_prodDetail" jdbcType="VARCHAR" />
-        <result column="pr_unit" property="rc_prodUnit" jdbcType="VARCHAR" />
-        <result column="wh_code" property="rc_whCode" jdbcType="VARCHAR" />
-        <result column="wh_description" property="rc_whName" jdbcType="VARCHAR" />
-        <result column="pw_onhand" property="rc_number" jdbcType="DOUBLE" />
-        <result column="pw_avprice" property="rc_price" jdbcType="DOUBLE" />
-        <result column="pw_amount" property="rc_amount" jdbcType="DOUBLE" />
+        <result column="pr_code" property="rc_prodCode" jdbcType="VARCHAR"/>
+        <result column="pr_spec" property="rc_prodSpec" jdbcType="VARCHAR"/>
+        <result column="pr_detail" property="rc_prodDetail" jdbcType="VARCHAR"/>
+        <result column="pr_unit" property="rc_prodUnit" jdbcType="VARCHAR"/>
+        <result column="wh_code" property="rc_whCode" jdbcType="VARCHAR"/>
+        <result column="wh_description" property="rc_whName" jdbcType="VARCHAR"/>
+        <result column="pw_onhand" property="rc_number" jdbcType="DOUBLE"/>
+        <result column="pw_avprice" property="rc_price" jdbcType="DOUBLE"/>
+        <result column="pw_amount" property="rc_amount" jdbcType="DOUBLE"/>
     </resultMap>
     <select id="selectReserveCost" resultMap="ProdReserveCostResultMap">
-        select * from productWH tab left join Product on pw_prodcode=pr_code left join warehouse on pw_whcode=wh_code
+        select * from productWH tab left join Product on pw_prodcode=pr_code left join warehouse on pw_whid=wh_id
         <where>
-          <if test="con!=null">
-              ${con}
-          </if>
-          <if test="companyId!=null">
-              and tab.companyId=#{companyId} and Product.companyId=#{companyId} and warehouse.companyId=#{companyId}
-              and pw_onhand!=0
-          </if>
+            <if test="con!=null">
+                ${con}
+            </if>
+            <if test="companyId!=null">
+                and tab.companyId=#{companyId} and Product.companyId=#{companyId} and warehouse.companyId=#{companyId}
+                and pw_onhand!=0
+            </if>
         </where>
         ORDER BY PR_ID DESC
     </select>
@@ -556,15 +540,6 @@
             <if test="pi_total != null">
                 pi_total,
             </if>
-            <if test="pi_recordmanid != null">
-                pi_recordmanid,
-            </if>
-            <if test="pi_recordman != null">
-                pi_recordman,
-            </if>
-            <if test="createTime != null">
-                pi_recorddate,
-            </if>
             <if test="pi_status != null">
                 pi_status,
             </if>
@@ -613,6 +588,15 @@
             <if test="pi_remark != null">
                 pi_remark,
             </if>
+            <if test="creatorId != null" >
+                creatorId,
+            </if>
+            <if test="createTime != null" >
+                createTime,
+            </if>
+            <if test="creatorName != null" >
+                creatorName,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -658,15 +642,6 @@
             <if test="pi_total != null">
                 #{pi_total,jdbcType=DOUBLE},
             </if>
-            <if test="pi_recordmanid != null">
-                #{pi_recordmanid,jdbcType=INTEGER},
-            </if>
-            <if test="pi_recordman != null">
-                #{pi_recordman,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
             <if test="pi_status != null">
                 #{pi_status,jdbcType=VARCHAR},
             </if>
@@ -715,10 +690,19 @@
             <if test="pi_remark != null">
                 #{pi_remark,jdbcType=VARCHAR},
             </if>
+            <if test="creatorId != null" >
+                #{creatorId,jdbcType=INTEGER},
+            </if>
+            <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="creatorName != null" >
+                #{creatorName,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
 
-    <insert id="batchInsertDetail" parameterType="java.util.List" >
+    <insert id="batchInsertDetail" parameterType="java.util.List">
         insert into prodiodetail (pd_piid, pd_inoutno,
         pd_piclass, pd_pdno, pd_ordercode,
         pd_orderdetno, pd_prodid, pd_prodcode,
@@ -732,7 +716,8 @@
         updatetime, pd_text1, pd_text2,
         pd_text3, pd_text4, pd_text5,
         pd_ym, pd_yqty, pd_ioid,
-        pd_remark) VALUES
+        pd_remark,
+        creatorId,createTime,creatorName) VALUES
         <foreach collection="list" item="item" index="index" open="" close="" separator=",">
             (
             #{item.pd_piid,jdbcType=INTEGER},
@@ -773,118 +758,120 @@
             #{item.pd_ym,jdbcType=INTEGER},
             #{item.pd_yqty,jdbcType=DOUBLE},
             #{item.pd_remark,jdbcType=LONGVARCHAR},
-            #{item.pd_ioid,jdbcType=INTEGER})
+            #{item.pd_ioid,jdbcType=INTEGER},
+            #{item.creatorId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.creatorName,jdbcType=VARCHAR})
         </foreach>
     </insert>
 
-    <update id="batchUpdateDetail" parameterType="com.usoftchina.saas.document.entities.ProdIODetail" >
+    <update id="batchUpdateDetail" parameterType="com.usoftchina.saas.document.entities.ProdIODetail">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
-            update prodiodetail <set>
-            <if test="item.pd_piid !=null">
-                pd_piid = #{item.pd_piid},
-            </if>
-            <if test="item.pd_inoutno !=null">
-                pd_inoutno = #{item.pd_inoutno},
-            </if>
-            <if test="item.pd_piclass !=null">
-                pd_piclass = #{item.pd_piclass},
-            </if>
-            <if test="item.pd_pdno !=null">
-                pd_pdno = #{item.pd_pdno},
-            </if>
-            <if test="item.pd_ordercode !=null">
-                pd_ordercode = #{item.pd_ordercode},
-            </if>
-            <if test="item.pd_orderdetno !=null">
-                pd_orderdetno = #{item.pd_orderdetno},
-            </if>
-            <if test="item.pd_prodid !=null">
-                pd_prodid = #{item.pd_prodid},
-            </if>
-            <if test="item.pd_prodcode !=null">
-                pd_prodcode = #{item.pd_prodcode},
-            </if>
-            <if test="item.pd_unit !=null">
-                pd_unit = #{item.pd_unit},
-            </if>
-            <if test="item.pd_inqty !=null">
-                pd_inqty = #{item.pd_inqty},
-            </if>
-            <if test="item.pd_outqty !=null">
-                pd_outqty = #{item.pd_outqty},
-            </if>
-            <if test="item.pd_orderprice !=null">
-                pd_orderprice = #{item.pd_orderprice},
-            </if>
-            <if test="item.pd_sendprice !=null">
-                pd_sendprice = #{item.pd_sendprice},
-            </if>
-            <if test="item.pd_price !=null">
-                pd_price = #{item.pd_price},
-            </if>
-            <if test="item.pd_total !=null">
-                pd_total = #{item.pd_total},
-            </if>
-            <if test="item.pd_taxrate !=null">
-                pd_taxrate = #{item.pd_taxrate},
-            </if>
-            <if test="item.pd_netprice !=null">
-                pd_netprice = #{item.pd_netprice},
-            </if>
-            <if test="item.pd_nettotal !=null">
-                pd_nettotal = #{item.pd_nettotal},
-            </if>
-            <if test="item.pd_whid !=null">
-                pd_whid = #{item.pd_whid},
-            </if>
-            <if test="item.pd_whcode !=null">
-                pd_whcode = #{item.pd_whcode},
-            </if>
-            <if test="item.pd_whname !=null">
-                pd_whname = #{item.pd_whname},
-            </if>
-            <if test="item.pd_inwhid !=null">
-                pd_inwhid = #{item.pd_inwhid},
-            </if>
-            <if test="item.pd_inwhcode !=null">
-                pd_inwhcode = #{item.pd_inwhcode},
-            </if>
-            <if test="item.pd_inwhname !=null">
-                pd_inwhname = #{item.pd_inwhname},
-            </if>
-            <if test="item.pd_orderid !=null">
-                pd_orderid = #{item.pd_orderid},
-            </if>
-            <if test="item.pd_sdid !=null">
-                pd_sdid = #{item.pd_sdid},
-            </if>
-            <if test="item.pd_status !=null">
-                pd_status = #{item.pd_status},
-            </if>
-            <if test="item.pd_remark !=null">
-                pd_remark = #{item.pd_remark},
-            </if>
-            <if test="item.companyId!=null">
-                companyId = #{item.companyId},
-            </if>
-            <if test="item.updaterId!=null">
-                updaterId = #{item.updaterId},
-            </if>
-            <if test="item.updateTime!=null">
-                updateTime = #{item.updateTime},
-            </if>
-            pd_text1 = #{item.pd_text1},
-            pd_text2 = #{item.pd_text2},
-            pd_text3 = #{item.pd_text3},
-            pd_text4 = #{item.pd_text4},
-            pd_text5 = #{item.pd_text5},
-            <if test="item.pd_ym!=null">
-                pd_ym = #{item.pd_ym},
-            </if>
-            <if test="item.pd_yqty!=null">
-                pd_yqty = #{item.pd_yqty},
-            </if>
-        </set>
+            update prodiodetail
+            <set>
+                <if test="item.pd_piid !=null">
+                    pd_piid = #{item.pd_piid},
+                </if>
+                <if test="item.pd_inoutno !=null">
+                    pd_inoutno = #{item.pd_inoutno},
+                </if>
+                <if test="item.pd_piclass !=null">
+                    pd_piclass = #{item.pd_piclass},
+                </if>
+                <if test="item.pd_pdno !=null">
+                    pd_pdno = #{item.pd_pdno},
+                </if>
+                <if test="item.pd_ordercode !=null">
+                    pd_ordercode = #{item.pd_ordercode},
+                </if>
+                <if test="item.pd_orderdetno !=null">
+                    pd_orderdetno = #{item.pd_orderdetno},
+                </if>
+                <if test="item.pd_prodid !=null">
+                    pd_prodid = #{item.pd_prodid},
+                </if>
+                <if test="item.pd_prodcode !=null">
+                    pd_prodcode = #{item.pd_prodcode},
+                </if>
+                <if test="item.pd_unit !=null">
+                    pd_unit = #{item.pd_unit},
+                </if>
+                <if test="item.pd_inqty !=null">
+                    pd_inqty = #{item.pd_inqty},
+                </if>
+                <if test="item.pd_outqty !=null">
+                    pd_outqty = #{item.pd_outqty},
+                </if>
+                <if test="item.pd_orderprice !=null">
+                    pd_orderprice = #{item.pd_orderprice},
+                </if>
+                <if test="item.pd_sendprice !=null">
+                    pd_sendprice = #{item.pd_sendprice},
+                </if>
+                <if test="item.pd_price !=null">
+                    pd_price = #{item.pd_price},
+                </if>
+                <if test="item.pd_total !=null">
+                    pd_total = #{item.pd_total},
+                </if>
+                <if test="item.pd_taxrate !=null">
+                    pd_taxrate = #{item.pd_taxrate},
+                </if>
+                <if test="item.pd_netprice !=null">
+                    pd_netprice = #{item.pd_netprice},
+                </if>
+                <if test="item.pd_nettotal !=null">
+                    pd_nettotal = #{item.pd_nettotal},
+                </if>
+                <if test="item.pd_whid !=null">
+                    pd_whid = #{item.pd_whid},
+                </if>
+                <if test="item.pd_whcode !=null">
+                    pd_whcode = #{item.pd_whcode},
+                </if>
+                <if test="item.pd_whname !=null">
+                    pd_whname = #{item.pd_whname},
+                </if>
+                <if test="item.pd_inwhid !=null">
+                    pd_inwhid = #{item.pd_inwhid},
+                </if>
+                <if test="item.pd_inwhcode !=null">
+                    pd_inwhcode = #{item.pd_inwhcode},
+                </if>
+                <if test="item.pd_inwhname !=null">
+                    pd_inwhname = #{item.pd_inwhname},
+                </if>
+                <if test="item.pd_orderid !=null">
+                    pd_orderid = #{item.pd_orderid},
+                </if>
+                <if test="item.pd_sdid !=null">
+                    pd_sdid = #{item.pd_sdid},
+                </if>
+                <if test="item.pd_status !=null">
+                    pd_status = #{item.pd_status},
+                </if>
+                <if test="item.pd_remark !=null">
+                    pd_remark = #{item.pd_remark},
+                </if>
+                <if test="item.companyId!=null">
+                    companyId = #{item.companyId},
+                </if>
+                <if test="item.updaterId!=null">
+                    updaterId = #{item.updaterId},
+                </if>
+                <if test="item.updateTime!=null">
+                    updateTime = #{item.updateTime},
+                </if>
+                pd_text1 = #{item.pd_text1},
+                pd_text2 = #{item.pd_text2},
+                pd_text3 = #{item.pd_text3},
+                pd_text4 = #{item.pd_text4},
+                pd_text5 = #{item.pd_text5},
+                <if test="item.pd_ym!=null">
+                    pd_ym = #{item.pd_ym},
+                </if>
+                <if test="item.pd_yqty!=null">
+                    pd_yqty = #{item.pd_yqty},
+                </if>
+            </set>
             where PD_ID = #{item.id,jdbcType=BIGINT}
         </foreach>
     </update>
@@ -908,7 +895,7 @@
         WHERE PRODIODETAIL.COMPANYID = #{companyId} AND PD_PRODID = #{id} and pd_piclass != '库存初始化';
     </select>
 
-    <delete id="deleteProdIOByCode" >
+    <delete id="deleteProdIOByCode">
         DELETE FROM PRODINOUT WHERE PI_INOUTNO=#{code} AND COMPANYID = #{companyId}
     </delete>
     <delete id="deleteProdIODetailByCode">

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

@@ -4,9 +4,6 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Productbrand" >
     <id column="pb_id" property="id" jdbcType="INTEGER" />
     <result column="pb_name" property="pb_name" jdbcType="VARCHAR" />
-    <result column="pb_recordid" property="pb_recordid" jdbcType="INTEGER" />
-    <result column="pb_recorder" property="pb_recorder" jdbcType="VARCHAR" />
-    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -18,7 +15,7 @@
     where pb_id = #{id}
   </select>
   <sql id="Base_Column_List" >
-    pb_id, pb_name, pb_recordid, pb_recorder, pb_date, companyId, updaterId, updateTime
+    pb_id, pb_name, companyId, updaterId, updateTime
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
     delete from productbrand
@@ -28,12 +25,12 @@
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
-    insert into productbrand (pb_name, pb_recordid,
-      pb_recorder, pb_date, companyId, 
-      updaterId, updateTime)
-    values (#{pb_name,jdbcType=VARCHAR}, #{pb_recordid,jdbcType=INTEGER},
-      #{pb_recorder,jdbcType=VARCHAR}, #{pb_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, 
-      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
+    insert into productbrand (pb_name,companyId,
+      updaterId, updateTime,
+    creatorId,createTime,creatorName)
+    values (#{pb_name,jdbcType=VARCHAR},#{companyId,jdbcType=INTEGER},
+      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
+    #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Productbrand" >
     <selectKey resultType="java.lang.Long" keyProperty="id">
@@ -44,15 +41,6 @@
       <if test="pb_name != null" >
         pb_name,
       </if>
-      <if test="pb_recordid != null" >
-        pb_recordid,
-      </if>
-      <if test="pb_recorder != null" >
-        pb_recorder,
-      </if>
-      <if test="pb_date != null" >
-        pb_date,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -62,20 +50,20 @@
       <if test="updateTime != null" >
         updateTime,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="pb_name != null" >
         #{pb_name,jdbcType=VARCHAR},
       </if>
-      <if test="pb_recordid != null" >
-        #{pb_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null" >
-        #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_date != null" >
-        #{pb_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -85,6 +73,15 @@
       <if test="updateTime != null" >
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Productbrand" >
@@ -93,15 +90,6 @@
       <if test="pb_name != null" >
         pb_name = #{pb_name,jdbcType=VARCHAR},
       </if>
-      <if test="pb_recordid != null" >
-        pb_recordid = #{pb_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null" >
-        pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_date != null" >
-        pb_date = #{pb_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -117,9 +105,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Productbrand" >
     update productbrand
     set pb_name = #{pb_name,jdbcType=VARCHAR},
-      pb_recordid = #{pb_recordid,jdbcType=INTEGER},
-      pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      pb_date = #{pb_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -4,15 +4,12 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Producttype">
     <id column="pt_id" jdbcType="INTEGER" property="id" />
     <result column="pt_name" jdbcType="VARCHAR" property="pt_name" />
-    <result column="pt_recordid" jdbcType="INTEGER" property="pt_recordid" />
-    <result column="pt_recorder" jdbcType="VARCHAR" property="pt_recorder" />
-    <result column="pt_date" jdbcType="TIMESTAMP" property="pt_date" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    pt_id, pt_name, pt_recordid, pt_recorder, pt_date, companyId, updaterId, updateTime
+    pt_id, pt_name, companyId, updaterId, updateTime
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
@@ -28,12 +25,12 @@
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
-    insert into producttype (pt_name, pt_recordid,
-      pt_recorder, pt_date, companyId, 
-      updaterId, updateTime)
-    values (#{pt_name,jdbcType=VARCHAR}, #{pt_recordid,jdbcType=INTEGER},
-      #{pt_recorder,jdbcType=VARCHAR}, #{pt_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, 
-      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
+    insert into producttype (pt_name, companyId,
+      updaterId, updateTime,
+      creatorId,createTime,creatorName)
+    values (#{pt_name,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
+      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
+      #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Producttype">
     <selectKey resultType="java.lang.Long" keyProperty="id">
@@ -44,15 +41,6 @@
       <if test="pt_name != null">
         pt_name,
       </if>
-      <if test="pt_recordid != null">
-        pt_recordid,
-      </if>
-      <if test="pt_recorder != null">
-        pt_recorder,
-      </if>
-      <if test="pt_date != null">
-        pt_date,
-      </if>
       <if test="companyId != null">
         companyId,
       </if>
@@ -62,20 +50,20 @@
       <if test="updateTime != null">
         updateTime,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pt_name != null">
         #{pt_name,jdbcType=VARCHAR},
       </if>
-      <if test="pt_recordid != null">
-        #{pt_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pt_recorder != null">
-        #{pt_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pt_date != null">
-        #{pt_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -85,6 +73,15 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Producttype">
@@ -93,15 +90,6 @@
       <if test="pt_name != null">
         pt_name = #{pt_name,jdbcType=VARCHAR},
       </if>
-      <if test="pt_recordid != null">
-        pt_recordid = #{pt_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pt_recorder != null">
-        pt_recorder = #{pt_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pt_date != null">
-        pt_date = #{pt_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -117,9 +105,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Producttype">
     update producttype
     set pt_name = #{pt_name,jdbcType=VARCHAR},
-      pt_recordid = #{pt_recordid,jdbcType=INTEGER},
-      pt_recorder = #{pt_recorder,jdbcType=VARCHAR},
-      pt_date = #{pt_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -4,15 +4,12 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Productunit" >
     <id column="pu_id" property="id" jdbcType="INTEGER" />
     <result column="pu_name" property="pu_name" jdbcType="VARCHAR" />
-    <result column="pu_recordid" property="pu_recordid" jdbcType="INTEGER" />
-    <result column="pu_recorder" property="pu_recorder" jdbcType="VARCHAR" />
-    <result column="pu_date" property="pu_date" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    pu_id, pu_name, pu_recordid, pu_recorder, pu_date, companyId, updaterId, updateTime
+    pu_id, pu_name, companyId, updaterId, updateTime
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
     select 
@@ -25,11 +22,9 @@
     where pu_id = #{id}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Productunit" >
-    insert into productunit (pu_name, pu_recordid,
-      pu_recorder, pu_date, companyId, 
+    insert into productunit (pu_name, companyId,
       updaterId, updateTime)
-    values (#{pu_name,jdbcType=VARCHAR}, #{pu_recordid,jdbcType=INTEGER},
-      #{pu_recorder,jdbcType=VARCHAR}, #{pu_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, 
+    values (#{pu_name,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Productunit" >
@@ -38,15 +33,6 @@
       <if test="pu_name != null" >
         pu_name,
       </if>
-      <if test="pu_recordid != null" >
-        pu_recordid,
-      </if>
-      <if test="pu_recorder != null" >
-        pu_recorder,
-      </if>
-      <if test="pu_date != null" >
-        pu_date,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -56,20 +42,20 @@
       <if test="updateTime != null" >
         updateTime,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="pu_name != null" >
         #{pu_name,jdbcType=VARCHAR},
       </if>
-      <if test="pu_recordid != null" >
-        #{pu_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pu_recorder != null" >
-        #{pu_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pu_date != null" >
-        #{pu_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -79,6 +65,15 @@
       <if test="updateTime != null" >
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Productunit" >
@@ -87,15 +82,6 @@
       <if test="pu_name != null" >
         pu_name = #{pu_name,jdbcType=VARCHAR},
       </if>
-      <if test="pu_recordid != null" >
-        pu_recordid = #{pu_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pu_recorder != null" >
-        pu_recorder = #{pu_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pu_date != null" >
-        pu_date = #{pu_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -111,9 +97,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Productunit" >
     update productunit
     set pu_name = #{pu_name,jdbcType=VARCHAR},
-      pu_recordid = #{pu_recordid,jdbcType=INTEGER},
-      pu_recorder = #{pu_recorder,jdbcType=VARCHAR},
-      pu_date = #{pu_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -41,13 +41,15 @@
       sl_amount, sl_preamount, sl_yamount, 
       sl_namount, sl_remark, companyId, 
       updaterId, updateTime, sl_orderamount, 
-      sl_discount, sl_ym)
+      sl_discount, sl_ym,
+      creatorId,createTime,creatorName)
     values (#{sl_id,jdbcType=INTEGER}, #{sl_code,jdbcType=VARCHAR}, #{sl_kind,jdbcType=VARCHAR}, 
       #{sl_custid,jdbcType=INTEGER}, #{sl_vendid,jdbcType=INTEGER}, #{sl_date,jdbcType=TIMESTAMP}, 
       #{sl_amount,jdbcType=DOUBLE}, #{sl_preamount,jdbcType=DOUBLE}, #{sl_yamount,jdbcType=DOUBLE}, 
       #{sl_namount,jdbcType=DOUBLE}, #{sl_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, 
       #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{sl_orderamount,jdbcType=DOUBLE}, 
-      #{sl_discount,jdbcType=DOUBLE}, #{sl_ym,jdbcType=INTEGER})
+      #{sl_discount,jdbcType=DOUBLE}, #{sl_ym,jdbcType=INTEGER},
+      #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Subledger" >
     insert into subledger
@@ -100,6 +102,15 @@
       <if test="sl_ym != null" >
         sl_ym,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sl_code != null" >
@@ -150,6 +161,15 @@
       <if test="sl_ym != null" >
         #{sl_ym,jdbcType=INTEGER},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Subledger" >

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

@@ -17,9 +17,6 @@
         <result column="ve_bankcode" property="ve_bankcode" jdbcType="VARCHAR" />
         <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
         <result column="ve_statuscode" property="ve_statuscode" jdbcType="VARCHAR" />
-        <result column="ve_recordid" property="ve_recordid" jdbcType="INTEGER" />
-        <result column="ve_recordname" property="ve_recordname" jdbcType="VARCHAR" />
-        <result column="ve_initdate" property="ve_initdate" jdbcType="TIMESTAMP" />
         <result column="companyId" property="companyId" jdbcType="INTEGER" />
         <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -70,9 +67,6 @@
         <result column="ve_bankcode" property="ve_bankcode" jdbcType="VARCHAR" />
         <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
         <result column="ve_statuscode" property="ve_statuscode" jdbcType="VARCHAR" />
-        <result column="ve_recordid" property="ve_recordid" jdbcType="INTEGER" />
-        <result column="ve_recordname" property="ve_recordname" jdbcType="VARCHAR" />
-        <result column="ve_initdate" property="ve_initdate" jdbcType="TIMESTAMP" />
         <result column="ve_leftamount" property="ve_leftamount" jdbcType="INTEGER" />
         <result column="ve_text1" property="ve_text1" jdbcType="VARCHAR" />
         <result column="ve_text2" property="ve_text2" jdbcType="VARCHAR" />
@@ -107,7 +101,7 @@
     <sql id="Base_Column_List" >
         ve_id, ve_code, ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
-        ve_recordid, ve_recordname, ve_initdate, companyId, updaterId, updateTime, ve_text1,
+        companyId, updaterId, updateTime, ve_text1,
         ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount
     </sql>
     <select id="selectByPrimaryKey" resultMap="VendorResultMapper" parameterType="java.lang.Long" >
@@ -126,23 +120,23 @@
         ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh,
         ve_bankaccount, ve_bankcode, ve_status,
-        ve_statuscode, ve_recordid, ve_recordname,
-        ve_initdate, companyId, updaterId,
+        ve_statuscode, companyId, updaterId,
         updateTime, ve_text1, ve_text2,
         ve_text3, ve_text4, ve_text5,
-        ve_payamount, ve_leftamount, ve_beginym ,ve_preamount
+        ve_payamount, ve_leftamount, ve_beginym ,ve_preamount,
+        creatorId,createTime,creatorName
         )
         values (#{ve_code,jdbcType=VARCHAR}, #{ve_name,jdbcType=VARCHAR},
         #{ve_uu,jdbcType=VARCHAR}, #{ve_type,jdbcType=VARCHAR}, #{ve_begindate,jdbcType=TIMESTAMP},
         #{ve_beginapamount,jdbcType=DOUBLE}, #{ve_beginprepayamount,jdbcType=DOUBLE},
         #{ve_promisedays,jdbcType=DECIMAL}, #{ve_taxrate,jdbcType=DOUBLE}, #{ve_nsrzh,jdbcType=VARCHAR},
         #{ve_bankaccount,jdbcType=VARCHAR}, #{ve_bankcode,jdbcType=VARCHAR}, #{ve_status,jdbcType=VARCHAR},
-        #{ve_statuscode,jdbcType=VARCHAR}, #{ve_recordid,jdbcType=DECIMAL}, #{ve_recordname,jdbcType=VARCHAR},
-        #{ve_initdate,jdbcType=TIMESTAMP}, #{companyId,jdbcType=DECIMAL}, #{updaterId,jdbcType=DECIMAL},
+        #{ve_statuscode,jdbcType=VARCHAR}, #{companyId,jdbcType=DECIMAL}, #{updaterId,jdbcType=DECIMAL},
         #{updateTime,jdbcType=TIMESTAMP}, #{ve_text1,jdbcType=VARCHAR}, #{ve_text2,jdbcType=VARCHAR},
         #{ve_text3,jdbcType=VARCHAR}, #{ve_text4,jdbcType=VARCHAR}, #{ve_text5,jdbcType=VARCHAR},
         #{ve_payamount,jdbcType=DOUBLE}, #{ve_leftamount,jdbcType=DOUBLE}, #{ve_beginym,jdbcType=INTEGER},
-        #{ve_preamount,jdbcType=DOUBLE}
+        #{ve_preamount,jdbcType=DOUBLE},
+        #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR}
         )
     </insert>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Vendor" >
@@ -193,15 +187,6 @@
             <if test="ve_statuscode != null" >
                 ve_statuscode,
             </if>
-            <if test="ve_recordid != null" >
-                ve_recordid,
-            </if>
-            <if test="ve_recordname != null" >
-                ve_recordname,
-            </if>
-            <if test="ve_initdate != null" >
-                ve_initdate,
-            </if>
             <if test="companyId != null" >
                 companyId,
             </if>
@@ -238,6 +223,15 @@
             <if test="ve_preamount !=null" >
                 ve_preamount,
             </if>
+            <if test="creatorId != null" >
+                creatorId,
+            </if>
+            <if test="createTime != null" >
+                createTime,
+            </if>
+            <if test="creatorName != null" >
+                creatorName,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
             <if test="ve_code != null" >
@@ -282,15 +276,6 @@
             <if test="ve_statuscode != null" >
                 #{ve_statuscode,jdbcType=VARCHAR},
             </if>
-            <if test="ve_recordid != null" >
-                #{ve_recordid,jdbcType=DECIMAL},
-            </if>
-            <if test="ve_recordname != null" >
-                #{ve_recordname,jdbcType=VARCHAR},
-            </if>
-            <if test="ve_initdate != null" >
-                #{ve_initdate,jdbcType=TIMESTAMP},
-            </if>
             <if test="companyId != null" >
                 #{companyId,jdbcType=DECIMAL},
             </if>
@@ -327,6 +312,15 @@
             <if test="ve_preamount !=null" >
                 #{ve_preamount,jdbcType=DOUBLE},
             </if>
+            <if test="creatorId != null" >
+                #{creatorId,jdbcType=INTEGER},
+            </if>
+            <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="creatorName != null" >
+                #{creatorName,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Vendor" >
@@ -374,15 +368,6 @@
             <if test="ve_statuscode != null" >
                 ve_statuscode = #{ve_statuscode,jdbcType=VARCHAR},
             </if>
-            <if test="ve_recordid != null" >
-                ve_recordid = #{ve_recordid,jdbcType=DECIMAL},
-            </if>
-            <if test="ve_recordname != null" >
-                ve_recordname = #{ve_recordname,jdbcType=VARCHAR},
-            </if>
-            <if test="ve_initdate != null" >
-                ve_initdate = #{ve_initdate,jdbcType=TIMESTAMP},
-            </if>
             <if test="companyId != null" >
                 companyId = #{companyId,jdbcType=DECIMAL},
             </if>
@@ -438,9 +423,6 @@
         ve_bankcode = #{ve_bankcode,jdbcType=VARCHAR},
         ve_status = #{ve_status,jdbcType=VARCHAR},
         ve_statuscode = #{ve_statuscode,jdbcType=VARCHAR},
-        ve_recordid = #{ve_recordid,jdbcType=DECIMAL},
-        ve_recordname = #{ve_recordname,jdbcType=VARCHAR},
-        ve_initdate = #{ve_initdate,jdbcType=TIMESTAMP},
         companyId = #{companyId,jdbcType=DECIMAL},
         updaterId = #{updaterId,jdbcType=DECIMAL},
         updateTime = #{updateTime,jdbcType=TIMESTAMP},

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

@@ -48,14 +48,16 @@
       vc_name, vc_tel, vc_qq, 
       vc_email, companyId, updaterId, 
       updateTime, vc_text1, vc_text2, 
-      vc_text3, vc_text4, vc_text5, vc_default
+      vc_text3, vc_text4, vc_text5, vc_default,
+    creatorId,createTime,creatorName
       )
     values (#{vc_veid}, #{vc_detno,jdbcType=INTEGER},
       #{vc_name,jdbcType=VARCHAR}, #{vc_tel,jdbcType=VARCHAR}, #{vc_qq,jdbcType=VARCHAR},
       #{vc_email,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},
-      #{vc_default,jdbcType=VARCHAR}
+      #{vc_default,jdbcType=VARCHAR},
+    #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Vendorcontact" >
@@ -106,6 +108,15 @@
       <if test="vc_default != null" >
         vc_default,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="vc_veid != null" >
@@ -153,6 +164,15 @@
       <if test="vc_default != null" >
         #{vc_default,jdbcType=VARCHAR},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Vendorcontact" >
@@ -230,7 +250,8 @@
         vc_name, vc_tel, vc_qq,
         vc_email, companyId, updaterId,
         updateTime, vc_text1, vc_text2,
-        vc_text3, vc_text4, vc_text5, vc_default
+        vc_text3, vc_text4, vc_text5, vc_default,
+        creatorId,createTime,creatorName
         )
         values
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
@@ -240,7 +261,8 @@
       #{item.vc_email,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER},
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.vc_text1,jdbcType=VARCHAR}, #{item.vc_text2,jdbcType=VARCHAR},
       #{item.vc_text3,jdbcType=VARCHAR}, #{item.vc_text4,jdbcType=VARCHAR}, #{item.vc_text5,jdbcType=VARCHAR},
-      #{item.vc_default,jdbcType=VARCHAR}
+      #{item.vc_default,jdbcType=VARCHAR},
+      #{item.creatorId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.creatorName,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>

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

@@ -4,15 +4,12 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Vendorkind">
     <id column="vk_id" jdbcType="INTEGER" property="id" />
     <result column="vk_name" jdbcType="VARCHAR" property="vk_name" />
-    <result column="vk_recordid" jdbcType="INTEGER" property="vk_recordid" />
-    <result column="vk_recorder" jdbcType="VARCHAR" property="vk_recorder" />
-    <result column="vk_date" jdbcType="TIMESTAMP" property="vk_date" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    vk_id, vk_name, vk_recordid, vk_recorder, vk_date, companyId, updaterId, updateTime
+    vk_id, vk_name, companyId, updaterId, updateTime
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select
@@ -28,12 +25,12 @@
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
-    insert into vendorkind (vk_name, vk_recordid,
-    vk_recorder, vk_date, companyId,
-    updaterId, updateTime)
-    values (#{vk_name,jdbcType=VARCHAR}, #{vk_recordid,jdbcType=INTEGER},
-    #{vk_recorder,jdbcType=VARCHAR}, #{vk_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER},
-    #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
+    insert into vendorkind (vk_name, companyId,
+    updaterId, updateTime,
+    creatorId,createTime,creatorName)
+    values (#{vk_name,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
+    #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
+    #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Vendorkind">
     <selectKey resultType="java.lang.Long" keyProperty="id">
@@ -44,15 +41,6 @@
       <if test="vk_name != null">
         vk_name,
       </if>
-      <if test="vk_recordid != null">
-        vk_recordid,
-      </if>
-      <if test="vk_recorder != null">
-        vk_recorder,
-      </if>
-      <if test="vk_date != null">
-        vk_date,
-      </if>
       <if test="companyId != null">
         companyId,
       </if>
@@ -62,20 +50,20 @@
       <if test="updateTime != null">
         updateTime,
       </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="vk_name != null">
         #{vk_name,jdbcType=VARCHAR},
       </if>
-      <if test="vk_recordid != null">
-        #{vk_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="vk_recorder != null">
-        #{vk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="vk_date != null">
-        #{vk_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -85,6 +73,15 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Vendorkind">
@@ -93,15 +90,6 @@
       <if test="vk_name != null">
         vk_name = #{vk_name,jdbcType=VARCHAR},
       </if>
-      <if test="vk_recordid != null">
-        vk_recordid = #{vk_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="vk_recorder != null">
-        vk_recorder = #{vk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="vk_date != null">
-        vk_date = #{vk_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -117,9 +105,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Vendorkind">
     update vendorkind
     set vk_name = #{vk_name,jdbcType=VARCHAR},
-    vk_recordid = #{vk_recordid,jdbcType=INTEGER},
-    vk_recorder = #{vk_recorder,jdbcType=VARCHAR},
-    vk_date = #{vk_date,jdbcType=TIMESTAMP},
     companyId = #{companyId,jdbcType=INTEGER},
     updaterId = #{updaterId,jdbcType=INTEGER},
     updateTime = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -8,8 +8,6 @@
         <result column="wh_description" property="wh_description" jdbcType="VARCHAR" />
         <result column="wh_statuscode" property="wh_statuscode" jdbcType="VARCHAR" />
         <result column="wh_status" property="wh_status" jdbcType="TIMESTAMP" />
-        <result column="wh_recordid" property="wh_recorderid" jdbcType="INTEGER" />
-        <result column="wh_recorder" property="wh_recorder" jdbcType="INTEGER" />
         <result column="wh_date" property="wh_date" jdbcType="INTEGER" />
         <result column="companyId" property="companyId" jdbcType="INTEGER" />
         <result column="updatemanid" property="updaterId" jdbcType="INTEGER" />
@@ -96,8 +94,7 @@
         </where>
     </sql>
     <sql id="Base_Column_List">
-        wh_id, wh_code, wh_type, wh_description, wh_statuscode, wh_status, wh_recorderid,
-        wh_recorder, wh_date, companyId, updaterId, updateTime, wh_text1, wh_text2, wh_text3,
+        wh_id, wh_code, wh_type, wh_description, wh_statuscode, wh_status, wh_date, companyId, updaterId, updateTime, wh_text1, wh_text2, wh_text3,
         wh_text4, wh_text5
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="WarehouseResultMapper">
@@ -116,17 +113,18 @@
             SELECT LAST_INSERT_ID() AS ID
         </selectKey>
         insert into warehouse (wh_code, wh_type,
-        wh_description, wh_statuscode, wh_status,
-        wh_recorderid, wh_recorder, wh_date,
+        wh_description, wh_statuscode, wh_status, wh_date,
         companyId, updaterId, updateTime,
         wh_text1, wh_text2, wh_text3,
-        wh_text4, wh_text5)
+        wh_text4, wh_text5,
+        creatorId,createTime,creatorName)
         values (#{wh_code,jdbcType=VARCHAR}, #{wh_type,jdbcType=VARCHAR},
         #{wh_description,jdbcType=VARCHAR}, #{wh_statuscode,jdbcType=VARCHAR}, #{wh_status,jdbcType=VARCHAR},
-        #{wh_recorderid,jdbcType=VARCHAR}, #{wh_recorder,jdbcType=VARCHAR}, #{wh_date,jdbcType=TIMESTAMP},
+         #{wh_date,jdbcType=TIMESTAMP},
         #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
         #{wh_text1,jdbcType=VARCHAR}, #{wh_text2,jdbcType=VARCHAR}, #{wh_text3,jdbcType=VARCHAR},
-        #{wh_text4,jdbcType=VARCHAR}, #{wh_text5,jdbcType=VARCHAR})
+        #{wh_text4,jdbcType=VARCHAR}, #{wh_text5,jdbcType=VARCHAR},
+        #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Warehouse">
         <selectKey resultType="java.lang.Long" keyProperty="id">
@@ -149,12 +147,6 @@
             <if test="wh_status != null">
                 wh_status,
             </if>
-            <if test="wh_recorderid != null">
-                wh_recorderid,
-            </if>
-            <if test="wh_recorder != null">
-                wh_recorder,
-            </if>
             <if test="wh_date != null">
                 wh_date,
             </if>
@@ -182,6 +174,15 @@
             <if test="wh_text5 != null">
                 wh_text5,
             </if>
+            <if test="creatorId != null" >
+                creatorId,
+            </if>
+            <if test="createTime != null" >
+                createTime,
+            </if>
+            <if test="creatorName != null" >
+                creatorName,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="wh_code != null">
@@ -199,12 +200,6 @@
             <if test="wh_status != null">
                 #{wh_status,jdbcType=VARCHAR},
             </if>
-            <if test="wh_recorderid != null">
-                #{wh_recorderid,jdbcType=VARCHAR},
-            </if>
-            <if test="wh_recorder != null">
-                #{wh_recorder,jdbcType=VARCHAR},
-            </if>
             <if test="wh_date != null">
                 #{wh_date,jdbcType=TIMESTAMP},
             </if>
@@ -232,6 +227,15 @@
             <if test="wh_text5 != null">
                 #{wh_text5,jdbcType=VARCHAR},
             </if>
+            <if test="creatorId != null" >
+                #{creatorId,jdbcType=INTEGER},
+            </if>
+            <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="creatorName != null" >
+                #{creatorName,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Warehouse">
@@ -252,12 +256,6 @@
             <if test="wh_status != null">
                 wh_status = #{wh_status,jdbcType=VARCHAR},
             </if>
-            <if test="wh_recorderid != null">
-                wh_recorderid = #{wh_recorderid,jdbcType=VARCHAR},
-            </if>
-            <if test="wh_recorder != null">
-                wh_recorder = #{wh_recorder,jdbcType=VARCHAR},
-            </if>
             <if test="wh_date != null">
                 wh_date = #{wh_date,jdbcType=TIMESTAMP},
             </if>
@@ -295,8 +293,6 @@
         wh_description = #{wh_description,jdbcType=VARCHAR},
         wh_statuscode = #{wh_statuscode,jdbcType=VARCHAR},
         wh_status = #{wh_status,jdbcType=VARCHAR},
-        wh_recorderid = #{wh_recorderid,jdbcType=VARCHAR},
-        wh_recorder = #{wh_recorder,jdbcType=VARCHAR},
         wh_date = #{wh_date,jdbcType=TIMESTAMP},
         companyId = #{companyId,jdbcType=INTEGER},
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -371,5 +367,8 @@
         select count(1) from productwh where pw_whid = #{id} and pw_onhand > 0
         and companyId = #{companyId}
     </select>
+    <select id="deleteCheckProdIO" resultType="int">
+        SELECT COUNT(*) FROM PRODIODETAIL WHERE pd_whid = #{id} and companyid = #{companyId}
+    </select>
 </mapper>
 

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

@@ -52,12 +52,6 @@ public class VerificationDTO extends  CommonBaseDTO implements Serializable {
 
     private Double vc_amount2;
 
-    private Integer vc_recorderid;
-
-    private String vc_recorder;
-
-    private Date vc_recorddate;
-
     private String vc_status;
 
     private String vc_statuscode;
@@ -218,30 +212,6 @@ public class VerificationDTO extends  CommonBaseDTO implements Serializable {
         this.vc_amount2 = vc_amount2;
     }
 
-    public Integer getVc_recorderid() {
-        return vc_recorderid;
-    }
-
-    public void setVc_recorderid(Integer vc_recorderid) {
-        this.vc_recorderid = vc_recorderid;
-    }
-
-    public String getVc_recorder() {
-        return vc_recorder;
-    }
-
-    public void setVc_recorder(String vc_recorder) {
-        this.vc_recorder = vc_recorder == null ? null : vc_recorder.trim();
-    }
-
-    public Date getVc_recorddate() {
-        return vc_recorddate;
-    }
-
-    public void setVc_recorddate(Date vc_recorddate) {
-        this.vc_recorddate = vc_recorddate;
-    }
-
     public String getVc_status() {
         return vc_status;
     }

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

@@ -49,12 +49,6 @@ public class VerificationListDTO implements Serializable {
 
     private Double vc_amount2;
 
-    private Integer vc_recorderid;
-
-    private String vc_recorder;
-
-    private Date vc_recorddate;
-
     private Integer vc_status;
 
     private BigDecimal vc_statuscode;

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.money.po.AcountbalanceView;
 import com.usoftchina.saas.money.po.CustomerCheckView;
+import com.usoftchina.saas.money.po.VendOrCustAdd;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,4 +10,6 @@ import java.util.List;
 public interface CustomerCheckViewMapper {
     List<CustomerCheckView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
     String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
+    VendOrCustAdd selectCustAdd(@Param("sl_custid") Integer sl_vendid, @Param("sl_ym") Integer sl_ym, @Param("companyId") Long companyId);
+    Integer getId(@Param("code") String code, @Param("companyId") Long companyId);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.money.po.Fundtransfer;
 import com.usoftchina.saas.money.po.Othreceipts;
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +31,8 @@ public interface FundtransferMapper extends CommonBaseMapper<Fundtransfer> {
 
     List<Fundtransfer> selectFundtransferBycondition(@Param("con") String con, @Param("companyId") Long companyId);
     List<Fundtransfer> selectFundtransferListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+
+    String validateBatchUnAudit(List<DocBaseDTO> baseDTOs);
+
+    String validateAudit(List<DocBaseDTO> baseDTOs);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.money.po.Othreceipts;
 import com.usoftchina.saas.money.po.Recbalance;
 import com.usoftchina.saas.page.PageRequest;
@@ -31,4 +32,8 @@ public interface OthreceiptsMapper extends CommonBaseMapper<Othreceipts> {
 
     List<Othreceipts> selectOthreceiptsBycondition(@Param("con") String con, @Param("companyId") Long companyId);
     List<Othreceipts> selectOthreceiptsListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+
+    String validateBatchUnAudit(List<DocBaseDTO> baseDTOs);
+
+    String validateAudit(List<DocBaseDTO> baseDTOs);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.money.po.Othreceipts;
 import com.usoftchina.saas.money.po.Othspendings;
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +31,8 @@ public interface OthspendingsMapper extends CommonBaseMapper<Othspendings> {
 
     List<Othspendings> selectOthspendingsBycondition(@Param("con") String con, @Param("companyId") Long companyId);
     List<Othspendings> selectOthspendingsListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+
+    String validateBatchUnAudit(List<DocBaseDTO> baseDTOs);
+
+    String validateAudit(List<DocBaseDTO> baseDTOs);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.money.po.Bankinformation;
 import com.usoftchina.saas.money.po.Paybalance;
 import com.usoftchina.saas.money.po.Recbalance;
@@ -45,4 +46,8 @@ public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
     void updateBankAmount(@Param("bk_thisamount") Double bk_thisamount, @Param("id") Integer id);
 
     int checkStatus(@Param("id") Long id);
+
+    String validateBatchUnAudit(List<DocBaseDTO> baseDTOs);
+
+    String validateAudit(List<DocBaseDTO> baseDTOs);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.*;
 
@@ -52,4 +53,8 @@ public interface RecbalanceMapper extends CommonBaseMapper<Recbalance> {
     int updateCustomerByPrimaryKeySelective(Customer record);
 
     int checkStatus(@Param("id") Long id);
+
+    String validateBatchUnAudit(List<DocBaseDTO> baseDTOs);
+
+    String validateAudit(List<DocBaseDTO> baseDTOs);
 }

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

@@ -1,10 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
-import com.usoftchina.saas.money.po.Recbalance;
 import com.usoftchina.saas.money.po.Subledger;
-import com.usoftchina.saas.money.po.VendorAdd;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
@@ -27,5 +24,4 @@ public interface SubledgerMapper {
     int updateByPrimaryKey(Subledger record);
 
     List<Subledger> selectSubledgerBycondition(@Param("con") String con, @Param("companyId") Long companyId);
-    VendorAdd selectAdd(@Param("sl_vendid") Integer sl_vendid, @Param("sl_ym") Integer sl_ym);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.money.po.VendorAcountView;
+import com.usoftchina.saas.money.po.VendOrCustAdd;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -8,4 +9,6 @@ import java.util.List;
 public interface VendorAcountViewMapper {
     List<VendorAcountView> selectByCondition(@Param("con")String con, @Param("companyId")Long companyId);
     String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
+    VendOrCustAdd selectVendAdd(@Param("sl_vendid") Integer sl_vendid, @Param("sl_ym") Integer sl_ym, @Param("companyId") Long companyId);
+    Integer getId(@Param("code") String code, @Param("companyId") Long companyId);
 }

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

@@ -23,12 +23,6 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
 
     private String bk_statuscode;
 
-    private Integer bk_recorderid;
-
-    private String bk_recorder;
-
-    private Date bk_recorddate;
-
     private Integer bk_ym;
 
     private String bk_text1;
@@ -111,30 +105,6 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
         this.bk_statuscode = bk_statuscode;
     }
 
-    public Integer getBk_recorderid() {
-        return bk_recorderid;
-    }
-
-    public void setBk_recorderid(Integer bk_recorderid) {
-        this.bk_recorderid = bk_recorderid;
-    }
-
-    public String getBk_recorder() {
-        return bk_recorder;
-    }
-
-    public void setBk_recorder(String bk_recorder) {
-        this.bk_recorder = bk_recorder;
-    }
-
-    public Date getBk_recorddate() {
-        return bk_recorddate;
-    }
-
-    public void setBk_recorddate(Date bk_recorddate) {
-        this.bk_recorddate = bk_recorddate;
-    }
-
     public Integer getBk_ym() {
         return bk_ym;
     }

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

@@ -39,12 +39,6 @@ public class Customer extends CommonBaseEntity implements Serializable {
 
     private String cu_statuscode;
 
-    private Integer cu_recordmanid;
-
-    private String cu_recordman;
-
-    private Date cu_recorddate;
-
     private String cu_text1;
 
     private String cu_text2;
@@ -181,30 +175,6 @@ public class Customer extends CommonBaseEntity implements Serializable {
         this.cu_statuscode = cu_statuscode;
     }
 
-    public Integer getCu_recordmanid() {
-        return cu_recordmanid;
-    }
-
-    public void setCu_recordmanid(Integer cu_recordmanid) {
-        this.cu_recordmanid = cu_recordmanid;
-    }
-
-    public String getCu_recordman() {
-        return cu_recordman;
-    }
-
-    public void setCu_recordman(String cu_recordman) {
-        this.cu_recordman = cu_recordman;
-    }
-
-    public Date getCu_recorddate() {
-        return cu_recorddate;
-    }
-
-    public void setCu_recorddate(Date cu_recorddate) {
-        this.cu_recorddate = cu_recorddate;
-    }
-
     public String getCu_text1() {
         return cu_text1;
     }

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

@@ -35,6 +35,16 @@ public class CustomerCheckView {
 
     private Double pd_nettotal;
 
+    private Long companyId;
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
     public String getPi_inoutno() {
         return pi_inoutno;
     }

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

@@ -11,12 +11,6 @@ public class Fundtransfer extends CommonBaseEntity implements Serializable {
 
     private Date ft_date;
 
-    private Integer ft_recorderid;
-
-    private String ft_recorder;
-
-    private Date ft_recorddate;
-
     private String ft_status;
 
     private String ft_statuscode;
@@ -91,30 +85,6 @@ public class Fundtransfer extends CommonBaseEntity implements Serializable {
         this.ft_date = ft_date;
     }
 
-    public Integer getFt_recorderid() {
-        return ft_recorderid;
-    }
-
-    public void setFt_recorderid(Integer ft_recorderid) {
-        this.ft_recorderid = ft_recorderid;
-    }
-
-    public String getFt_recorder() {
-        return ft_recorder;
-    }
-
-    public void setFt_recorder(String ft_recorder) {
-        this.ft_recorder = ft_recorder;
-    }
-
-    public Date getFt_recorddate() {
-        return ft_recorddate;
-    }
-
-    public void setFt_recorddate(Date ft_recorddate) {
-        this.ft_recorddate = ft_recorddate;
-    }
-
     public String getFt_status() {
         return ft_status;
     }

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

@@ -25,12 +25,6 @@ public class Othreceipts extends CommonBaseEntity implements Serializable {
 
     private Double or_amount;
 
-    private Integer or_recorderid;
-
-    private String or_recorder;
-
-    private Date or_recorddate;
-
     private String or_status;
 
     private String or_statuscode;
@@ -157,30 +151,6 @@ public class Othreceipts extends CommonBaseEntity implements Serializable {
         this.or_amount = or_amount;
     }
 
-    public Integer getOr_recorderid() {
-        return or_recorderid;
-    }
-
-    public void setOr_recorderid(Integer or_recorderid) {
-        this.or_recorderid = or_recorderid;
-    }
-
-    public String getOr_recorder() {
-        return or_recorder;
-    }
-
-    public void setOr_recorder(String or_recorder) {
-        this.or_recorder = or_recorder;
-    }
-
-    public Date getOr_recorddate() {
-        return or_recorddate;
-    }
-
-    public void setOr_recorddate(Date or_recorddate) {
-        this.or_recorddate = or_recorddate;
-    }
-
     public String getOr_status() {
         return or_status;
     }
@@ -289,9 +259,6 @@ public class Othreceipts extends CommonBaseEntity implements Serializable {
                 ", 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 + '\'' +

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

@@ -25,12 +25,6 @@ public class Othspendings extends CommonBaseEntity implements Serializable {
 
     private Double os_amount;
 
-    private Integer os_recorderid;
-
-    private String os_recorder;
-
-    private Date os_recorddate;
-
     private String os_status;
 
     private String os_statuscode;
@@ -148,30 +142,6 @@ public class Othspendings extends CommonBaseEntity implements Serializable {
         this.os_amount = os_amount;
     }
 
-    public Integer getOs_recorderid() {
-        return os_recorderid;
-    }
-
-    public void setOs_recorderid(Integer os_recorderid) {
-        this.os_recorderid = os_recorderid;
-    }
-
-    public String getOs_recorder() {
-        return os_recorder;
-    }
-
-    public void setOs_recorder(String os_recorder) {
-        this.os_recorder = os_recorder;
-    }
-
-    public Date getOs_recorddate() {
-        return os_recorddate;
-    }
-
-    public void setOs_recorddate(Date os_recorddate) {
-        this.os_recorddate = os_recorddate;
-    }
-
     public String getOs_status() {
         return os_status;
     }

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

@@ -38,12 +38,6 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
 
     private Double pb_havebalance;
 
-    private Integer pb_recorderid;
-
-    private String pb_recorder;
-
-    private Date pb_recorddate;
-
     private String pb_status;
 
     private String pb_statuscode;
@@ -207,29 +201,6 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
         this.pb_havebalance = pb_havebalance;
     }
 
-    public Integer getPb_recorderid() {
-        return pb_recorderid;
-    }
-
-    public void setPb_recorderid(Integer pb_recorderid) {
-        this.pb_recorderid = pb_recorderid;
-    }
-
-    public String getPb_recorder() {
-        return pb_recorder;
-    }
-
-    public void setPb_recorder(String pb_recorder) {
-        this.pb_recorder = pb_recorder == null ? null : pb_recorder.trim();
-    }
-
-    public Date getPb_recorddate() {
-        return pb_recorddate;
-    }
-
-    public void setPb_recorddate(Date pb_recorddate) {
-        this.pb_recorddate = pb_recorddate;
-    }
 
     public String getPb_status() {
         return pb_status;

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

@@ -940,196 +940,6 @@ public class PaybalanceExample {
             return (Criteria) this;
         }
 
-        public Criteria andPb_recorderidIsNull() {
-            addCriterion("pb_recorderid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidIsNotNull() {
-            addCriterion("pb_recorderid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidEqualTo(Integer value) {
-            addCriterion("pb_recorderid =", value, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidNotEqualTo(Integer value) {
-            addCriterion("pb_recorderid <>", value, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidGreaterThan(Integer value) {
-            addCriterion("pb_recorderid >", value, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pb_recorderid >=", value, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidLessThan(Integer value) {
-            addCriterion("pb_recorderid <", value, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidLessThanOrEqualTo(Integer value) {
-            addCriterion("pb_recorderid <=", value, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidIn(List<Integer> values) {
-            addCriterion("pb_recorderid in", values, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidNotIn(List<Integer> values) {
-            addCriterion("pb_recorderid not in", values, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidBetween(Integer value1, Integer value2) {
-            addCriterion("pb_recorderid between", value1, value2, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pb_recorderid not between", value1, value2, "pb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderIsNull() {
-            addCriterion("pb_recorder is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderIsNotNull() {
-            addCriterion("pb_recorder is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderEqualTo(String value) {
-            addCriterion("pb_recorder =", value, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderNotEqualTo(String value) {
-            addCriterion("pb_recorder <>", value, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderGreaterThan(String value) {
-            addCriterion("pb_recorder >", value, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderGreaterThanOrEqualTo(String value) {
-            addCriterion("pb_recorder >=", value, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderLessThan(String value) {
-            addCriterion("pb_recorder <", value, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderLessThanOrEqualTo(String value) {
-            addCriterion("pb_recorder <=", value, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderLike(String value) {
-            addCriterion("pb_recorder like", value, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderNotLike(String value) {
-            addCriterion("pb_recorder not like", value, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderIn(List<String> values) {
-            addCriterion("pb_recorder in", values, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderNotIn(List<String> values) {
-            addCriterion("pb_recorder not in", values, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderBetween(String value1, String value2) {
-            addCriterion("pb_recorder between", value1, value2, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorderNotBetween(String value1, String value2) {
-            addCriterion("pb_recorder not between", value1, value2, "pb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateIsNull() {
-            addCriterion("pb_recorddate is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateIsNotNull() {
-            addCriterion("pb_recorddate is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateEqualTo(Date value) {
-            addCriterion("pb_recorddate =", value, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateNotEqualTo(Date value) {
-            addCriterion("pb_recorddate <>", value, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateGreaterThan(Date value) {
-            addCriterion("pb_recorddate >", value, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateGreaterThanOrEqualTo(Date value) {
-            addCriterion("pb_recorddate >=", value, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateLessThan(Date value) {
-            addCriterion("pb_recorddate <", value, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateLessThanOrEqualTo(Date value) {
-            addCriterion("pb_recorddate <=", value, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateIn(List<Date> values) {
-            addCriterion("pb_recorddate in", values, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateNotIn(List<Date> values) {
-            addCriterion("pb_recorddate not in", values, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateBetween(Date value1, Date value2) {
-            addCriterion("pb_recorddate between", value1, value2, "pb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andPb_recorddateNotBetween(Date value1, Date value2) {
-            addCriterion("pb_recorddate not between", value1, value2, "pb_recorddate");
-            return (Criteria) this;
-        }
-
         public Criteria andPb_statusIsNull() {
             addCriterion("pb_status is null");
             return (Criteria) this;

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

@@ -37,12 +37,6 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
 
     private Double rb_havebalance;
 
-    private Integer rb_recorderid;
-
-    private String rb_recorder;
-
-    private Date rb_recorddate;
-
     private String rb_status;
 
     private String rb_statuscode;
@@ -207,30 +201,6 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
         this.rb_havebalance = rb_havebalance;
     }
 
-    public Integer getRb_recorderid() {
-        return rb_recorderid;
-    }
-
-    public void setRb_recorderid(Integer rb_recorderid) {
-        this.rb_recorderid = rb_recorderid;
-    }
-
-    public String getRb_recorder() {
-        return rb_recorder;
-    }
-
-    public void setRb_recorder(String rb_recorder) {
-        this.rb_recorder = rb_recorder == null ? null : rb_recorder.trim();
-    }
-
-    public Date getRb_recorddate() {
-        return rb_recorddate;
-    }
-
-    public void setRb_recorddate(Date rb_recorddate) {
-        this.rb_recorddate = rb_recorddate;
-    }
-
     public String getRb_status() {
         return rb_status;
     }

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

@@ -939,196 +939,6 @@ public class RecbalanceExample {
             return (Criteria) this;
         }
 
-        public Criteria andRb_recorderidIsNull() {
-            addCriterion("rb_recorderid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidIsNotNull() {
-            addCriterion("rb_recorderid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidEqualTo(Integer value) {
-            addCriterion("rb_recorderid =", value, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidNotEqualTo(Integer value) {
-            addCriterion("rb_recorderid <>", value, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidGreaterThan(Integer value) {
-            addCriterion("rb_recorderid >", value, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("rb_recorderid >=", value, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidLessThan(Integer value) {
-            addCriterion("rb_recorderid <", value, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidLessThanOrEqualTo(Integer value) {
-            addCriterion("rb_recorderid <=", value, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidIn(List<Integer> values) {
-            addCriterion("rb_recorderid in", values, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidNotIn(List<Integer> values) {
-            addCriterion("rb_recorderid not in", values, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidBetween(Integer value1, Integer value2) {
-            addCriterion("rb_recorderid between", value1, value2, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderidNotBetween(Integer value1, Integer value2) {
-            addCriterion("rb_recorderid not between", value1, value2, "rb_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderIsNull() {
-            addCriterion("rb_recorder is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderIsNotNull() {
-            addCriterion("rb_recorder is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderEqualTo(String value) {
-            addCriterion("rb_recorder =", value, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderNotEqualTo(String value) {
-            addCriterion("rb_recorder <>", value, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderGreaterThan(String value) {
-            addCriterion("rb_recorder >", value, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderGreaterThanOrEqualTo(String value) {
-            addCriterion("rb_recorder >=", value, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderLessThan(String value) {
-            addCriterion("rb_recorder <", value, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderLessThanOrEqualTo(String value) {
-            addCriterion("rb_recorder <=", value, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderLike(String value) {
-            addCriterion("rb_recorder like", value, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderNotLike(String value) {
-            addCriterion("rb_recorder not like", value, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderIn(List<String> values) {
-            addCriterion("rb_recorder in", values, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderNotIn(List<String> values) {
-            addCriterion("rb_recorder not in", values, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderBetween(String value1, String value2) {
-            addCriterion("rb_recorder between", value1, value2, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorderNotBetween(String value1, String value2) {
-            addCriterion("rb_recorder not between", value1, value2, "rb_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateIsNull() {
-            addCriterion("rb_recorddate is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateIsNotNull() {
-            addCriterion("rb_recorddate is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateEqualTo(Date value) {
-            addCriterion("rb_recorddate =", value, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateNotEqualTo(Date value) {
-            addCriterion("rb_recorddate <>", value, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateGreaterThan(Date value) {
-            addCriterion("rb_recorddate >", value, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateGreaterThanOrEqualTo(Date value) {
-            addCriterion("rb_recorddate >=", value, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateLessThan(Date value) {
-            addCriterion("rb_recorddate <", value, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateLessThanOrEqualTo(Date value) {
-            addCriterion("rb_recorddate <=", value, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateIn(List<Date> values) {
-            addCriterion("rb_recorddate in", values, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateNotIn(List<Date> values) {
-            addCriterion("rb_recorddate not in", values, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateBetween(Date value1, Date value2) {
-            addCriterion("rb_recorddate between", value1, value2, "rb_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andRb_recorddateNotBetween(Date value1, Date value2) {
-            addCriterion("rb_recorddate not between", value1, value2, "rb_recorddate");
-            return (Criteria) this;
-        }
-
         public Criteria andRb_statusIsNull() {
             addCriterion("rb_status is null");
             return (Criteria) this;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendorAdd.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendOrCustAdd.java

@@ -4,7 +4,7 @@ package com.usoftchina.saas.money.po;
  * @author heqw
  * @date 2018/11/23 11:44
  **/
-public class VendorAdd {
+public class VendOrCustAdd {
     private Double beginamount;
     private Double nowamount;
     private Double nowpay;

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

@@ -68,18 +68,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
      * 状态码
      */
     private String ve_statuscode;
-    /**
-     * 录入人ID
-     */
-    private Long ve_recordid;
-    /**
-     * 录入人
-     */
-    private String ve_recordname;
-    /**
-     * 建立日期
-     */
-    private Date ve_initdate;
     /**
      * 自定义字段
      */
@@ -245,30 +233,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
         this.ve_statuscode = ve_statuscode;
     }
 
-    public Long getVe_recordid() {
-        return ve_recordid;
-    }
-
-    public void setVe_recordid(Long ve_recordid) {
-        this.ve_recordid = ve_recordid;
-    }
-
-    public String getVe_recordname() {
-        return ve_recordname;
-    }
-
-    public void setVe_recordname(String ve_recordname) {
-        this.ve_recordname = ve_recordname;
-    }
-
-    public Date getVe_initdate() {
-        return ve_initdate;
-    }
-
-    public void setVe_initdate(Date ve_initdate) {
-        this.ve_initdate = ve_initdate;
-    }
-
     public String getVe_text1() {
         return ve_text1;
     }

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

@@ -36,6 +36,15 @@ public class VendorAcountView {
     private Double pd_nettotal;
     private Integer companyId;
     private String pd_remark;
+    private int ym;
+
+    public int getYm() {
+        return ym;
+    }
+
+    public void setYm(int ym) {
+        this.ym = ym;
+    }
 
     public String getPd_remark() {
         return pd_remark;

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

@@ -49,12 +49,6 @@ public class Verification extends CommonBaseEntity implements Serializable {
 
     private Double vc_amount2;
 
-    private Integer vc_recorderid;
-
-    private String vc_recorder;
-
-    private Date vc_recorddate;
-
     private String vc_status;
 
     private String vc_statuscode;
@@ -215,30 +209,6 @@ public class Verification extends CommonBaseEntity implements Serializable {
         this.vc_amount2 = vc_amount2;
     }
 
-    public Integer getVc_recorderid() {
-        return vc_recorderid;
-    }
-
-    public void setVc_recorderid(Integer vc_recorderid) {
-        this.vc_recorderid = vc_recorderid;
-    }
-
-    public String getVc_recorder() {
-        return vc_recorder;
-    }
-
-    public void setVc_recorder(String vc_recorder) {
-        this.vc_recorder = vc_recorder == null ? null : vc_recorder.trim();
-    }
-
-    public Date getVc_recorddate() {
-        return vc_recorddate;
-    }
-
-    public void setVc_recorddate(Date vc_recorddate) {
-        this.vc_recorddate = vc_recorddate;
-    }
-
     public String getVc_status() {
         return vc_status;
     }

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

@@ -1290,196 +1290,6 @@ public class VerificationExample {
             return (Criteria) this;
         }
 
-        public Criteria andVc_recorderidIsNull() {
-            addCriterion("vc_recorderid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidIsNotNull() {
-            addCriterion("vc_recorderid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidEqualTo(Integer value) {
-            addCriterion("vc_recorderid =", value, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidNotEqualTo(Integer value) {
-            addCriterion("vc_recorderid <>", value, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidGreaterThan(Integer value) {
-            addCriterion("vc_recorderid >", value, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("vc_recorderid >=", value, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidLessThan(Integer value) {
-            addCriterion("vc_recorderid <", value, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidLessThanOrEqualTo(Integer value) {
-            addCriterion("vc_recorderid <=", value, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidIn(List<Integer> values) {
-            addCriterion("vc_recorderid in", values, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidNotIn(List<Integer> values) {
-            addCriterion("vc_recorderid not in", values, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidBetween(Integer value1, Integer value2) {
-            addCriterion("vc_recorderid between", value1, value2, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderidNotBetween(Integer value1, Integer value2) {
-            addCriterion("vc_recorderid not between", value1, value2, "vc_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderIsNull() {
-            addCriterion("vc_recorder is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderIsNotNull() {
-            addCriterion("vc_recorder is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderEqualTo(String value) {
-            addCriterion("vc_recorder =", value, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderNotEqualTo(String value) {
-            addCriterion("vc_recorder <>", value, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderGreaterThan(String value) {
-            addCriterion("vc_recorder >", value, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderGreaterThanOrEqualTo(String value) {
-            addCriterion("vc_recorder >=", value, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderLessThan(String value) {
-            addCriterion("vc_recorder <", value, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderLessThanOrEqualTo(String value) {
-            addCriterion("vc_recorder <=", value, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderLike(String value) {
-            addCriterion("vc_recorder like", value, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderNotLike(String value) {
-            addCriterion("vc_recorder not like", value, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderIn(List<String> values) {
-            addCriterion("vc_recorder in", values, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderNotIn(List<String> values) {
-            addCriterion("vc_recorder not in", values, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderBetween(String value1, String value2) {
-            addCriterion("vc_recorder between", value1, value2, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorderNotBetween(String value1, String value2) {
-            addCriterion("vc_recorder not between", value1, value2, "vc_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateIsNull() {
-            addCriterion("vc_recorddate is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateIsNotNull() {
-            addCriterion("vc_recorddate is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateEqualTo(Date value) {
-            addCriterion("vc_recorddate =", value, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateNotEqualTo(Date value) {
-            addCriterion("vc_recorddate <>", value, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateGreaterThan(Date value) {
-            addCriterion("vc_recorddate >", value, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateGreaterThanOrEqualTo(Date value) {
-            addCriterion("vc_recorddate >=", value, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateLessThan(Date value) {
-            addCriterion("vc_recorddate <", value, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateLessThanOrEqualTo(Date value) {
-            addCriterion("vc_recorddate <=", value, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateIn(List<Date> values) {
-            addCriterion("vc_recorddate in", values, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateNotIn(List<Date> values) {
-            addCriterion("vc_recorddate not in", values, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateBetween(Date value1, Date value2) {
-            addCriterion("vc_recorddate between", value1, value2, "vc_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andVc_recorddateNotBetween(Date value1, Date value2) {
-            addCriterion("vc_recorddate not between", value1, value2, "vc_recorddate");
-            return (Criteria) this;
-        }
-
         public Criteria andVc_statusIsNull() {
             addCriterion("vc_status is null");
             return (Criteria) this;

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

@@ -49,12 +49,6 @@ public class VerificationList extends CommonBaseEntity implements Serializable {
 
     private Double vc_amount2;
 
-    private Integer vc_recorderid;
-
-    private String vc_recorder;
-
-    private Date vc_recorddate;
-
     private String vc_status;
 
     private String vc_statuscode;

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

@@ -72,7 +72,6 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             }
         }else {
             fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
-            fundtransfer.setFt_recorder(BaseContextHolder.getUserName());
             fundtransfer.setCreatorName(BaseContextHolder.getUserName());
             fundtransferMapper.insertSelective(fundtransfer);
             id = fundtransfer.getId();
@@ -283,23 +282,32 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
 
     @Override
     public void fundtransferBatchAudit(BatchDealBaseDTO baseDTO){
+        String validate = fundtransferMapper.validateAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
+
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Fundtransfer fundtransfer = new Fundtransfer();
             fundtransfer.setId(Long.valueOf(docBaseDTO.getId()));
-            fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
-            fundtransfer.setFt_statuscode(Status.AUDITED.name());
             Fundtran fundtran = this.select(Math.toIntExact(fundtransfer.getId()));
-//            this.changBankUntil(fundtran);
             this.audit(fundtran);
-//            fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
         }
     }
 
     @Override
     public void fundtransferBatchUnAudit(BatchDealBaseDTO baseDTO){
         Iterator isList = baseDTO.getBaseDTOs().iterator();
+
+        String validate = fundtransferMapper.validateBatchUnAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
+
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));

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

@@ -6,12 +6,16 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.money.mapper.*;
+import com.usoftchina.saas.money.po.CustomerCheckView;
+import com.usoftchina.saas.money.po.VendorAcountView;
+import com.usoftchina.saas.money.po.VendOrCustAdd;
 import com.usoftchina.saas.money.service.MoneyReportService;
 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.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -94,10 +98,35 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
 
         String res = null;
+        VendOrCustAdd vendOrCustAdd = new VendOrCustAdd();
+        List<Map<String, Double>> list1 = new ArrayList<>();
         if ("Supplier".equals(type)) {
             list = vendorAcountViewMapper.selectByCondition(con, companyId);
-            if (!StringUtils.isEmpty(calculateFieldsSql)) {
-                res = vendorAcountViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+            if (list.size() >0) {
+                VendorAcountView vendorAcountView = (VendorAcountView) list.get(0);
+                Integer vid = new Integer(0);
+                vid = vendorAcountViewMapper.getId(vendorAcountView.getPi_vendcode(), Long.valueOf(vendorAcountView.getCompanyId()));
+                Integer ym = Integer.valueOf(req.getYm());
+                vendOrCustAdd = vendorAcountViewMapper.selectVendAdd(vid, ym, Long.valueOf(vendorAcountView.getCompanyId()));
+                vendOrCustAdd.setNowbalance((vendOrCustAdd.getBeginamount() == null ? new Double(0) : vendOrCustAdd.getBeginamount())
+                        + (vendOrCustAdd.getNowamount() == null ? new Double(0) : vendOrCustAdd.getNowamount())
+                        - (vendOrCustAdd.getNowpay() == null ? new Double(0) : vendOrCustAdd.getNowpay()));
+                //封装成list
+                Map<String, Double> map1 = new HashMap<>();
+                map1.put("beginamount", vendOrCustAdd.getBeginamount());
+                list1.add(map1);
+
+                Map<String, Double> map2 = new HashMap<>();
+                map2.put("nowamount", vendOrCustAdd.getNowamount());
+                list1.add(map2);
+
+                Map<String, Double> map3 = new HashMap<>();
+                map3.put("nowpay", vendOrCustAdd.getNowpay());
+                list1.add(map3);
+
+                Map<String, Double> map4 = new HashMap<>();
+                map4.put("nowbalance", vendOrCustAdd.getNowbalance());
+                list1.add(map4);
             }
         } else if("payDetail".equals(type)){
             list = paydetailViewMapper.selectByCondition(con, companyId);
@@ -116,8 +145,35 @@ public class MoneyReportServiceImpl implements MoneyReportService {
             }
         }else if ("customercheck".equals(type)){
             list = customerCheckViewMapper.selectByCondition(con, companyId);
-            if (!StringUtils.isEmpty(calculateFieldsSql)) {
-                res = customerCheckViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+//            if (!StringUtils.isEmpty(calculateFieldsSql)) {
+//                res = customerCheckViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+//            }
+            if (list.size() >0) {
+                CustomerCheckView customerCheckView = (CustomerCheckView) list.get(0);
+                Integer vid = new Integer(0);
+
+                vid = customerCheckViewMapper.getId(customerCheckView.getPi_custcode(), Long.valueOf(customerCheckView.getCompanyId()));
+                Integer ym = Integer.valueOf(req.getYm());
+                vendOrCustAdd = customerCheckViewMapper.selectCustAdd(vid, ym, Long.valueOf(customerCheckView.getCompanyId()));
+                vendOrCustAdd.setNowbalance((vendOrCustAdd.getBeginamount() == null ? new Double(0) : vendOrCustAdd.getBeginamount())
+                        + (vendOrCustAdd.getNowamount() == null ? new Double(0) : vendOrCustAdd.getNowamount())
+                        - (vendOrCustAdd.getNowpay() == null ? new Double(0) : vendOrCustAdd.getNowpay()));
+                //封装成list
+                Map<String, Double> map1 = new HashMap<>();
+                map1.put("beginamount", vendOrCustAdd.getBeginamount());
+                list1.add(map1);
+
+                Map<String, Double> map2 = new HashMap<>();
+                map2.put("nowamount", vendOrCustAdd.getNowamount());
+                list1.add(map2);
+
+                Map<String, Double> map3 = new HashMap<>();
+                map3.put("nowpay", vendOrCustAdd.getNowpay());
+                list1.add(map3);
+
+                Map<String, Double> map4 = new HashMap<>();
+                map4.put("nowbalance", vendOrCustAdd.getNowbalance());
+                list1.add(map4);
             }
         }else if ("accountdetails".equals(type)){
             list = accountDetailsViewMapper.selectByCondition(con, companyId);
@@ -132,7 +188,13 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("list", list);
-        map.put("calculate", arr);
+        Object arrs = null;
+        if ("Supplier".equals(type) || "customercheck".equals(type)){
+            arrs = JSONArray.toJSON(list1);
+            map.put("calculate", arrs);
+        }else {
+            map.put("calculate", arr);
+        }
         return map;
     }
 }

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

@@ -81,7 +81,6 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             }
         }else {
             othreceipts.setCompanyId(BaseContextHolder.getCompanyId());
-            othreceipts.setOr_recorder(BaseContextHolder.getUserName());
             othreceipts.setCreatorName(BaseContextHolder.getUserName());
             othreceipts.setCreateTime(new Date());
             othreceiptsMapper.insertSelective(othreceipts);
@@ -261,7 +260,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             customer.setId(Long.valueOf(othreceipts.getOr_custid()));
             customer.setCu_preamount(preamount);
             customer.setCu_recamount(recamount - or_amount);
-            customer.setCu_leftamount(beginapamount + beginprepayamount + recamount - or_amount - preamount);
+            customer.setCu_leftamount(beginapamount - beginprepayamount + recamount - or_amount - preamount);
             recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
             subledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单",BaseContextHolder.getCompanyId());
         }
@@ -337,22 +336,29 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
 
     @Override
     public void othreceiptsBatchAudit(BatchDealBaseDTO baseDTO){
+        String validate = othreceiptsMapper.validateAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
+
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Othreceipts othreceipts = new Othreceipts();
             othreceipts.setId(Long.valueOf(docBaseDTO.getId()));
-            othreceipts.setOr_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
-            othreceipts.setOr_statuscode(Status.AUDITED.name());
             Othte othte = this.select(Math.toIntExact(othreceipts.getId()));
-//            this.changBankUntil(othte);
             this.audit(othte);
-//            othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
         }
     }
 
     @Override
     public void othreceiptsBatchUnAudit(BatchDealBaseDTO baseDTO){
+        String validate = othreceiptsMapper.validateBatchUnAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();

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

@@ -76,7 +76,6 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
             }
         }else {
             othspendings.setCompanyId(BaseContextHolder.getCompanyId());
-            othspendings.setOs_recorder(BaseContextHolder.getUserName());
             othspendings.setCreatorName(BaseContextHolder.getUserName());
             othspendings.setCreateTime(new Date());
             othspendingsMapper.insertSelective(othspendings);
@@ -294,7 +293,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
             vendor.setId(Long.valueOf(othspendings.getOs_vendid()));
             vendor.setVe_preamount(preamount);
             vendor.setVe_payamount(payamount + bk_amount);
-            vendor.setVe_leftamount(beginapamount + beginprepayamount - payamount + bk_amount + preamount);
+            vendor.setVe_leftamount(beginapamount - beginprepayamount + payamount + bk_amount - preamount);
             paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
 
             subledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单",BaseContextHolder.getCompanyId());
@@ -332,22 +331,29 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
 
     @Override
     public void othspendingBatchAudit(BatchDealBaseDTO baseDTO){
+
+        String validate = othspendingsMapper.validateAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Othspendings othspendings = new Othspendings();
             othspendings.setId(Long.valueOf(docBaseDTO.getId()));
-            othspendings.setOs_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
-            othspendings.setOs_statuscode(Status.AUDITED.name());
             Othsp othsp = this.select(Math.toIntExact(othspendings.getId()));
-//            this.changBankUntil(othsp);
             this.audit(othsp);
-//            othspendingsMapper.updateByPrimaryKeySelective(othspendings);
         }
     }
 
     @Override
     public void othspendingBatchUnAudit(BatchDealBaseDTO baseDTO){
+        String validate = othspendingsMapper.validateBatchUnAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();

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

@@ -81,7 +81,6 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             }
         }else {
             paybalance.setCompanyId(BaseContextHolder.getCompanyId());
-            paybalance.setPb_recorder(BaseContextHolder.getUserName());
             paybalance.setCreatorName(BaseContextHolder.getUserName());
             paybalance.setCreateTime(new Date());
             paybalanceMapper.insertSelective(paybalance);
@@ -437,28 +436,28 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
 
     @Override
     public void paybalanceBatchAudit(BatchDealBaseDTO baseDTO){
+        String validate = paybalanceMapper.validateAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Paybalance paybalance = new Paybalance();
             paybalance.setId(Long.valueOf(docBaseDTO.getId()));
-            paybalance.setPb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
-            paybalance.setPb_statuscode(Status.AUDITED.name());
             Pay pay = this.select(Math.toIntExact(paybalance.getId()));
             this.audit(pay);
-//            Subledger subledger = this.changSubledgerUntil(pay.getMain());
-//            if (subledger.getSl_code() == null){
-//                subledgerMapper.insertSelective(subledger);
-//            }else {
-//                subledgerMapper.updateByPrimaryKeySelective(subledger);
-//            }
-//            this.changBankUntil(pay);
-//            paybalanceMapper.updateByPrimaryKeySelective(paybalance);
         }
     }
 
     @Override
     public void paybalanceBatchUnAudit(BatchDealBaseDTO baseDTO){
+        String validate = paybalanceMapper.validateBatchUnAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
@@ -516,32 +515,20 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         subledger.setSl_vendid(paybalance.getPb_vendid());
         subledger.setSl_date(paybalance.getPb_date());
         subledger.setSl_ym(DateUtils.getYm(paybalance.getPb_date()));
-        if (paybalance.getPb_pdamount() == null){
-            subledger.setSl_amount((double) 0);
-        }else {
-            subledger.setSl_amount(paybalance.getPb_pdamount() * -1);
+        Double pdamount = paybalance.getPb_pdamount()==null?new Double(0):paybalance.getPb_pdamount();
+        Double preamount = paybalance.getPb_preamount()==null?new Double(0):paybalance.getPb_preamount();
+        Double pbdamount = new Double(0);
+        subledger.setSl_amount(-pdamount);
+        subledger.setSl_yamount(preamount);
+        subledger.setSl_orderamount(pdamount);
+
+        if(preamount!=0){
+            pbdamount = paybalance.getPb_pbdamount()==null?new Double(0):paybalance.getPb_pbdamount();
         }
-        subledger.setSl_orderamount(paybalance.getPb_pdamount());
-
-        Double yamount = paybalance.getPb_preamount();
-        if (yamount == null){
-            yamount = Double.valueOf(0);
-        }
-        if (yamount > 0 || yamount < 0){
-            subledger.setSl_yamount(yamount);
-        }else {
-            subledger.setSl_yamount((double) 0);
-        }
-        if (subledger.getSl_orderamount() == null){
-            subledger.setSl_orderamount((double) 0);
-        }
-
-        if (subledger.getSl_discount() == null){
-            subledger.setSl_discount((double) 0);
-        }
-        subledger.setSl_namount(subledger.getSl_orderamount() + subledger.getSl_discount() - subledger.getSl_yamount());
+        subledger.setSl_namount(pdamount-pbdamount);
         subledger.setSl_remark(subledger.getSl_remark());
-        subledger.setSl_preamount(subledger.getSl_preamount());
+        subledger.setSl_preamount(preamount);
+
 
         subledgerMapper.insertSelective(subledger);
     }

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

@@ -79,7 +79,6 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             }
         }else {
             recbalance.setCompanyId(BaseContextHolder.getCompanyId());
-            recbalance.setRb_recorder(BaseContextHolder.getUserName());
             recbalance.setCreatorName(BaseContextHolder.getUserName());
             recbalance.setCreateTime(new Date());
             recbalanceMapper.insertSelective(recbalance);
@@ -442,28 +441,28 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
 
     @Override
     public void recbalanceBatchAudit(BatchDealBaseDTO baseDTO){
+        String validate = recbalanceMapper.validateAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Recbalance recbalance = new Recbalance();
             recbalance.setId(Long.valueOf(docBaseDTO.getId()));
-            recbalance.setRb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
-            recbalance.setRb_statuscode(Status.AUDITED.name());
             Rec rec = this.select(Math.toIntExact(recbalance.getId()));
             this.audit(rec);
-//            Subledger subledger = this.changSubledgerUntil(rec.getMain());
-//            if (subledger.getSl_code() == null){
-//                subledgerMapper.insertSelective(subledger);
-//            }else {
-//                subledgerMapper.updateByPrimaryKeySelective(subledger);
-//            }
-//            this.changBankUntil(rec);
-//            recbalanceMapper.updateByPrimaryKeySelective(recbalance);
         }
     }
 
     @Override
     public void recbalanceBatchUnAudit(BatchDealBaseDTO baseDTO){
+        String validate = recbalanceMapper.validateBatchUnAudit(baseDTO.getBaseDTOs());
+        if (!StringUtils.isEmpty(validate)){
+            String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+            throw new BizException(500, String.format(message, validate));
+        }
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
@@ -522,11 +521,15 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         subledger.setSl_ym(DateUtils.getYm(recbalance.getRb_date()));
         Double rdamount = recbalance.getRb_rdamount()==null?new Double(0):recbalance.getRb_rdamount();
         Double preamount = recbalance.getRb_preamount()==null?new Double(0):recbalance.getRb_preamount();
+        Double pbdamount = new Double(0);
         subledger.setSl_amount(-rdamount);
         subledger.setSl_yamount(preamount);
         subledger.setSl_orderamount(rdamount);
 
-        subledger.setSl_namount(rdamount-preamount);
+        if(preamount!=0){
+            pbdamount = recbalance.getRb_rbdamount()==null?new Double(0):recbalance.getRb_rbdamount();
+        }
+        subledger.setSl_namount(rdamount-pbdamount);
         subledger.setSl_remark(subledger.getSl_remark());
         subledger.setSl_preamount(preamount);
 

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

@@ -147,7 +147,6 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             }
         }else{
             verification.setCompanyId(companyId);
-            verification.setVc_recorder(BaseContextHolder.getUserName());
             verification.setCreateTime(new Date());
             verification.setCreatorId(userId);
             verification.setCreatorName(BaseContextHolder.getUserName());

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

@@ -11,9 +11,6 @@
     <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" />
@@ -32,7 +29,7 @@
   </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, 
+    bk_status, bk_statuscode, bk_ym, companyid,
     updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_spending,  bk_income
   </sql>
   <sql id="Blob_Column_List" >
@@ -53,8 +50,7 @@
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.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_thisamount, bk_status, bk_statuscode,
       bk_ym, companyid, updaterId, 
       updateTime, bk_text1, bk_text2, 
       bk_text3, bk_text4, bk_text5, 
@@ -62,7 +58,6 @@
     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},
@@ -95,15 +90,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode,
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid,
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder,
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate,
-      </if>
       <if test="bk_ym != null" >
         bk_ym,
       </if>
@@ -166,15 +152,6 @@
       <if test="bk_statuscode != null" >
         #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -240,15 +217,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         bk_ym = #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -298,9 +266,6 @@
       bk_thisamount = #{bkThisamount,jdbcType=DOUBLE},
       bk_status = #{bkStatus,jdbcType=VARCHAR},
       bk_statuscode = #{bkStatuscode,jdbcType=VARCHAR},
-      bk_recorderid = #{bkRecorderid,jdbcType=INTEGER},
-      bk_recorder = #{bkRecorder,jdbcType=VARCHAR},
-      bk_recorddate = #{bkRecorddate,jdbcType=TIMESTAMP},
       bk_ym = #{bkYm,jdbcType=INTEGER},
       companyid = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},

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

@@ -45,4 +45,23 @@
         </where>
     </select>
 
+
+    <resultMap id="BaseAddMap" type="com.usoftchina.saas.money.po.VendOrCustAdd" >
+        <result column="beginamount" property="beginamount" jdbcType="DOUBLE" />
+        <result column="nowamount" property="nowamount" jdbcType="DOUBLE" />
+        <result column="nowpay" property="beginamount" jdbcType="DOUBLE" />
+    </resultMap>
+    <select id="selectCustAdd" resultMap="BaseAddMap">
+    select distinct a.sl_orderamount as beginamount, b.sl_orderamount as nowamount, c.sl_orderamount as nowpay FROM
+(select sl_orderamount,sl_custid,sl_ym, companyid from subledger where sl_kind = '期初余额') a
+left join (select sum(sl_orderamount) sl_orderamount,sl_custid,sl_ym from subledger where sl_kind = '出货单' or sl_kind = '销售退货单'
+group by sl_custid,sl_ym) b on a.sl_custid=b.sl_custid
+left join (select sum(sl_orderamount) sl_orderamount,sl_custid,sl_ym from subledger where sl_kind = '收款单' or sl_kind = '其他收入单'
+group by sl_custid,sl_ym) c on a.sl_custid=c.sl_custid
+ where a.sl_custid=#{sl_custid,jdbcType=INTEGER} and a.sl_ym=#{sl_ym, jdbcType=INTEGER} and a.companyid = #{companyId}
+  </select>
+
+    <select id="getId" resultType="java.lang.Integer">
+    select cu_id from customer where cu_code = #{code} and companyId = #{companyId}
+  </select>
 </mapper>

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

@@ -5,9 +5,6 @@
     <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" />
@@ -32,7 +29,7 @@
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    ft_id, ft_code, ft_date, ft_recorderid, ft_recorder, ft_recorddate, ft_status, ft_statuscode, 
+    ft_id, ft_code, ft_date, ft_status, ft_statuscode,
     ft_remark, fundtransfer.companyId, fundtransfer.updaterId, fundtransfer.updatedate,
     ft_text1, ft_text2, ft_text3, ft_text4, ft_text5, fundtransfer.creatorName, fundtransfer.createTime,
     ft_auditman, ft_auditdate
@@ -57,14 +54,12 @@
     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, 
+    insert into fundtransfer (ft_id, ft_code, ft_date,
       ft_status, ft_statuscode, ft_remark, 
       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}, 
+    values (#{ftId,jdbcType=INTEGER}, #{ftCode,jdbcType=VARCHAR}, #{ftDate,jdbcType=TIMESTAMP},
       #{ftStatus,jdbcType=VARCHAR}, #{ftStatuscode,jdbcType=VARCHAR}, #{ftRemark,jdbcType=VARCHAR}, 
       #{companyId,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
       #{ftText1,jdbcType=VARCHAR}, #{ftText2,jdbcType=VARCHAR}, #{ftText3,jdbcType=VARCHAR}, 
@@ -79,13 +74,6 @@
       <if test="ft_date != null" >
         ft_date,
       </if>
-      <if test="ft_recorderid != null" >
-        ft_recorderid,
-      </if>
-      <if test="ft_recorder != null" >
-        ft_recorder,
-      </if>
-        ft_recorddate,
       <if test="ft_status != null" >
         ft_status,
       </if>
@@ -130,13 +118,6 @@
       <if test="ft_date != null" >
         #{ft_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="ft_recorderid != null" >
-        #{ft_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="ft_recorder != null" >
-        #{ft_recorder,jdbcType=VARCHAR},
-      </if>
-        now(),
       <if test="ft_status != null" >
         #{ft_status,jdbcType=VARCHAR},
       </if>
@@ -187,15 +168,6 @@
       <if test="ft_date != null" >
         ft_date = #{ft_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="ft_recorderid != null" >
-        ft_recorderid = #{ft_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="ft_recorder != null" >
-        ft_recorder = #{ft_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ft_recorddate != null" >
-        ft_recorddate = #{ft_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="ft_status != null" >
         ft_status = #{ft_status,jdbcType=VARCHAR},
       </if>
@@ -235,9 +207,6 @@
     update fundtransfer
     set ft_code = #{ftCode,jdbcType=VARCHAR},
       ft_date = #{ftDate,jdbcType=TIMESTAMP},
-      ft_recorderid = #{ftRecorderid,jdbcType=INTEGER},
-      ft_recorder = #{ftRecorder,jdbcType=VARCHAR},
-      ft_recorddate = #{ftRecorddate,jdbcType=TIMESTAMP},
       ft_status = #{ftStatus,jdbcType=VARCHAR},
       ft_statuscode = #{ftStatuscode,jdbcType=VARCHAR},
       ft_remark = #{ftRemark,jdbcType=VARCHAR},
@@ -261,10 +230,8 @@
 
   <select id="selectFundtransferBycondition" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />,
-    <include refid="Detail_Column_List" />
-    from Fundtransfer left join fundtransferdetail on ftd_ftid=ft_id and
-    Fundtransfer.companyId= fundtransferdetail.companyId
+    <include refid="Base_Column_List" />
+    from Fundtransfer
     <where>
       <if test="con != null">
         ${con}
@@ -301,4 +268,18 @@
   <select id="checkStatus" resultType="int">
     select count(1) from fundtransfer where ifnull(ft_statuscode,'')='AUDITED' and ft_id= #{id,jdbcType=INTEGER}
   </select>
+
+
+  <select id="validateAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(ft_code) from fundtransfer where ft_statuscode='AUDITED' and ft_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+  <select id="validateBatchUnAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(ft_code) from fundtransfer where sa_statuscode='UNAUDITED' and ft_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
 </mapper>

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

@@ -12,9 +12,6 @@
     <result column="or_bankid" property="or_bankid" jdbcType="INTEGER" />
     <result column="or_bankname" property="or_bankname" jdbcType="VARCHAR" />
     <result column="or_amount" property="or_amount" jdbcType="DOUBLE" />
-    <result column="or_recorderid" property="or_recorderid" jdbcType="INTEGER" />
-    <result column="or_recorder" property="or_recorder" jdbcType="VARCHAR" />
-    <result column="or_recorddate" property="or_recorddate" jdbcType="TIMESTAMP" />
     <result column="or_status" property="or_status" jdbcType="VARCHAR" />
     <result column="or_statuscode" property="or_statuscode" jdbcType="VARCHAR" />
     <result column="or_remark" property="or_remark" jdbcType="VARCHAR" />
@@ -37,7 +34,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     or_id, or_code, or_date, or_custid, or_custcode, or_custname, or_bankcode, or_bankid, 
-    or_bankname, or_amount, or_recorderid, or_recorder, or_recorddate, or_status, or_statuscode, 
+    or_bankname, or_amount, or_status, or_statuscode,
     or_remark, Othreceipts.companyId, Othreceipts.updaterId, Othreceipts.updatedate, or_text1,
     or_text2, or_text3, or_text4, or_text5, othreceipts.creatorName, othreceipts.createTime, or_auditman, or_auditdate
   </sql>
@@ -65,8 +62,7 @@
     insert into othreceipts (or_id, or_code, or_date, 
       or_custid, or_custcode, or_custname, 
       or_bankcode, or_bankid, or_bankname, 
-      or_amount, or_recorderid, or_recorder, 
-      or_recorddate, or_status, or_statuscode, 
+      or_amount, or_status, or_statuscode,
       or_remark, companyId, updaterId, 
       updatedate, or_text1, or_text2, 
       or_text3, or_text4, or_text5
@@ -74,8 +70,7 @@
     values (#{orId,jdbcType=INTEGER}, #{orCode,jdbcType=VARCHAR}, #{orDate,jdbcType=TIMESTAMP}, 
       #{orCustid,jdbcType=INTEGER}, #{orCustcode,jdbcType=VARCHAR}, #{orCustname,jdbcType=VARCHAR}, 
       #{orBankcode,jdbcType=VARCHAR}, #{orBankid,jdbcType=INTEGER}, #{orBankname,jdbcType=VARCHAR}, 
-      #{orAmount,jdbcType=DOUBLE}, #{orRecorderid,jdbcType=INTEGER}, #{orRecorder,jdbcType=VARCHAR}, 
-      #{orRecorddate,jdbcType=TIMESTAMP}, #{orStatus,jdbcType=INTEGER}, #{orStatuscode,jdbcType=DECIMAL}, 
+      #{orAmount,jdbcType=DOUBLE}, #{orStatus,jdbcType=INTEGER}, #{orStatuscode,jdbcType=DECIMAL},
       #{orRemark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatedate,jdbcType=TIMESTAMP}, #{orText1,jdbcType=VARCHAR}, #{orText2,jdbcType=VARCHAR}, 
       #{orText3,jdbcType=VARCHAR}, #{orText4,jdbcType=VARCHAR}, #{orText5,jdbcType=VARCHAR}
@@ -111,13 +106,6 @@
       <if test="or_amount != null" >
         or_amount,
       </if>
-      <if test="or_recorderid != null" >
-        or_recorderid,
-      </if>
-      <if test="or_recorder != null" >
-        or_recorder,
-      </if>
-        or_recorddate,
       <if test="or_status != null" >
         or_status,
       </if>
@@ -183,13 +171,6 @@
       <if test="or_amount != null" >
         #{or_amount,jdbcType=DOUBLE},
       </if>
-      <if test="or_recorderid != null" >
-        #{or_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="or_recorder != null" >
-        #{or_recorder,jdbcType=VARCHAR},
-      </if>
-      now(),
       <if test="or_status != null" >
         #{or_status,jdbcType=VARCHAR},
       </if>
@@ -261,15 +242,6 @@
       <if test="or_amount != null" >
         or_amount = #{or_amount,jdbcType=DOUBLE},
       </if>
-      <if test="or_recorderid != null" >
-        or_recorderid = #{or_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="or_recorder != null" >
-        or_recorder = #{or_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="or_recorddate != null" >
-        or_recorddate = #{or_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="or_status != null" >
         or_status = #{or_status,jdbcType=VARCHAR},
       </if>
@@ -316,9 +288,6 @@
       or_bankid = #{orBankid,jdbcType=INTEGER},
       or_bankname = #{orBankname,jdbcType=VARCHAR},
       or_amount = #{orAmount,jdbcType=DOUBLE},
-      or_recorderid = #{orRecorderid,jdbcType=INTEGER},
-      or_recorder = #{orRecorder,jdbcType=VARCHAR},
-      or_recorddate = #{orRecorddate,jdbcType=TIMESTAMP},
       or_status = #{orStatus,jdbcType=INTEGER},
       or_statuscode = #{orStatuscode,jdbcType=DECIMAL},
       or_remark = #{orRemark,jdbcType=VARCHAR},
@@ -341,9 +310,8 @@
   </select>
   <select id="selectOthreceiptsBycondition" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />,
-    <include refid="Detail_Column_List" />
-    from Othreceipts left join othreceiptsdetail on ord_orid=or_id and Othreceipts.companyId=othreceiptsdetail.companyId
+    <include refid="Base_Column_List" />
+    from Othreceipts
     <where>
       <if test="con != null">
         ${con}
@@ -379,4 +347,18 @@
   <select id="checkStatus" resultType="int">
     select count(1) from othreceipts where ifnull(or_statuscode,'')='AUDITED' and or_id= #{id,jdbcType=INTEGER}
   </select>
+
+
+  <select id="validateAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(or_code) from othreceipts where or_statuscode='AUDITED' and or_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+  <select id="validateBatchUnAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(or_code) from othreceipts where or_statuscode='UNAUDITED' and or_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
 </mapper>

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

@@ -12,9 +12,6 @@
     <result column="os_bankcode" property="os_bankcode" jdbcType="VARCHAR" />
     <result column="os_bankname" property="os_bankname" jdbcType="VARCHAR" />
     <result column="os_amount" property="os_amount" jdbcType="DOUBLE" />
-    <result column="os_recorderid" property="os_recorderid" jdbcType="INTEGER" />
-    <result column="os_recorder" property="os_recorder" jdbcType="VARCHAR" />
-    <result column="os_recorddate" property="os_recorddate" jdbcType="TIMESTAMP" />
     <result column="os_status" property="os_status" jdbcType="VARCHAR" />
     <result column="os_statuscode" property="os_statuscode" jdbcType="VARCHAR" />
     <result column="os_remark" property="os_remark" jdbcType="VARCHAR" />
@@ -36,7 +33,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     os_id, os_code, os_date, os_vendid, os_vendcode, os_vendname, os_bankid, os_bankcode, 
-    os_bankname, os_amount, os_recorderid, os_recorder, os_recorddate, os_status, os_statuscode, 
+    os_bankname, os_amount, os_status, os_statuscode,
     os_remark, othspendings.companyId, othspendings.updaterId,
     othspendings.updatedate, os_text1, os_text2, os_text3, os_text4,
     os_text5,othspendings.creatorName, othspendings.createTime, os_auditman, os_auditdate
@@ -58,8 +55,7 @@
     insert into othspendings (os_id, os_code, os_date, 
       os_vendid, os_vendcode, os_vendname, 
       os_bankid, os_bankcode, os_bankname, 
-      os_amount, os_recorderid, os_recorder, 
-      os_recorddate, os_status, os_statuscode, 
+      os_amount, os_status, os_statuscode,
       os_remark, companyId, updaterId, 
       updatedate, os_text1, os_text2, 
       os_text3, os_text4, os_text5
@@ -67,8 +63,7 @@
     values (#{osId,jdbcType=INTEGER}, #{osCode,jdbcType=VARCHAR}, #{osDate,jdbcType=TIMESTAMP}, 
       #{osVendid,jdbcType=INTEGER}, #{osVendcode,jdbcType=VARCHAR}, #{osVendname,jdbcType=VARCHAR}, 
       #{osBankid,jdbcType=INTEGER}, #{osBankcode,jdbcType=VARCHAR}, #{osBankname,jdbcType=VARCHAR}, 
-      #{osAmount,jdbcType=DOUBLE}, #{osRecorderid,jdbcType=INTEGER}, #{osRecorder,jdbcType=VARCHAR}, 
-      #{osRecorddate,jdbcType=TIMESTAMP}, #{osStatus,jdbcType=INTEGER}, #{osStatuscode,jdbcType=DECIMAL}, 
+      #{osAmount,jdbcType=DOUBLE}, #{osStatus,jdbcType=INTEGER}, #{osStatuscode,jdbcType=DECIMAL},
       #{osRemark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatedate,jdbcType=TIMESTAMP}, #{osText1,jdbcType=VARCHAR}, #{osText2,jdbcType=VARCHAR}, 
       #{osText3,jdbcType=VARCHAR}, #{osText4,jdbcType=VARCHAR}, #{osText5,jdbcType=VARCHAR}
@@ -105,13 +100,6 @@
       <if test="os_amount != null" >
         os_amount,
       </if>
-      <if test="os_recorderid != null" >
-        os_recorderid,
-      </if>
-      <if test="os_recorder != null" >
-        os_recorder,
-      </if>
-        os_recorddate,
       <if test="os_status != null" >
         os_status,
       </if>
@@ -177,13 +165,6 @@
       <if test="os_amount != null" >
         #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="os_recorderid != null" >
-        #{os_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="os_recorder != null" >
-        #{os_recorder,jdbcType=VARCHAR},
-      </if>
-      now(),
       <if test="os_status != null" >
         #{os_status,jdbcType=VARCHAR},
       </if>
@@ -255,15 +236,6 @@
       <if test="os_amount != null" >
         os_amount = #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="os_recorderid != null" >
-        os_recorderid = #{os_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="os_recorder != null" >
-        os_recorder = #{os_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="os_recorddate != null" >
-        os_recorddate = #{os_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="os_status != null" >
         os_status = #{os_status,jdbcType=VARCHAR},
       </if>
@@ -311,9 +283,6 @@
       os_bankcode = #{osBankcode,jdbcType=VARCHAR},
       os_bankname = #{osBankname,jdbcType=VARCHAR},
       os_amount = #{osAmount,jdbcType=DOUBLE},
-      os_recorderid = #{osRecorderid,jdbcType=INTEGER},
-      os_recorder = #{osRecorder,jdbcType=VARCHAR},
-      os_recorddate = #{osRecorddate,jdbcType=TIMESTAMP},
       os_status = #{osStatus,jdbcType=INTEGER},
       os_statuscode = #{osStatuscode,jdbcType=DECIMAL},
       os_remark = #{osRemark,jdbcType=VARCHAR},
@@ -337,10 +306,8 @@
 
   <select id="selectOthspendingsBycondition" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />,
-    <include refid="Detail_Column_List" />
-    from Othspendings left join othspendingsdetail on osd_osid=os_id
-    and Othspendings.companyId=othspendingsdetail.companyId
+    <include refid="Base_Column_List" />
+    from Othspendings
     <where>
       <if test="con != null">
         ${con}
@@ -376,4 +343,17 @@
   <select id="checkStatus" resultType="int">
     select count(1) from othspendings where ifnull(os_statuscode,'')='AUDITED' and os_id= #{id,jdbcType=INTEGER}
   </select>
+
+  <select id="validateAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(os_code) from othspendings where os_statuscode='AUDITED' and os_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+  <select id="validateBatchUnAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(os_code) from othspendings where os_statuscode='UNAUDITED' and os_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
 </mapper>

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

@@ -15,9 +15,6 @@
     <result column="pb_preamount" jdbcType="DOUBLE" property="pb_preamount" />
     <result column="pb_discounts" jdbcType="DOUBLE" property="pb_discounts" />
     <result column="pb_havebalance" jdbcType="DOUBLE" property="pb_havebalance" />
-    <result column="pb_recorderid" jdbcType="INTEGER" property="pb_recorderid" />
-    <result column="pb_recorder" jdbcType="VARCHAR" property="pb_recorder" />
-    <result column="pb_recorddate" jdbcType="TIMESTAMP" property="pb_recorddate" />
     <result column="pb_status" jdbcType="VARCHAR" property="pb_status" />
     <result column="pb_statuscode" jdbcType="VARCHAR" property="pb_statuscode" />
     <result column="pb_remark" jdbcType="VARCHAR" property="pb_remark" />
@@ -105,8 +102,8 @@
   </sql>
   <sql id="Base_Column_List">
     pb_id, pb_code, pb_kind, pb_date, pb_vendid, pb_vendcode, pb_vendname, pb_manname, 
-    pb_pdamount, pb_pbdamount, pb_preamount, pb_discounts, pb_havebalance, pb_recorderid, 
-    pb_recorder, pb_recorddate, pb_status, pb_statuscode, pb_remark, paybalance.companyId,
+    pb_pdamount, pb_pbdamount, pb_preamount, pb_discounts, pb_havebalance,
+     pb_status, pb_statuscode, pb_remark, paybalance.companyId,
     paybalance.updaterId,paybalance.updatedate, pb_text1, pb_text2, pb_text3, pb_text4, pb_text5, paybalance.creatorName,
     paybalance.createTime, pb_auditdate, pb_auditman
   </sql>
@@ -143,8 +140,7 @@
       pb_date, pb_vendid, pb_vendcode, 
       pb_vendname, pb_manname, pb_pdamount, 
       pb_pbdamount, pb_preamount, pb_discounts, 
-      pb_havebalance, pb_recorderid, pb_recorder, 
-      pb_recorddate, pb_status, pb_statuscode, 
+      pb_havebalance, pb_status, pb_statuscode,
       pb_remark, companyId, updaterId,
       updatedate, pb_text1, pb_text2, 
       pb_text3, pb_text4, pb_text5
@@ -153,8 +149,7 @@
       #{pb_date,jdbcType=TIMESTAMP}, #{pb_vendid,jdbcType=INTEGER}, #{pb_vendcode,jdbcType=VARCHAR}, 
       #{pb_vendname,jdbcType=VARCHAR}, #{pb_manname,jdbcType=VARCHAR}, #{pb_pdamount,jdbcType=DOUBLE}, 
       #{pb_pbdamount,jdbcType=DOUBLE}, #{pb_preamount,jdbcType=DOUBLE}, #{pb_discounts,jdbcType=DOUBLE}, 
-      #{pb_havebalance,jdbcType=DOUBLE}, #{pb_recorderid,jdbcType=INTEGER}, #{pb_recorder,jdbcType=VARCHAR}, 
-      #{pb_recorddate,jdbcType=TIMESTAMP}, #{pb_status,jdbcType=INTEGER}, #{pb_statuscode,jdbcType=DECIMAL}, 
+      #{pb_havebalance,jdbcType=DOUBLE},  #{pb_status,jdbcType=INTEGER}, #{pb_statuscode,jdbcType=DECIMAL},
       #{pb_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{pb_text1,jdbcType=VARCHAR}, #{pb_text2,jdbcType=VARCHAR},
       #{pb_text3,jdbcType=VARCHAR}, #{pb_text4,jdbcType=VARCHAR}, #{pb_text5,jdbcType=VARCHAR}
@@ -199,13 +194,6 @@
       <if test="pb_havebalance != null">
         pb_havebalance,
       </if>
-      <if test="pb_recorderid != null">
-        pb_recorderid,
-      </if>
-      <if test="pb_recorder != null">
-        pb_recorder,
-      </if>
-        pb_recorddate,
       <if test="pb_status != null">
         pb_status,
       </if>
@@ -280,13 +268,6 @@
       <if test="pb_havebalance != null">
         #{pb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="pb_recorderid != null">
-        #{pb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null">
-        #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      now(),
       <if test="pb_status != null">
         #{pb_status,jdbcType=INTEGER},
       </if>
@@ -374,15 +355,6 @@
       <if test="pb_havebalance != null">
         pb_havebalance = #{pb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="pb_recorderid != null">
-        pb_recorderid = #{pb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null">
-        pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_recorddate != null">
-        pb_recorddate = #{pb_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="pb_status != null">
         pb_status = #{pb_status,jdbcType=INTEGER},
       </if>
@@ -436,9 +408,6 @@
       pb_preamount = #{pb_preamount,jdbcType=DOUBLE},
       pb_discounts = #{pb_discounts,jdbcType=DOUBLE},
       pb_havebalance = #{pb_havebalance,jdbcType=DOUBLE},
-      pb_recorderid = #{pb_recorderid,jdbcType=INTEGER},
-      pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      pb_recorddate = #{pb_recorddate,jdbcType=TIMESTAMP},
       pb_status = #{pb_status,jdbcType=INTEGER},
       pb_statuscode = #{pb_statuscode,jdbcType=DECIMAL},
       pb_remark = #{pb_remark,jdbcType=VARCHAR},
@@ -455,9 +424,8 @@
 
   <select id="selectPaybalanceBycondition" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />,
-    <include refid="detail_Column_List" />
-    from paybalance left join paybalancedet on pd_pbid=pb_id and paybalance.companyId=paybalancedet.companyId
+    <include refid="Base_Column_List" />
+    from paybalance
     <where>
       <if test="con != null">
         ${con}
@@ -497,10 +465,23 @@
     where pb_id = #{id,jdbcType=INTEGER}
   </select>
 
+  <select id="validateAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(pb_code) from paybalance where pb_statuscode='AUDITED' and pb_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+  <select id="validateBatchUnAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(pb_code) from paybalance where pb_statuscode='UNAUDITED' and pb_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+
   <!-- 银行账户-->
   <sql id="Bank_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,
+    bk_status, bk_statuscode, bk_ym, companyid,
     updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_spending,bk_income
   </sql>
   <sql id="Blob_Column_List" >
@@ -527,9 +508,6 @@
     <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" />
@@ -570,15 +548,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         bk_ym = #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -645,9 +614,6 @@
     <result column="ve_bankcode" property="ve_bankcode" jdbcType="VARCHAR" />
     <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
     <result column="ve_statuscode" property="ve_statuscode" jdbcType="VARCHAR" />
-    <result column="ve_recordid" property="ve_recordid" jdbcType="INTEGER" />
-    <result column="ve_recordname" property="ve_recordname" jdbcType="VARCHAR" />
-    <result column="ve_initdate" property="ve_initdate" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -670,7 +636,7 @@
   <sql id="Vendor_Column_List" >
         ve_id, ve_code, ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
-        ve_recordid, ve_recordname, ve_initdate, companyId, updaterId, updateTime, ve_text1,
+       companyId, updaterId, updateTime, ve_text1,
         ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount
     </sql>
 
@@ -719,15 +685,6 @@
       <if test="ve_statuscode != null" >
         ve_statuscode = #{ve_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="ve_recordid != null" >
-        ve_recordid = #{ve_recordid,jdbcType=DECIMAL},
-      </if>
-      <if test="ve_recordname != null" >
-        ve_recordname = #{ve_recordname,jdbcType=VARCHAR},
-      </if>
-      <if test="ve_initdate != null" >
-        ve_initdate = #{ve_initdate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=DECIMAL},
       </if>

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

@@ -15,9 +15,6 @@
     <result column="rb_preamount" jdbcType="DOUBLE" property="rb_preamount" />
     <result column="rb_discounts" jdbcType="DOUBLE" property="rb_discounts" />
     <result column="rb_havebalance" jdbcType="DOUBLE" property="rb_havebalance" />
-    <result column="rb_recorderid" jdbcType="INTEGER" property="rb_recorderid" />
-    <result column="rb_recorder" jdbcType="VARCHAR" property="rb_recorder" />
-    <result column="rb_recorddate" jdbcType="TIMESTAMP" property="rb_recorddate" />
     <result column="rb_status" jdbcType="VARCHAR" property="rb_status" />
     <result column="rb_statuscode" jdbcType="VARCHAR" property="rb_statuscode" />
     <result column="rb_remark" jdbcType="VARCHAR" property="rb_remark" />
@@ -105,8 +102,8 @@
   </sql>
   <sql id="Base_Column_List">
     rb_id, rb_code, rb_kind, rb_date, rb_custid, rb_custcode, rb_custname, rb_manname,
-    rb_rdamount, rb_rbdamount, rb_preamount, rb_discounts, rb_havebalance, rb_recorderid,
-    rb_recorder, rb_recorddate, rb_status, rb_statuscode, rb_remark, recbalance.companyId,
+    rb_rdamount, rb_rbdamount, rb_preamount, rb_discounts, rb_havebalance, rb_status, rb_statuscode, rb_remark,
+    recbalance.companyId,
     recbalance.updaterId,recbalance.updatedate, rb_text1, rb_text2, rb_text3, rb_text4, rb_text5,
     recbalance.creatorName, recbalance.createTime, rb_auditman, rb_auditdate
   </sql>
@@ -141,9 +138,8 @@
 
   <select id="selectRecbalanceBycondition" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />,
-    <include refid="detail_Column_List" />
-    from recbalance left join recbalancedet on rd_rbid=rb_id and recbalance.companyId=recbalancedet.companyId
+    <include refid="Base_Column_List" />
+    from recbalance
     <where>
       <if test="con != null">
         ${con}
@@ -184,8 +180,7 @@
       rb_date, rb_custid, rb_custcode, 
       rb_custname, rb_manname, rb_rdamount, 
       rb_rbdamount, rb_preamount, rb_discounts, 
-      rb_havebalance, rb_recorderid, rb_recorder, 
-      rb_recorddate, rb_status, rb_statuscode, 
+      rb_havebalance, rb_status, rb_statuscode,
       rb_remark, companyId, updaterId,
       updatedate, rb_text1, rb_text2, 
       rb_text3, rb_text4, rb_text5
@@ -194,8 +189,7 @@
       #{rb_date,jdbcType=TIMESTAMP}, #{rb_custid,jdbcType=INTEGER}, #{rb_custcode,jdbcType=VARCHAR}, 
       #{rb_custname,jdbcType=VARCHAR}, #{rb_manname,jdbcType=VARCHAR}, #{rb_rdamount,jdbcType=DOUBLE}, 
       #{rb_rbdamount,jdbcType=DOUBLE}, #{rb_preamount,jdbcType=DOUBLE}, #{rb_discounts,jdbcType=DOUBLE}, 
-      #{rb_havebalance,jdbcType=DOUBLE}, #{rb_recorderid,jdbcType=INTEGER}, #{rb_recorder,jdbcType=VARCHAR}, 
-      #{rb_recorddate,jdbcType=TIMESTAMP}, #{rb_status,jdbcType=INTEGER}, #{rb_statuscode,jdbcType=DECIMAL}, 
+      #{rb_havebalance,jdbcType=DOUBLE}, #{rb_status,jdbcType=INTEGER}, #{rb_statuscode,jdbcType=DECIMAL},
       #{rb_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{rb_text1,jdbcType=VARCHAR}, #{rb_text2,jdbcType=VARCHAR},
       #{rb_text3,jdbcType=VARCHAR}, #{rb_text4,jdbcType=VARCHAR}, #{rb_text5,jdbcType=VARCHAR}
@@ -243,13 +237,6 @@
       <if test="rb_havebalance != null">
         rb_havebalance,
       </if>
-      <if test="rb_recorderid != null">
-        rb_recorderid,
-      </if>
-      <if test="rb_recorder != null">
-        rb_recorder,
-      </if>
-        rb_recorddate,
       <if test="rb_status != null">
         rb_status,
       </if>
@@ -324,13 +311,6 @@
       <if test="rb_havebalance != null">
         #{rb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="rb_recorderid != null">
-        #{rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="rb_recorder != null">
-        #{rb_recorder,jdbcType=VARCHAR},
-      </if>
-      now(),
       <if test="rb_status != null">
         #{rb_status,jdbcType=INTEGER},
       </if>
@@ -420,15 +400,6 @@
       <if test="record.rb_havebalance != null">
         rb_havebalance = #{record.rb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="record.rb_recorderid != null">
-        rb_recorderid = #{record.rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="record.rb_recorder != null">
-        rb_recorder = #{record.rb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_recorddate != null">
-        rb_recorddate = #{record.rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="record.rb_status != null">
         rb_status = #{record.rb_status,jdbcType=INTEGER},
       </if>
@@ -482,9 +453,6 @@
       rb_preamount = #{record.rb_preamount,jdbcType=DOUBLE},
       rb_discounts = #{record.rb_discounts,jdbcType=DOUBLE},
       rb_havebalance = #{record.rb_havebalance,jdbcType=DOUBLE},
-      rb_recorderid = #{record.rb_recorderid,jdbcType=INTEGER},
-      rb_recorder = #{record.rb_recorder,jdbcType=VARCHAR},
-      rb_recorddate = #{record.rb_recorddate,jdbcType=TIMESTAMP},
       rb_status = #{record.rb_status,jdbcType=INTEGER},
       rb_statuscode = #{record.rb_statuscode,jdbcType=DECIMAL},
       rb_remark = #{record.rb_remark,jdbcType=VARCHAR},
@@ -539,15 +507,6 @@
       <if test="rb_havebalance != null">
         rb_havebalance = #{rb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="rb_recorderid != null">
-        rb_recorderid = #{rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="rb_recorder != null">
-        rb_recorder = #{rb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_recorddate != null">
-        rb_recorddate = #{rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="rb_status != null">
         rb_status = #{rb_status,jdbcType=INTEGER},
       </if>
@@ -601,9 +560,6 @@
       rb_preamount = #{rb_preamount,jdbcType=DOUBLE},
       rb_discounts = #{rb_discounts,jdbcType=DOUBLE},
       rb_havebalance = #{rb_havebalance,jdbcType=DOUBLE},
-      rb_recorderid = #{rb_recorderid,jdbcType=INTEGER},
-      rb_recorder = #{rb_recorder,jdbcType=VARCHAR},
-      rb_recorddate = #{rb_recorddate,jdbcType=TIMESTAMP},
       rb_status = #{rb_status,jdbcType=INTEGER},
       rb_statuscode = #{rb_statuscode,jdbcType=DECIMAL},
       rb_remark = #{rb_remark,jdbcType=VARCHAR},
@@ -632,10 +588,23 @@
     where rb_id = #{id,jdbcType=INTEGER}
   </select>
 
+  <select id="validateAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(rb_code) from recbalance where rb_statuscode='AUDITED' and rb_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+  <select id="validateBatchUnAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(rb_code) from recbalance where rb_statuscode='UNAUDITED' and rb_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+
   <!-- 银行账户-->
   <sql id="Bank_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,
+    bk_status, bk_statuscode, bk_ym, companyid,
     updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_spending,bk_income
   </sql>
   <sql id="Blob_Column_List" >
@@ -662,9 +631,6 @@
     <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" />
@@ -705,15 +671,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         bk_ym = #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -772,9 +729,6 @@
     <result column="cu_credit" jdbcType="DOUBLE" property="cu_credit" />
     <result column="cu_status" jdbcType="VARCHAR" property="cu_status" />
     <result column="cu_statuscode" jdbcType="VARCHAR" property="cu_statuscode" />
-    <result column="cu_recordmanid" jdbcType="INTEGER" property="cu_recordmanid" />
-    <result column="cu_recordman" jdbcType="VARCHAR" property="cu_recordman" />
-    <result column="cu_recorddate" jdbcType="TIMESTAMP" property="cu_recorddate" />
     <result column="companyid" jdbcType="INTEGER" property="companyId" />
     <result column="updaterid" jdbcType="INTEGER" property="updaterId" />
     <result column="updatetime" jdbcType="TIMESTAMP" property="updateTime" />
@@ -789,7 +743,7 @@
   <sql id="Customer_Column_List">
     cu_id, cu_code, cu_name, cu_uu, cu_type, cu_begindate, cu_beginaramount, cu_beginprerecamount,
     cu_promisedays, cu_taxrate, cu_sellerid, cu_sellercode, cu_sellername, cu_credit,
-    cu_status, cu_statuscode, cu_recordmanid, cu_recordman, cu_recorddate, companyid,
+    cu_status, cu_statuscode, companyid,
     updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount,
     cu_recamount,cu_preamount
   </sql>
@@ -848,15 +802,6 @@
       <if test="cu_statuscode != null">
         cu_statuscode = #{cu_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="cu_recordmanid != null">
-        cu_recordmanid = #{cu_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="cu_recordman != null">
-        cu_recordman = #{cu_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="cu_recorddate != null">
-        cu_recorddate = #{cu_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         companyid = #{companyId,jdbcType=INTEGER},
       </if>

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

@@ -21,11 +21,6 @@
     <result column="sl_ym" property="sl_ym" jdbcType="INTEGER" />
   </resultMap>
 
-  <resultMap id="BaseAddMap" type="com.usoftchina.saas.money.po.VendorAdd" >
-    <result column="beginamount" property="beginamount" jdbcType="DOUBLE" />
-    <result column="nowamount" property="nowamount" jdbcType="DOUBLE" />
-    <result column="nowpay" property="beginamount" jdbcType="DOUBLE" />
-  </resultMap>
   <sql id="Base_Column_List" >
     sl_id, sl_code, sl_kind, sl_custid, sl_vendid, sl_date, sl_amount, sl_preamount, 
     sl_yamount, sl_namount, sl_remark, companyId, updaterId, updateTime, sl_orderamount, 
@@ -254,13 +249,4 @@
         where sl_code = #{sl_code,jdbcType=VARCHAR}
     </select>
 
-  <select id="selectAdd" resultMap="BaseAddMap">
-    select a.sl_orderamount as beginamount, b.sl_orderamount as nowamount, c.sl_orderamount as nowpay FROM
-(select sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '期初余额') a
-left join (select sum(sl_orderamount) sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '采购验收单' or sl_kind = '采购验退单'
-group by sl_vendid,sl_ym) b on a.sl_vendid=b.sl_vendid
-left join (select sum(sl_orderamount) sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '付款单' or sl_kind = '其他支出单'
-group by sl_vendid,sl_ym) c on a.sl_vendid=c.sl_vendid
- where a.sl_vendid=#{sl_vendid,jdbcType=INTEGER} and a.sl_ym=#{sl_ym, jdbcType=INTEGER}
-  </select>
 </mapper>

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

@@ -20,6 +20,7 @@
     <result column="pd_nettotal" property="pd_nettotal" jdbcType="DOUBLE" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="pd_remark" property="pd_remark" jdbcType="VARCHAR"/>
+    <result column="ym" property="ym" jdbcType="INTEGER" />
   </resultMap>
 
   <select id="selectByCondition" resultMap="BaseResultMap">
@@ -46,4 +47,24 @@
       </if>
     </where>
   </select>
+
+
+  <resultMap id="BaseAddMap" type="com.usoftchina.saas.money.po.VendOrCustAdd" >
+    <result column="beginamount" property="beginamount" jdbcType="DOUBLE" />
+    <result column="nowamount" property="nowamount" jdbcType="DOUBLE" />
+    <result column="nowpay" property="beginamount" jdbcType="DOUBLE" />
+  </resultMap>
+  <select id="selectVendAdd" resultMap="BaseAddMap">
+    select distinct a.sl_orderamount as beginamount, b.sl_orderamount as nowamount, c.sl_orderamount as nowpay FROM
+(select sl_orderamount,sl_vendid,sl_ym, companyid from subledger where sl_kind = '期初余额') a
+left join (select sum(sl_orderamount) sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '采购验收单' or sl_kind = '采购验退单'
+group by sl_vendid,sl_ym) b on a.sl_vendid=b.sl_vendid
+left join (select sum(sl_orderamount) sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '付款单' or sl_kind = '其他支出单'
+group by sl_vendid,sl_ym) c on a.sl_vendid=c.sl_vendid
+ where a.sl_vendid=#{sl_vendid,jdbcType=INTEGER} and a.sl_ym=#{sl_ym, jdbcType=INTEGER} and a.companyid = #{companyId}
+  </select>
+
+  <select id="getId" resultType="java.lang.Integer">
+    select ve_id from vendor where ve_code = #{code} and companyId = #{companyId}
+  </select>
 </mapper>