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

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

@@ -41,6 +41,10 @@ public enum BizExceptionCode implements BaseExceptionCode {
 
     NO_OPRATIONDATA(79400,"无可操作单据"),
     NULL_DATA(23232,"无数据"),
+    PRODUCT_HASSTOCK(79401, "当前物料库存大于0,不允许禁用"),
+    PRODUCT_EXISTS_PRODIO(79402, "存在未审核出入库单据使用了当前物料"),
+    PRODUCT_EXISTS_SALE(79403, "存在未关闭且状态非已出库销售订单使用了当前物料"),
+    PRODUCT_EXISTS_PURCHASE(79404, "存在未关闭且状态非已入库采购订单使用了当前物料"),
 
     BOM_SAVE(79401, "产品编号+版本号已存在"),
     BOM_CODE_REPEAT(74002, "组合件和子件不允许相同"),
@@ -106,7 +110,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
     DOCUMENTS_AUDITED(74009,"存在已审核单据:%S"),
     DOCUMENTS_UNAUDITED(74010,"存在未审核单据:%S"),
-    BANK_AMOUNT_NOTENOUGHS(74011, "资金账户余额不足:%S"),
+    BANK_AMOUNT_NOTENOUGHS(74011, "审核失败！资金账户:%S 余额不足"),
 
     //反结账
     EARLY_USERING(74012, "期初余额被使用，无法反结账"),

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/CommonServiceImpl.java

@@ -32,7 +32,7 @@ public class CommonServiceImpl implements CommonService {
         if (count > 0){
             result.setProduct(true);
         }
-        count = commonMapper.getCountProduct(companyId);
+        count = commonMapper.getCountCustomer(companyId);
         if (count > 0){
             result.setCustomer(true);
         }

applications/commons/commons-server/src/main/resources/i18n/messages_zh_CN.properties

@@ -2,6 +2,7 @@
 msg.detail=  \u660e\u7ec6\u884c:
 msg.save=\u4fdd\u5b58\u64cd\u4f5c 
 msg.delete=\u5220\u9664\u64cd\u4f5c
+msg.deleteDetail=\u5220\u9664\u660e\u7ec6
 msg.update=\u4fee\u6539\u64cd\u4f5c
 msg.commit=\u63d0\u4ea4\u64cd\u4f5c
 msg.resCommit=\u53cd\u63d0\u4ea4\u64cd\u4f5c

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

@@ -54,4 +54,12 @@ public interface ProductMapper extends CommonBaseMapper<Product> {
     List<ProductReserveCostDTO> selectReserveCostByIgnoreWarehouse(@Param("con") String con, @Param("companyId") Long companyId);
 
     String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
+
+    int selectStockById(Long id);
+
+    int selectProdIOCount(Long id);
+
+    int selectSale(Long id);
+
+    int selectPurchase(Long id);
 }

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

@@ -28,4 +28,6 @@ public interface ProductbrandMapper extends CommonBaseMapper<Productbrand> {
     List<Productbrand> selectAll(@Param("companyId") Long companyId);
 
     int getCountFromProduct(@Param("id") Long id, @Param("companyId") Long companyId);
+
+    Productbrand getComboByName(@Param("name") String name, @Param("companyId") Long companyId);
 }

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

@@ -27,4 +27,6 @@ public interface ProducttypeMapper extends CommonBaseMapper<Producttype> {
     List<Producttype> selectAll(@Param("companyId") Long companyId);
 
     int getCountFromProduct(@Param("id") Long id, @Param("companyId") Long companyId);
+
+    Producttype getTypeByName(@Param("name") String name, @Param("companyId") Long companyId);
 }

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

@@ -27,4 +27,6 @@ public interface ProductunitMapper extends CommonBaseMapper<Productunit> {
     List<Productunit> selectAll(@Param("companyId") Long companyId);
 
     int getCountFromProduct(@Param("id") Long id, @Param("companyId") Long companyId);
+
+    Productunit getComboByName(@Param("name") String name, @Param("companyId") Long companyId);
 }

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

@@ -15,4 +15,6 @@ public interface ProductbrandService extends CommonBaseService<ProductbrandMappe
     List<Productbrand> selectAll();
 
     DocBaseDTO saveData(Productbrand productbrand);
+
+    Productbrand getComboByName(String name);
 }

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

@@ -15,4 +15,6 @@ public interface ProducttypeService extends CommonBaseService<ProducttypeMapper,
     List<Producttype> selectAll();
 
     DocBaseDTO saveData(Producttype producttype);
+
+    Producttype getTypeByName(String name);
 }

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

