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

.gitignore

@@ -29,7 +29,6 @@ applications/**/build/
 base-servers/**/build/
 framework/**/build/
 frontend/saas-web/build/
-frontend/saas-portal-web/build/
 nbbuild/
 dist/
 node_modules/

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

@@ -70,6 +70,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     SALEOUT_POST_ERROR(72005,""),
     SALEOUT_UNAUDIT_ERROR(72006,"销售订单已转出货单,无法反审核"),
     SALE_ORDER_HASAUDIT(72003, "存在已审核单据,单据编号:%s"),
+    SALE_EXISTS_PURCHASE(72004, "存在已转的采购单据,单据编号:%s"),
 
     //资金
     PAYBALANCE_OUTNOWBALANCE(74001,"本次核销金额不能大于未核销金额"),
@@ -80,6 +81,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BEFORE_UNAUDIT(74006, "单据:<u>%s</u>未审核,无法反审核"),
     BANK_AMOUNT_NOTENOUGH(74004, "资金账号不足"),
     SUBLEDGER_NOT_EXIS(74005,"来源单据不存在"),
+    CHECK_SETACOUNT_EXIS(74006, "不能删除单据日期小于等于结账期间<u>%s</u>的单据"),
 
 
 

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

@@ -25,7 +25,7 @@ public class PaydetailView {
 
     private Double mustpay;
 
-    private Long mustdate;
+    private Date mustdate;
 
     private Double pi_total;
 
@@ -129,11 +129,11 @@ public class PaydetailView {
         this.mustpay = mustpay;
     }
 
-    public Long getMustdate() {
+    public Date getMustdate() {
         return mustdate;
     }
 
-    public void setMustdate(Long mustdate) {
+    public void setMustdate(Date mustdate) {
         this.mustdate = mustdate;
     }
 

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

@@ -13,7 +13,7 @@
     <result column="pb_pdamount" property="pb_pdamount" jdbcType="DOUBLE" />
     <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
     <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
-    <result column="mustdate" property="mustdate" jdbcType="DECIMAL" />
+    <result column="mustdate" property="mustdate" jdbcType="TIMESTAMP" />
     <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
     <result column="pi_remark" property="pi_remark" jdbcType="VARCHAR" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />

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

@@ -42,6 +42,8 @@ public class PurchaseDetail extends CommonBaseEntity implements Serializable {
 
     private Integer pd_saledetno;
 
+    private Long pd_saleid;
+
     private Integer pd_sdid;
 
     private String pd_text1;

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

@@ -1,66 +0,0 @@
-package com.usoftchina.saas.sale.dto;
-
-import com.usoftchina.saas.base.entity.CommonBaseEntity;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class PurchaseDTO extends CommonBaseEntity implements Serializable {
-
-    private String pu_code;
-
-    private Date pu_date;
-
-    private Integer pu_vendid;
-
-    private String pu_vendcode;
-
-    private String pu_vendname;
-
-    private Integer pu_buyerid;
-
-    private String pu_buyercode;
-
-    private String pu_buyername;
-
-    private Date pu_delivery;
-
-    private Double pu_taxtotal;
-
-    private Double pu_total;
-
-    private String pu_remark;
-
-    private String pu_totalupper;
-
-    private String pu_printstatus;
-
-    private String pu_printstatuscode;
-
-    private String pu_acceptstatuscode;
-
-    private String pu_acceptstatus;
-
-    private String pu_statuscode;
-
-    private String pu_status;
-
-    private String pu_text1;
-
-    private String pu_text2;
-
-    private String pu_text3;
-
-    private String pu_text4;
-
-    private String pu_text5;
-
-    private String pu_shipaddresscode;
-
-    private String pu_auditman;
-
-    private Date pu_auditdate;
-
-}

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

@@ -1,62 +0,0 @@
-package com.usoftchina.saas.sale.dto;
-
-import com.usoftchina.saas.base.entity.CommonBaseEntity;
-import com.usoftchina.saas.document.dto.ProductDTO;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class PurchaseDetailDTO extends CommonBaseEntity implements Serializable {
-
-    private  Long pd_puid;
-
-    private String pd_code;
-
-    private Integer pd_detno;
-
-    private Long pd_prodid;
-
-    private String pd_prodcode;
-
-    private String pd_unit;
-
-    private Double pd_qty;
-
-    private Double pd_price;
-
-    private Double pd_taxprice;
-
-    private Double pd_total;
-
-    private Double pd_taxrate;
-
-    private Double pd_taxtotal;
-
-    private Double pd_acceptqty;
-
-    private Date pd_delivery;
-
-    private String pd_salecode;
-
-    private Integer pd_saledetno;
-
-    private Integer pd_sdid;
-
-    private String pd_text1;
-
-    private String pd_text2;
-
-    private String pd_text3;
-
-    private String pd_text4;
-
-    private String pd_text5;
-
-    private Double pd_yqty;
-
-    private  String pd_remark;
-
-    private ProductDTO productDTO;
-}

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

@@ -1,156 +0,0 @@
-package com.usoftchina.saas.sale.dto;
-
-
-import com.usoftchina.saas.base.entity.CommonBaseEntity;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author: guq
- * @create: 2018-10-10 16:42
- **/
-@Data
-public class PurchaseListDTO extends CommonBaseEntity implements Serializable {
-
-    //主表信息
-    private  Integer pu_id;
-
-    private String pu_code;
-
-    private Date pu_date;
-
-    private Integer pu_vendid;
-
-    private String pu_vendcode;
-
-    private String pu_vendname;
-
-    private Integer pu_buyerid;
-
-    private String pu_buyercode;
-
-    private String pu_buyername;
-
-    private Date pu_delivery;
-
-    private Double pu_taxtotal;
-
-    private Double pu_total;
-
-    private String pu_remark;
-
-    private String pu_totalupper;
-
-    private String pu_printstatus;
-
-    private String pu_printstatuscode;
-
-    private String pu_acceptstatuscode;
-
-    private String pu_acceptstatus;
-
-    private String pu_statuscode;
-
-    private String pu_status;
-
-    private String pu_text1;
-
-    private String pu_text2;
-
-    private String pu_text3;
-
-    private String pu_text4;
-
-    private String pu_text5;
-
-    private String pu_shipaddresscode;
-
-    private Date pu_auditdate;
-
-    private String pu_auditman;
-
-    //从表字段
-    private Long pd_id;
-
-    private  Long pd_puid;
-
-    private String pd_code;
-
-    private Integer pd_detno;
-
-    private Integer pd_prodid;
-
-    private String pd_prodcode;
-
-    private String pd_unit;
-
-    private Double pd_qty;
-
-    private Double pd_price;
-
-    private Double pd_taxprice;
-
-    private Double pd_total;
-
-    private Double pd_taxrate;
-
-    private Double pd_taxtotal;
-
-    private Double pd_acceptqty;
-
-    private Date pd_delivery;
-
-    private String pd_salecode;
-
-    private Integer pd_saledetno;
-
-    private Integer pd_sdid;
-
-    private String pd_text1;
-
-    private String pd_text2;
-
-    private String pd_text3;
-
-    private String pd_text4;
-
-    private String pd_text5;
-
-    private Double pd_yqty;
-
-    private String pd_remark;
-
-    private String pd_ordercode;
-
-    //private ProductDTO productDTO;
-    private Long pr_id;
-    private String pr_code;
-    private String pr_detail;
-    private String pr_spec;
-    private String pr_unit;
-    private String pr_kind;
-    private String pr_orispeccode;
-    private long pr_whid;
-    private String pr_whcode;
-    private String pr_whname;
-    private long pr_zxbzs;
-    private long pr_leadtime;
-    private String pr_brand;
-    private String pr_standardprice;
-    private String pr_purcprice;
-    private String pr_saleprice;
-    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;
-    private String pr_text2;
-    private String pr_text3;
-    private String pr_text4;
-}

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

@@ -2,8 +2,8 @@ package com.usoftchina.saas.sale.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
-import com.usoftchina.saas.sale.dto.PurchaseDTO;
-import com.usoftchina.saas.sale.dto.PurchaseDetailDTO;
+import com.usoftchina.saas.purchase.po.Purchase;
+import com.usoftchina.saas.purchase.po.PurchaseDetail;
 import com.usoftchina.saas.sale.po.Sale;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
@@ -45,9 +45,11 @@ public interface SaleMapper extends CommonBaseMapper<Sale> {
 
     void updateCreator(@Param("userId") Long userId, @Param("userName") String userName, @Param("id") Long id);
 
-    void turnPurchase(PurchaseDTO purchase);
+    void turnPurchase(Purchase purchase);
 
-    void turnPurchaseDetail(List<PurchaseDetailDTO> list);
+    void turnPurchaseDetail(List<PurchaseDetail> list);
 
     Integer selectPurchaseId(@Param("code") String code,@Param("companyid") Long companyid);
+
+    String checkIsTurnPurchase(@Param("id") Long id,@Param("companyid") Long companyid);
 }

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

@@ -19,6 +19,9 @@ import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.purchase.po.Purchase;
+import com.usoftchina.saas.purchase.po.PurchaseDetail;
+import com.usoftchina.saas.purchase.po.PurchaseList;
 import com.usoftchina.saas.sale.dto.*;
 import com.usoftchina.saas.sale.mapper.*;
 import com.usoftchina.saas.sale.po.Sale;
@@ -29,6 +32,7 @@ import com.usoftchina.saas.sale.service.SaleService;
 import com.usoftchina.saas.storage.po.ProdIODetail;
 import com.usoftchina.saas.storage.po.ProdInOut;
 import com.usoftchina.saas.utils.BeanMapper;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -285,6 +289,12 @@ public class SaleServiceImpl implements SaleService{
         if (num > 0) {
             throw new BizException(BizExceptionCode.SALEOUT_UNAUDIT_ERROR);
         }
+        //检查是否转采购订单
+        String purchaseCode = saleMapper.checkIsTurnPurchase(id,BaseContextHolder.getCompanyId());
+        if (purchaseCode != null && purchaseCode.length()>0){
+            throw new BizException(BizExceptionCode.SALE_EXISTS_PURCHASE.getCode(),
+                    String.format(BizExceptionCode.SALE_EXISTS_PURCHASE.getMessage(),purchaseCode));
+        }
         singleUnAudit(id);
     }
 
@@ -534,8 +544,15 @@ public class SaleServiceImpl implements SaleService{
         Sale sale = saleMapper.selectByPrimaryKey(id);
         List<SaleList> dateilList = saleListMapper.selectSaleListByCondition("sa_id="+id,BaseContextHolder.getCompanyId());
 
-        PurchaseDTO purchase = new PurchaseDTO();
-        List<PurchaseDetailDTO> listPurchaseDetail = new ArrayList<PurchaseDetailDTO>();
+        //判断是否已转采购单
+        String purchaseCode = saleMapper.checkIsTurnPurchase(id,BaseContextHolder.getCompanyId());
+        if (purchaseCode != null && purchaseCode.length()>0){
+            throw new BizException(BizExceptionCode.SALE_EXISTS_PURCHASE.getCode(),
+                    String.format(BizExceptionCode.SALE_EXISTS_PURCHASE.getMessage(),purchaseCode));
+        }
+
+        Purchase purchase = new Purchase();
+        List<PurchaseDetail> listPurchaseDetail = new ArrayList<PurchaseDetail>();
 
         //销售主表转采购主表
         Result<String> result = maxnumberService.getMaxnumber(BillCodeSeq.PURCHASE.getCaller(),false);
@@ -550,33 +567,30 @@ public class SaleServiceImpl implements SaleService{
 
         Long purchaseId = purchase.getId();
         for (SaleList detail : dateilList){
-            PurchaseDetailDTO purchaseDetailDTO = new PurchaseDetailDTO();
+            PurchaseDetail purchaseDetail = new PurchaseDetail();
             Double taxPrice = detail.getPr_purcprice()==null?new Double(0):Double.valueOf(detail.getPr_purcprice());
             Double taxrate = detail.getSd_taxrate()==null?new Double(0):detail.getSd_taxrate();
             Double qty = detail.getSd_qty()==null?new Double(0):detail.getSd_qty();
-            purchaseDetailDTO.setPd_prodid(Long.valueOf(String.valueOf(detail.getSd_prodid())));
-            purchaseDetailDTO.setPd_prodcode(detail.getSd_prodcode());
-            purchaseDetailDTO.setPd_detno(detail.getSd_detno());
-            purchaseDetailDTO.setPd_qty(detail.getSd_qty());
-            purchaseDetailDTO.setPd_price(taxPrice/(1+taxrate));
-            purchaseDetailDTO.setPd_salecode(sale.getSa_code());
-            purchaseDetailDTO.setPd_saledetno(detail.getSd_detno());
-            purchaseDetailDTO.setPd_taxrate(taxrate);
-            purchaseDetailDTO.setPd_taxprice(taxPrice);
-            purchaseDetailDTO.setPd_taxtotal(taxPrice*qty);
-            purchaseDetailDTO.setCompanyId(BaseContextHolder.getCompanyId());
-            purchaseDetailDTO.setCreatorId(BaseContextHolder.getUserId());
-            purchaseDetailDTO.setCreateTime(new Date());
-            purchaseDetailDTO.setCreatorName(BaseContextHolder.getUserName());
-            purchaseDetailDTO.setPd_puid(purchaseId);
-            purchaseDetailDTO.setPd_code(result.getData());
-            listPurchaseDetail.add(purchaseDetailDTO);
+            purchaseDetail.setPd_prodid(Long.valueOf(String.valueOf(detail.getSd_prodid())));
+            purchaseDetail.setPd_prodcode(detail.getSd_prodcode());
+            purchaseDetail.setPd_detno(detail.getSd_detno());
+            purchaseDetail.setPd_qty(detail.getSd_qty());
+            purchaseDetail.setPd_price(taxPrice/(1+taxrate));
+            purchaseDetail.setPd_salecode(sale.getSa_code());
+            purchaseDetail.setPd_saledetno(detail.getSd_detno());
+            purchaseDetail.setPd_saleid(sale.getId());
+            purchaseDetail.setPd_taxrate(taxrate);
+            purchaseDetail.setPd_taxprice(taxPrice);
+            purchaseDetail.setPd_taxtotal(taxPrice*qty);
+            purchaseDetail.setCompanyId(BaseContextHolder.getCompanyId());
+            purchaseDetail.setCreatorId(BaseContextHolder.getUserId());
+            purchaseDetail.setCreateTime(new Date());
+            purchaseDetail.setCreatorName(BaseContextHolder.getUserName());
+            purchaseDetail.setPd_puid(purchaseId);
+            purchaseDetail.setPd_code(result.getData());
+            listPurchaseDetail.add(purchaseDetail);
         }
-
         saleMapper.turnPurchaseDetail(listPurchaseDetail);
-
-
-
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setCode(result.getData());
         baseDTO.setId(Long.valueOf(String.valueOf(purchaseId)));

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

@@ -421,11 +421,17 @@
   <update id="updateCreator">
     update sale set creatorId = #{userId} , creatorName=#{userName} where sa_id=#{id}
   </update>
-  
+
+  <select id="checkIsTurnPurchase"  resultType="java.lang.String">
+    select distinct pu_code from purchasedetail left join purchase on pd_puid=pu_id and
+    purchasedetail.companyid = purchase.companyid
+    where pd_saleid = #{id}
+    and purchasedetail.companyid= #{companyid}
+  </select>
   
   
   <!-- 销售订单转采购单-->
-  <insert id="turnPurchase" parameterType="com.usoftchina.saas.sale.dto.PurchaseDTO" >
+  <insert id="turnPurchase" parameterType="com.usoftchina.saas.purchase.po.Purchase" >
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
@@ -633,7 +639,7 @@
     PD_DETNO, PD_PRODID, PD_PRODCODE,
     PD_UNIT, PD_QTY, PD_PRICE,PD_TAXPRICE,
     PD_TOTAL,PD_TAXRATE, PD_TAXTOTAL, PD_ACCEPTQTY,
-    PD_DELIVERY, PD_SALECODE, PD_SALEDETNO,
+    PD_DELIVERY, PD_SALECODE, PD_SALEDETNO,PD_SALEID,
     PD_SDID, companyId, updaterId,
     updateTime, pd_text1, pd_text2,
     pd_text3, pd_text4, pd_text5,
@@ -645,7 +651,7 @@
       #{item.pd_detno,jdbcType=INTEGER}, #{item.pd_prodid,jdbcType=INTEGER}, #{item.pd_prodcode,jdbcType=VARCHAR},
       #{item.pd_unit,jdbcType=VARCHAR}, #{item.pd_qty,jdbcType=DOUBLE}, #{item.pd_price,jdbcType=DOUBLE},#{item.pd_taxprice,jdbcType=DOUBLE},
       #{item.pd_total,jdbcType=DOUBLE},#{item.pd_taxrate,jdbcType=DOUBLE}, #{item.pd_taxtotal,jdbcType=DOUBLE}, #{item.pd_acceptqty,jdbcType=DOUBLE},
-      #{item.pd_delivery,jdbcType=DOUBLE}, #{item.pd_salecode,jdbcType=VARCHAR}, #{item.pd_saledetno,jdbcType=INTEGER},
+      #{item.pd_delivery,jdbcType=DOUBLE}, #{item.pd_salecode,jdbcType=VARCHAR}, #{item.pd_saledetno,jdbcType=INTEGER},#{item.pd_saleid,jdbcType=INTEGER},
       #{item.pd_sdid,jdbcType=INTEGER}, #{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},

base-servers/account/account-server/src/main/resources/mapper/AccountMapper.xml

@@ -172,7 +172,7 @@
                 updater_id=#{updaterId,jdbcType=BIGINT},
             </if>
             <if test="updateTime != null">
-                update_time=#{updateTime,jdbcType=TIMESTAMP})
+                update_time=#{updateTime,jdbcType=TIMESTAMP}
             </if>
         </set>
         where id=#{id,jdbcType=BIGINT}

frontend/saas-portal-web/Dockerfile

@@ -0,0 +1,4 @@
+FROM hub.c.163.com/library/nginx
+MAINTAINER USOFTCHINA <yingp@usoftchina.com>
+RUN rm /etc/nginx/conf.d/default.conf
+ADD runtime/nginx/default.conf /etc/nginx/conf.d/

frontend/saas-portal-web/runtime/nginx/default.conf

@@ -0,0 +1,20 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    charset utf-8;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   html;
+    }
+}

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

@@ -10,7 +10,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name:'ft_code',
-        fieldLabel: '单号',
         emptyText:'请输入单号'
     },{
         xtype : "condatefield",

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

@@ -10,8 +10,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
     queryFormItems: [ {
         xtype: 'textfield',
         name: 'or_code',
-        fieldLabel: '单号/客户/账号',
-        emptyText:'请输入单号/客户/账号',
+        emptyText:'请输入单号或客户或账号',
         labelWidth: 100,
         getCondition: function(value) {
            return  ' (or_code like\'%' + value + '%\'' 

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

@@ -19,9 +19,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'os_code',
-        fieldLabel: '单号/客户/账号',
-        emptyText:'请输入单号/客户/账号',
-        labelWidth: 100,
+        emptyText:'请输入单号或客户或账号',
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
@@ -100,12 +98,8 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             dataIndex: 'os_date',
             xtype: 'datecolumn',
             width: 110
-        },{
-            text: '审核状态',
-            dataIndex: 'os_status',
-            width: 90
         }, {
-            text: '供应商',
+            text: '供应商名称',
             dataIndex: 'os_vendname',
             width:250
         },{

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

@@ -18,7 +18,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pb_code',
-        fieldLabel: '单号/供应商',
         emptyText :'请输入单号或供应商',
         getCondition: function(value) {
             if(value == 'ALL') {
@@ -111,10 +110,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             text: '付款人',
             dataIndex: 'pb_manname',
             width: 110
-        }, {
-            text: '单据状态',
-            dataIndex: 'pb_status',
-            width: 90
         }, {
             text: '备注',
             dataIndex: 'pb_remark',

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

@@ -10,8 +10,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name: 'rb_code',
-        fieldLabel: '单号/客户',
-        emptyText :'请输入单号或者客户',
+        emptyText :'请输入单号或客户',
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
@@ -71,7 +70,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             xtype: 'numbercolumn',
             hidden: true
         }, {
-            text: '付款单号',
+            text: '收款单号',
             dataIndex: 'rb_code',
             width: 150
         }, {
@@ -84,7 +83,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             dataIndex: 'rb_custname',
             width: 250,
         },{
-            text: '付款金额',
+            text: '收款金额',
             xtype: 'numbercolumn',
             dataIndex: 'rd_amount',
             width: 120,

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

@@ -8,64 +8,118 @@ Ext.define('saas.view.money.verification.QueryPanel', {
     viewName: 'money-verification-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'rb_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
+        xtype: 'textfield',
+        name: 'vc_code',
+        fieldLabel: '单号/供应商名/客户名',
+        emptyText :'请输入单号或者供应商名或者客户名',
         getCondition: function(value) {
-            return 'rb_id=' + value;
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return  ' (vc_code like\'%' + value + '%\' '
+                    +' or vc_vendcode like \'%'+value+'%\' '
+                    +' or vc_custcode like \'%'+value+'%\') ';
+            }
         }
-    }, {
-        xtype: 'textfield',
-        name: 'rb_code',
-        fieldLabel: '单据编号'
-    }, {
+    },{
         xtype: 'condatefield',
-        name: 'rb_date',
-        fieldLabel: '日期',
+        name: 'vc_date',
+        fieldLabel: '单据日期',
         columnWidth: 0.5,
         operation: 'between'
+    },{
+        xtype: 'combobox',
+        name: 'vc_statuscode',
+        fieldLabel: '审核状态',
+        queryMode: 'local',
+        displayField: 'name',
+        valueField: 'value',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+            fields: ['value', 'name'],
+            data: [
+                ["ALL", "全部"],
+                ["AUDITED", "已审核"],
+                ["UNAUDITED", "未审核"]
+            ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'vc_statuscode=\'' + value + '\'';
+            }
+        }
+    },{
+        xtype: 'combobox',
+        name: 'vc_kind',
+        fieldLabel: '业务类型',
+        queryMode: 'local',
+        displayField: 'name',
+        valueField: 'value',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+            fields: ['value', 'name'],
+            data: [
+                ["ALL", "全部"],
+                ["预收冲应收", "预收冲应收"],
+                ["预付冲应付", "预付冲应付"],
+                ["应收冲应付", "应收冲应付"],
+                ["应收转应收", "应收转应收"],
+                ["应付转应付", "应付转应付"]
+            ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'vc_kind=\'' + value + '\'';
+            }
+        }
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
         idField: 'id',
-        codeField: 'rb_code',
-        addTitle: '收款单',
-        addXtype: 'money-recbalance-formpanel',
+        codeField: 'vc_code',
+        addTitle: '核销单',
+        addXtype: 'money-verification-formpanel',
         defaultCondition:'',
-        baseVastUrl: '/api/money/recbalance/',
+        baseVastUrl: '/api/money/verification/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
+            width: 100,
             xtype: 'numbercolumn',
             hidden: true
         }, {
             text: '单据编号',
-            dataIndex: 'rb_code',
-            width: 150
+            dataIndex: 'vc_code',
+            width: 200
+        }, {
+            text: '审核状态',
+            dataIndex: 'vc_status',
+            width: 120
         }, {
-            text: '单据状态',
-            dataIndex: 'rb_status',
-            width: 90
+            text: '业务类型',
+            dataIndex: 'vc_kind',
+            width: 200
         }, {
-            text: '日期',
-            dataIndex: 'rb_date',
-            xtype: 'datecolumn',
-            width: 110
+            text: '客户编号',
+            dataIndex: 'vc_custcode',
+            hidden: true
         }, {
             text: '客户名称',
-            dataIndex: 'rb_custname',
-            width: 150
+            dataIndex: 'vc_custname',
         }, {
-            text: '收款人',
-            dataIndex: 'rb_manname',
-            xtype: 'numbercolumn',
-            width: 110
+            text: '供应商名称',
+            dataIndex: 'vc_vendcode'
         }, {
-            text: '收款金额',
-            dataIndex: 'rb_rdamount',
+            text: '核销金额',
+            dataIndex: 'vc_amount1',
             xtype: 'numbercolumn',
-            width: 110,
+            width: 120,
             flex: 1,
             hidden: true
         }]

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

@@ -18,7 +18,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pu_code',
-        fieldLabel: '单号/供应商',
         emptyText:'请输入单号或供应商',
         getCondition: function(value) {
             return  ' (pu_code like\'%' + value + '%\' or pu_vendcode like \'%'+value+'%\' or pu_vendname like \'%'+value+'%\') ';

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

@@ -15,7 +15,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单号/供应商',
         emptyText:'请输入单号或供应商',
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';

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

@@ -18,7 +18,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单号/供应商',
         emptyText:'请输入单号或供应商',
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';

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

@@ -18,7 +18,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'sa_code',
-        fieldLabel: '单号/客户',
         emptyText:'请输入单号或客户',
         getCondition: function(value) {
            return  ' (sa_code like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' or sa_custname like \'%'+value+'%\') ';

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -14,8 +14,8 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单号/客户',
         emptyText:'请输入单号或客户或关联单号',
+        labelWidth:100,
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_sacode like \'%'+value+'%\') ';
         }

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -15,8 +15,8 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单号/客户',
         emptyText:'请输入单号或客户或关联单号',
+        labelWidth:100,
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_iocode like \'%'+value+'%\') ';
         }

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

@@ -16,7 +16,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单号/物料',
+        emptyText:'请输入单号或物料',
         showDetail: true,
         getCondition: function(value) {
             if(value == 'ALL') {

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

@@ -22,7 +22,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'ma_prodcode',
-        fieldLabel: '产品',
         emptyText :'请输入产品名称或编号',
         getCondition: function(value) {
             if(value == 'ALL') {

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

@@ -16,7 +16,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单号/供应商',
+        emptyText:'请输入单号或供应商',
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -16,7 +16,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        fieldLabel: '单号/供应商',
+        emptyText:'请输入单号或客户',
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
@@ -81,7 +81,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '其它入库单号',
+            text: '其它出库单号',
             dataIndex: 'pi_inoutno',
             width: 150
         },{

frontend/saas-web/index.html

@@ -8,7 +8,7 @@
     <title>云进销存 - 优企云服</title>
     <link rel="icon" href="/resources/images/favicon.png" type="image/x-icon">
     <!-- 图片动画效果样式导入 -->
-    <link type="text/css" rel="stylesheet" href="/ext/packages/css/imagehover.css" />
+    <link type="text/css" rel="stylesheet" href="/resources/othcss/imagehover.css" />
 
     <!-- The line below must be kept intact for Sencha Cmd to build your application -->
     <script id="microloader" data-app="a20e1670-7932-41f6-8e9c-55b77cba3f26" type="text/javascript" src="bootstrap.js"></script>

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

@@ -159,6 +159,11 @@
             "text": "资金转存",
             "addType": "money-fundtransfer-formpanel",
             "viewType": "money-fundtransfer-querypanel"
+        }, {
+            "id": "verification",
+            "text": "核销单",
+            "addType": "money-verification-formpanel",
+            "viewType": "money-verification-querypanel"
         }]
     }, {
         "text": "报表",