@@ -15,4 +15,6 @@ public interface ProductunitService extends CommonBaseService<ProductunitMapper,
     List<Productunit> selectAll();
 
     DocBaseDTO saveData(Productunit productunit);
+
+    Productunit getComboByName(String name);
 }

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

@@ -26,8 +26,7 @@ import com.usoftchina.saas.document.mapper.DataImportMapper;
 import com.usoftchina.saas.document.mapper.ProductDetailMapper;
 import com.usoftchina.saas.document.mapper.ProductMapper;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
-import com.usoftchina.saas.document.service.ProductService;
-import com.usoftchina.saas.document.service.WarehouseService;
+import com.usoftchina.saas.document.service.*;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.CollectionUtils;
@@ -55,6 +54,12 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     private DataImportMapper dataImportMapper;
     @Autowired
     private WarehouseMapper warehouseMapper;
+    @Autowired
+    private ProductbrandService productbrandService;
+    @Autowired
+    private ProductunitService productunitService;
+    @Autowired
+    private ProducttypeService producttypeService;
 
     @Override
     public PageInfo<ProductDTO> getProductsByCondition(PageRequest page, ListReqDTO listReqDTO) {
@@ -336,6 +341,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             if (!Status.ENABLE.getDisplay().equals(product.getPr_status())){
                 throw new BizException(BizExceptionCode.BIZ_BANNED);
             }
+            beforeClose(id);
             product.setPr_status(Status.BANNED.getDisplay());
             product.setPr_statuscode(Status.BANNED.name());
             product.setUpdaterId(BaseContextHolder.getUserId());
@@ -350,6 +356,33 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         }
     }
 
+    /**
+     * 物料禁用前校验
+     * @param id
+     */
+    private void beforeClose(Long id){
+        //1.库存大于0
+        int count = getMapper().selectStockById(id);
+        if (count > 0){
+            throw new BizException(BizExceptionCode.PRODUCT_HASSTOCK);
+        }
+        //2.存在未审核出入库单据
+        count = getMapper().selectProdIOCount(id);
+        if (count > 0){
+            throw new BizException(BizExceptionCode.PRODUCT_EXISTS_PRODIO);
+        }
+        //3.存在未关闭且状态非已出库销售订单
+        count = getMapper().selectSale(id);
+        if (count > 0){
+            throw new BizException(BizExceptionCode.PRODUCT_EXISTS_SALE);
+        }
+        //4.存在未关闭且状态非已入库采购订单
+        count = getMapper().selectPurchase(id);
+        if (count > 0){
+            throw new BizException(BizExceptionCode.PRODUCT_EXISTS_PURCHASE);
+        }
+    }
+
     @Override
     public DocBaseDTO open(Long id) {
         DocBaseDTO docBaseDTO = null;
@@ -411,8 +444,15 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         validProductOperation(id, BizExceptionCode.BIZ_RELDELETE_DELETEPROD);
         //校验是否存在关联单据
         validEnableDel(id);
-
         String code = getMapper().getCodeById(id);
+
+        //找到原始单据,反过账并删除
+        String inoutCode = getMapper().selectProdIOCode(code, BaseContextHolder.getCompanyId(), "库存初始化");
+        if (!StringUtils.isEmpty(inoutCode)) {
+            post(inoutCode, "反过账");
+            getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
+            getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
+        }
         productDetailMapper.deleteByProdId(id);
         getMapper().deleteByPrimaryKey(id);
         DocBaseDTO docBaseDTO = generateMsgObj(id, code);
@@ -569,6 +609,9 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         if (!CollectionUtils.isEmpty(details)) {
             Map<String, List<DataImportDetail>> datas = CollectionUtils.groupBy(details, DataImportDetail::getDd_codevalue);
             Integer detno = null;
+            String brand = null;
+            String unit = null;
+            String kind = null;
             for (String code : datas.keySet()) {
                 listDTO = new ProductListDTO();
                 List<ProductDetail> productDetails = new ArrayList<>();
@@ -581,13 +624,42 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
                 if (!StringUtils.isEmpty(product.getPr_whcode())) {
                     warehouse = warehouseMapper.selectWareHouse(product.getPr_whcode(), companyId);
                     if (null == warehouse) {
-                        err.append("物料编号为: " + product.getPr_code() + " 的物料仓库: "+ product.getPr_whname() +" 在系统中不存在，请确认数据是否正确");
+                        err.append("物料编号为: " + product.getPr_code() + " 的物料仓库: "+ product.getPr_whname() +" 在系统中不存在");
                         break;
                     }
                     product.setPr_whid(warehouse.getId());
-                    product.setPr_status(Status.ENABLE.getDisplay());
-                    product.setPr_statuscode(Status.ENABLE.name());
+                    product.setPr_whname(warehouse.getWh_description());
+                }
+                //验证品牌
+                brand = product.getPr_brand();
+                if (!StringUtils.isEmpty(brand)) {
+                    Productbrand pr_brand = productbrandService.getComboByName(brand);
+                    if (null == pr_brand) {
+                        err.append("物料编号为: " + product.getPr_code() + " 的品牌: "+ product.getPr_brand() +" 在系统中不存在");
+                        break;
+                    }
                 }
+                //验证单位
+                unit = product.getPr_unit();
+                if (!StringUtils.isEmpty(unit)) {
+                    Productunit pr_unit = productunitService.getComboByName(unit);
+                    if (null == pr_unit) {
+                        err.append("物料编号为: " + product.getPr_code() + " 的单位: "+ product.getPr_unit() +" 在系统中不存在");
+                        break;
+                    }
+                }
+                //验证类型
+                kind = product.getPr_kind();
+                if (!StringUtils.isEmpty(kind)) {
+                    Producttype pr_kind = producttypeService.getTypeByName(kind);
+                    if (null == pr_kind) {
+                        err.append("物料编号为: " + product.getPr_code() + " 的类型: "+ product.getPr_kind() +" 在系统中不存在");
+                        break;
+                    }
+                }
+                product.setPr_status(Status.ENABLE.getDisplay());
+                product.setPr_statuscode(Status.ENABLE.name());
+
                 //编号不存在
                 if (i == 0) {
                     product.setId(0l);

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

@@ -10,6 +10,7 @@ import com.usoftchina.saas.document.entities.Productbrand;
 import com.usoftchina.saas.document.mapper.ProductbrandMapper;
 import com.usoftchina.saas.document.service.ProductbrandService;
 import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,6 +56,15 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
         return docBaseDTO;
     }
 
+    @Override
+    public Productbrand getComboByName(String name) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+        Productbrand brand = productbrandMapper.getComboByName(name, BaseContextHolder.getCompanyId());
+        return brand;
+    }
+
     @Override
     public boolean removeByPrimaryKey(Long id){
         if (id == null || id < 0){

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

@@ -10,6 +10,7 @@ import com.usoftchina.saas.document.entities.Producttype;
 import com.usoftchina.saas.document.mapper.ProducttypeMapper;
 import com.usoftchina.saas.document.service.ProducttypeService;
 import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -57,6 +58,15 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
         return docBaseDTO;
     }
 
+    @Override
+    public Producttype getTypeByName(String name) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+        Producttype type = producttypeMapper.getTypeByName(name, BaseContextHolder.getCompanyId());
+        return type;
+    }
+
     /**
      * 删除
      * @param id

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

@@ -10,6 +10,7 @@ import com.usoftchina.saas.document.entities.Productunit;
 import com.usoftchina.saas.document.mapper.ProductunitMapper;
 import com.usoftchina.saas.document.service.ProductunitService;
 import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,6 +51,15 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
         return docBaseDTO;
     }
 
+    @Override
+    public Productunit getComboByName(String name) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+        Productunit unit = getMapper().getComboByName(name, BaseContextHolder.getCompanyId());
+        return unit;
+    }
+
     @Override
     public boolean removeByPrimaryKey(Long id){
         if(id != null && id > 0){

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

@@ -934,5 +934,17 @@
     <select id="selectIdByCode" resultType="long">
         select pr_id from product where pr_code=#{code} and companyId=#{companyId}
     </select>
+    <select id="selectStockById" resultType="int">
+        SELECT COUNT(*) FROM PRODUCTONHAND WHERE PO_PRODID = #{id}
+    </select>
+    <select id="selectProdIOCount" resultType="int">
+        SELECT COUNT(*) FROM PRODIODETAIL WHERE PD_STATUS != 99 AND PD_PRODID = #{id}
+    </select>
+    <select id="selectSale" resultType="int">
+        SELECT COUNT(*) FROM SALE LEFT JOIN SALEDETAIL ON SA_ID = SD_SAID WHERE SA_SENDSTATUS != '已出库' AND SA_SENDSTATUS != '已关闭' AND IFNULL(SD_PRODID,0) = #{id}
+    </select>
+    <select id="selectPurchase" resultType="int">
+        SELECT COUNT(*) FROM PURCHASE LEFT JOIN PURCHASEDETAIL ON PU_ID = PD_PUID WHERE PU_ACCEPTSTATUS != '已出库' AND PU_ACCEPTSTATUSCODE != '已关闭' AND IFNULL(PD_PRODID,0) = #{id}
+    </select>
 </mapper>
 

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

@@ -134,4 +134,8 @@
     <select id="getCountFromProduct" resultType="int">
         SELECT COUNT(*) FROM PRODUCT WHERE PR_BRAND = (SELECT PB_NAME FROM PRODUCTBRAND WHERE PB_ID = #{id}) AND companyId = #{companyId}
     </select>
+
+  <select id="getComboByName" resultMap="BaseResultMap">
+    select * from PRODUCTBRAND where pb_name = #{name} and companyId = #{companyId}
+  </select>
 </mapper>

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

@@ -133,4 +133,7 @@
     <select id="getCountFromProduct" resultType="int">
         SELECT COUNT(*) FROM PRODUCT WHERE PR_KIND = (SELECT PT_NAME FROM PRODUCTTYPE WHERE PT_ID = #{id}) AND companyId=#{companyId}
     </select>
+  <select id="getTypeByName" resultMap="BaseResultMap">
+    select * from PRODUCTTYPE where pt_name=#{name} and companyId=#{companyId}
+  </select>
 </mapper>

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

@@ -125,4 +125,7 @@
     <select id="getCountFromProduct" resultType="int">
         SELECT COUNT(*) FROM PRODUCT WHERE PR_UNIT = (SELECT PU_NAME FROM PRODUCTUNIT WHERE PU_ID = #{id}) AND companyId = #{companyId}
     </select>
+  <select id="getComboByName" resultMap="BaseResultMap">
+    select * from PRODUCTUNIT where pu_name=#{name} and companyId = #{companyId}
+  </select>
 </mapper>

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

@@ -27,7 +27,7 @@
         and  companyId = #{companyId}
       </if>
     </where>
-    order by bankname asc, date desc, bankid desc
+    order by bankname asc, date desc
   </select>
 
   <select id="selectCalculateFields" resultType="string">

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

@@ -26,9 +26,9 @@ public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
 
     String selectCodeById(Long pi_id);
 
-    int validateCodeWhenInsert(@Param("code") String code,@Param("pi_class") String pi_class );
+    int validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
 
-    int validateCodeWhenUpdate(@Param("code") String code,@Param("id") Long id );
+    int validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long companyId);
 
     String validateUnAudit(Long id);
 

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

@@ -49,7 +49,7 @@ public class SaleList implements Serializable {
 
     private Integer updaterId;
 
-    private Date updatetime;
+    private Date updateTime;
 
     private String sa_text1;
 
@@ -61,7 +61,7 @@ public class SaleList implements Serializable {
 
     private String sa_text5;
 
-    private String creatorname;
+    private String creatorName;
 
     private String sa_auditman;
 

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

@@ -629,13 +629,14 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         String code = baseDTO.getCode();
         Long id = baseDTO.getId();
         String pi_class = baseDTO.getName();
+        Long companyId = BaseContextHolder.getCompanyId();
         if (null == code) {
             throw new BizException(BizExceptionCode.NULL_CODE);
         }
         String billCode = null;
         synchronized (ProdInOutServiceImpl.class) {
-            Integer count = "0".equals(String.valueOf(id)) ? prodInOutMapper.validateCodeWhenInsert(code,pi_class) :
-                    prodInOutMapper.validateCodeWhenUpdate(code, id);
+            Integer count = "0".equals(String.valueOf(id)) ? prodInOutMapper.validateCodeWhenInsert(code, companyId) :
+                    prodInOutMapper.validateCodeWhenUpdate(code, id, companyId);
             String caller = "出货单".equals(pi_class) ? BillCodeSeq.SALEOUT.getCaller() : BillCodeSeq.SALEIN.getCaller();
            /* if(pi_class.equals("出货单")){
                 caller = BillCodeSeq.SALEOUT.getCaller();

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

@@ -512,10 +512,10 @@
     select pi_inoutno from prodinout where pi_id=#{id}
   </select>
   <select id="validateCodeWhenInsert"  resultType="int">
-    select count(1) from prodinout where pi_inoutno = #{code} and pi_class = #{pi_class}
+    select count(1) from prodinout where pi_inoutno = #{code} and companyId = #{companyId}
   </select>
   <select id="validateCodeWhenUpdate" resultType="int" >
-    select count(1) from prodinout where pi_inoutno = #{code} and pi_id != #{id}
+    select count(1) from prodinout where pi_inoutno = #{code} and pi_id != #{id} and companyId = #{companyId}
   </select>
   <select id="validateUnAudit" parameterType="long" resultType="java.lang.String">
     select pi_inoutno from prodinout where pi_id = #{id} and IFNULL(pi_statuscode,' ')!='AUDITED'

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

@@ -17,11 +17,11 @@
         <result column="sa_sendstatus" property="sa_sendstatus" jdbcType="VARCHAR" />
         <result column="sa_printstatus" property="sa_printstatus" jdbcType="VARCHAR" />
         <result column="sa_printstatuscode" property="sa_printstatuscode" jdbcType="VARCHAR" />
-        <result column="creatorname" property="creatorname" jdbcType="VARCHAR" />
+        <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
         <result column="sa_auditman" property="sa_auditman" 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="updatetime" property="updateTime" jdbcType="TIMESTAMP" />
         <result column="sa_date" property="sa_date" jdbcType="TIMESTAMP" />
         <result column="sa_text1" property="sa_text1" jdbcType="VARCHAR" />
         <result column="sa_text2" property="sa_text2" jdbcType="VARCHAR" />

frontend/saas-portal-web/src/components/conenter/addenterprise.vue

@@ -204,6 +204,7 @@ import { setTimeout } from 'timers';
             },
             //保存
             Preservation(){
+                this.listLoading = true
                 let qyname = this.$refs.qyname.value.replace(/\s+/g, "");//公司名字
                 let qyindustry = this.$refs.qyindustry.value;//所属行业
                 let address = this.province+this.city+this.area+this.$refs.address.value.replace(/\s+/g, "");//公司详细地址
@@ -287,6 +288,7 @@ import { setTimeout } from 'timers';
                         break;
                     }
                 }
+                this.listLoading = false
             },
             remotxt(){
                 setTimeout(()=>{

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

@@ -191,7 +191,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                     store: me.store,
                     items:[{
                         xtype:'checkbox',
-                        id:'showSelectRecord',
+                        name:'showSelectRecord',
                         boxLabel:'已选中数据',
                         handler:function(b){
                             var grid = me;
@@ -227,7 +227,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                         }
                     }],
                     moveFirst: function() {
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (this.fireEvent('beforechange', this, 1) !== false) {
                                 this.store.loadPage(1);
                                 this.ownerCt.selModel.noChange = true;
@@ -243,7 +243,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                         var me = this,
                             store = me.store,
                             prev = store.currentPage - 1;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (prev > 0) {
                                 if (me.fireEvent('beforechange', me, prev) !== false) {
                                     store.previousPage();
@@ -262,7 +262,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                             store = me.store,
                             total = me.getPageData().pageCount,
                             next = store.currentPage + 1;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (next <= total) {
                                 if (me.fireEvent('beforechange', me, next) !== false) {
                                     store.nextPage();
@@ -279,7 +279,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                     moveLast: function() {
                         var me = this,
                             last = me.getPageData().pageCount;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (me.fireEvent('beforechange', me, last) !== false) {
                                 me.store.loadPage(last);
                                 this.ownerCt.selModel.noChange = true;
@@ -295,7 +295,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                         var me = this,
                             store = me.store,
                             current = store.currentPage;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (me.fireEvent('beforechange', me, current) !== false) {
                                 store.loadPage(current);
                                 this.ownerCt.selModel.noChange = true;

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

@@ -201,7 +201,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                     store: me.store,
                     items:[{
                         xtype:'checkbox',
-                        id:'showSelectRecord',
+                        name:'showSelectRecord',
                         boxLabel:'已选中数据',
                         handler:function(b){
                             var grid = me;
@@ -237,7 +237,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                         }
                     }],
                     moveFirst: function() {
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (this.fireEvent('beforechange', this, 1) !== false) {
                                 this.store.loadPage(1);
                                 this.ownerCt.selModel.noChange = true;
@@ -253,7 +253,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                         var me = this,
                             store = me.store,
                             prev = store.currentPage - 1;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (prev > 0) {
                                 if (me.fireEvent('beforechange', me, prev) !== false) {
                                     store.previousPage();
@@ -272,7 +272,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                             store = me.store,
                             total = me.getPageData().pageCount,
                             next = store.currentPage + 1;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (next <= total) {
                                 if (me.fireEvent('beforechange', me, next) !== false) {
                                     store.nextPage();
@@ -289,7 +289,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                     moveLast: function() {
                         var me = this,
                             last = me.getPageData().pageCount;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (me.fireEvent('beforechange', me, last) !== false) {
                                 me.store.loadPage(last);
                                 this.ownerCt.selModel.noChange = true;
@@ -305,7 +305,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                         var me = this,
                             store = me.store,
                             current = store.currentPage;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (me.fireEvent('beforechange', me, current) !== false) {
                                 store.loadPage(current);
                                 this.ownerCt.selModel.noChange = true;

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -187,6 +187,10 @@ Ext.define('saas.view.core.report.ReportPanel', {
             autoLoad: me.autoLoad,
             pageSize: 15,
             data: [],
+            sorters: {
+                property: me.groupField || 'id',
+                direction: 'ASC'
+            },
             proxy: {
                 type: 'ajax',
                 url: me.listUrl,

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

@@ -82,7 +82,8 @@ Ext.define('saas.view.document.customer.BasePanel', {
         },{
             text : "客户简称", 
             width : 150.0, 
-            dataIndex : "cu_shortname"
+            dataIndex : "cu_shortname",
+            hidden: true
         }, 
         {
             text : "客户名称", 

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

@@ -44,7 +44,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype: 'textfield',
         name: 'cu_shortname',
         fieldLabel: '客户简称',
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        hidden: true
     },{
         editable:false,
         xtype : "remotecombo", 
@@ -231,8 +232,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         detnoColumn: 'cc_detno',
         showCount: false,
         deleteDetailUrl:'/api/document/customer/deletecontact',
-        height:145,
-        emptyRows: 3,
+        // height:145,
+        // emptyRows: 3,
         columns : [
             {
                 text : "ID", 
@@ -265,7 +266,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "cc_tel", 
-                width:110 
+                width:200 
             },
             {
                 allowBlank:true,
@@ -296,8 +297,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         detnoColumn: 'ca_detno',
         showCount: false,
         deleteDetailUrl:'/api/document/customer/deleteaddress',
-        height:145,
-        emptyRows: 3,
+        // height:145,
+        // emptyRows: 3,
         columns : [
             {
                 text : "ID", 
@@ -339,7 +340,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     hideTrigger:true,
                 },
                 dataIndex : "ca_phone", 
-                width:110  
+                width:200  
             },
             {
                 text : "默认地址", 

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

@@ -76,7 +76,8 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         },{
             text : "供应商简称", 
             width : 150.0, 
-            dataIndex : "ve_shortname" 
+            dataIndex : "ve_shortname",
+            hidden: true
         }, {
             text : "供应商名称", 
             dataIndex : "ve_name", 

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

@@ -44,7 +44,8 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype: 'textfield',
         name: 've_shortname',
         fieldLabel: '供应商简称',
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        hidden: true
     },{
         xtype: 'hidden',
         name: 've_status',
@@ -259,7 +260,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "vc_tel", 
-                width:110 
+                width:200 
             },
             {
                 allowBlank:true,

frontend/saas-web/app/view/home/charts/MonthSale.js

@@ -48,7 +48,7 @@ Ext.define('saas.view.home.charts.MonthSale', {
                     angleField: 'y',
                     donut: 55,
                     label: {
-                        field: 'z',
+                        field: 'x',
                         display: 'inside',
                         renderer: me.onLabelRender,
                         color: '#fff',

frontend/saas-web/app/view/home/charts/MonthSale.scss

@@ -11,6 +11,7 @@
                 font-size: 12px;
                 border: none !important;
                 outline: none !important;
+                padding-right: 0;
                 text-align: left;
 
                 .x-legend-item-marker {

frontend/saas-web/app/view/home/charts/ProfitDetail.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
                 },
                 axes: [{
                     type: 'category',
-                    fields: ['z'],
+                    fields: ['x'],
                     position: 'bottom',
                     label: {
                         fontSize: '12px',
@@ -60,7 +60,7 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
                 }],
                 series: [{
                     type: 'bar',
-                    xField: 'z',
+                    xField: 'x',
                     yField: ['y'],
                     bind: {
                         style: {
@@ -81,7 +81,10 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
     },
 
     onCategoryLabelRender: function(axis, label, layoutContent, lastLabel) {
-        return label;
+        var cWidth = this.gridSurface.el.dom.clientWidth,
+        dataCount = layoutContent.data.length,
+        maxLength = Math.ceil((cWidth/dataCount)/20);
+        return label.length > maxLength ? label.substring(0, maxLength) + '...' : label;
     },
 
     onBarTipRender: function (tooltip, record, item) {

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

@@ -75,6 +75,7 @@ Ext.define('saas.view.main.Main', {
                     height:45,
                     menu: {
                         cls:'x-main-menu sa-nav-menu',
+                        height: 66,
                         items: [{
                             text: '新手导航',
                             iconCls:'x-fa sa-navicon fa-comment-o',
@@ -132,6 +133,7 @@ Ext.define('saas.view.main.Main', {
                         html:'<img class="x-img x-box-item x-toolbar-item x-img-header" style="height:35px;width:35px;margin-top: 6px;margin-left: 14px;" src="{avatarUrl}" alt="">'
                     }, 
                     menu: {
+                        height: 98,
                         cls:'x-main-menu2 sa-nav-menu', 
                         items: [ {  
                             text: '账户中心',

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
 
     viewName: 'money-report-accountbalance',
 
-    groupField: 'bankcode',
+    groupField: 'bankname',
     groupHeaderTpl: '账户名称: {[values.rows[0].data.bankname]}',
     listUrl: '/api/money/report/accountBalance',
     defaultCondition: null,

frontend/saas-web/app/view/money/report/OtherIODetail.js

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.report.OtherIODetail', {
 
     viewName: 'money-report-otheriodetail',
 
-    groupField: 'bl_bankcode',
+    groupField: 'bankname',
     groupHeaderTpl: '资金账户: {[values.rows[0].data.bankname]}',
     listUrl: '/api/money/report/otheriodetail',
     defaultCondition: null,

frontend/saas-web/app/view/money/report/PayDetail.js

@@ -6,8 +6,8 @@ Ext.define('saas.view.money.report.PayDetail', {
     viewModel: 'money-report-paydetail',
     viewName: 'money-report-paydetail',
 
-    groupField:'pd_vendcode',
-    groupHeaderTpl: '供应商名称: {[values.rows[0].data.pd_vendcode]}',
+    groupField:'pd_vendname',
+    groupHeaderTpl: '供应商名称: {[values.rows[0].data.pd_vendname]}',
     listUrl: '/api/money/report/payDetail',
     defaultCondition: null,
     reportTitle: '应付账款明细表',

frontend/saas-web/app/view/money/report/RecDetail.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.money.report.RecDetail', {
 
     viewName: 'money-report-recdetail',
 
-    groupField: 'rd_custcode',
+    groupField: 'rd_custname',
     groupHeaderTpl: '客户名称: {[values.rows[0].data.rd_custname]}',
     listUrl: '/api/money/report/recDetail',
     defaultCondition: null,

frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
 
     viewName: 'purchase-report-purchasepay',
 //按供应商分组 付款金额合计
-    groupField: 'pu_vendcode',
+    groupField: 'pu_vendname',
     groupHeaderTpl: '供应商名称: {[values.rows[0].data.pu_vendname]}',
     listUrl: '/api/purchase/report/purchasePay',
     defaultCondition: null,

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
 
     viewName: 'sale-report-salerec',
 
-    groupField: 'rb_custcode',
+    groupField: 'rb_custname',
     groupHeaderTpl: '客户名称: {[values.rows[0].data.rb_custname]}',
     listUrl: '/api/sale/report/saleRec',
     defaultCondition: null,

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

@@ -144,7 +144,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '录入人',
             dataIndex: 'creatorName',
-            hidden :true
+            width :110
         }, {
             text: '审核人',
             dataIndex: 'sa_auditman',

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

@@ -146,6 +146,10 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'sa_seller',
             width: 90,
             hidden :true
+        }, {
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width :110
         },{
             text: '审核人',
             dataIndex: 'pi_auditman',

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

@@ -140,6 +140,10 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'sa_seller',
             width: 90,
             hidden :true
+        }, {
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width :110
         },{
             text: '审核人',
             dataIndex: 'pi_auditman',

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

@@ -85,7 +85,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -97,7 +97,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -41,24 +41,20 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                            from:'realname',to:'pi_auditman',
                         }],
                     }) ;   
 

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -45,7 +45,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         xtype: 'warehouseDbfindTrigger',
         name: 'wh_description',
         bind: '{form.wh_description}',
-        fieldLabel: '仓库',
+        emptyText: '仓库',
         dbfinds:[{
             from:'wh_description',to:'wh_description'
         }],
@@ -56,7 +56,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         storeUrl:'/api/document/producttype/getCombo',
         name : "pr_kind",
         bind: '{form.pr_kind}',
-        fieldLabel : "类型",
+        emptyText : "类型",
         hiddenBtn:true,
         //width:150
     },{

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

@@ -80,7 +80,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -92,7 +92,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'ma_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -17,24 +17,20 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=ma_auditman]':{
+            },'accountDbfindTrigger[name=ma_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'ma_auditman'
+                            from:'realname',to:'ma_auditman'
                         }],
                     }) ;   
 

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

@@ -67,7 +67,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         showDetail: true,
         emptyText:'请输入仓库编号或名称'
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -79,7 +79,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -39,24 +39,20 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                            from:'realname',to:'pi_auditman',
                         }],
                     }) ;   
 

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

@@ -68,7 +68,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         showDetail: true
     }, {
         xtype: 'employeeDbfindTrigger',
-        name: 'creatorName',
+        name: 'accountDbfindTrigger',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
         getCondition: function(value) {
@@ -80,7 +80,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         }
     }, {
         xtype: 'employeeDbfindTrigger',
-        name: 'pi_auditman',
+        name: 'accountDbfindTrigger',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'
     }],

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

@@ -39,24 +39,20 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                            from:'realname',to:'pi_auditman',
                         }],
                     }) ;   
 

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
 
     viewName: 'stock-report-prodiodetail',
   //  按物料分组
-    groupField: 'pd_prodcode',
+    groupField: 'pr_detail',
     groupHeaderTpl: '物料名称: {[values.rows[0].data.pr_detail]}',
     listUrl: '/api/storage/report/prodioDetail',
     defaultCondition: null,

frontend/saas-web/app/view/viewport/ViewportController.js

@@ -239,7 +239,7 @@ Ext.define('saas.view.viewport.ViewportController', {
      */
     syncSessionToPortal: function(session) {
         const frame = window.frames[window.frames.length - 1];
-        frame.postMessage(session ? JSON.stringify(session) : '', '*');
+        frame.postMessage(session ? JSON.stringify(session.data) : '', '*');
     },
     /**
      * 跳转门户