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

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

@@ -0,0 +1,59 @@
+package com.usoftchina.saas.commons.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * @Description 意见反馈
+ * @Author chenwei
+ * @Date 2018/12/22
+ */
+public class Feedback extends CommonBaseEntity implements Serializable {
+
+    private String fb_msg;
+    private String fb_mobile;
+    private String fb_emial;
+    private String fb_qq;
+    private String fb_wechar;
+
+    public String getFb_msg() {
+        return fb_msg;
+    }
+
+    public void setFb_msg(String fb_msg) {
+        this.fb_msg = fb_msg;
+    }
+
+    public String getFb_mobile() {
+        return fb_mobile;
+    }
+
+    public void setFb_mobile(String fb_mobile) {
+        this.fb_mobile = fb_mobile;
+    }
+
+    public String getFb_emial() {
+        return fb_emial;
+    }
+
+    public void setFb_emial(String fb_emial) {
+        this.fb_emial = fb_emial;
+    }
+
+    public String getFb_qq() {
+        return fb_qq;
+    }
+
+    public void setFb_qq(String fb_qq) {
+        this.fb_qq = fb_qq;
+    }
+
+    public String getFb_wechar() {
+        return fb_wechar;
+    }
+
+    public void setFb_wechar(String fb_wechar) {
+        this.fb_wechar = fb_wechar;
+    }
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/FeedbackController.java

@@ -0,0 +1,34 @@
+package com.usoftchina.saas.commons.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.po.Feedback;
+import com.usoftchina.saas.commons.service.FeedbackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 意见反馈
+ * @Author chenwei
+ * @Date 2018/12/22
+ */
+@RestController
+@RequestMapping("/feedBack")
+public class FeedbackController {
+
+    @Autowired
+    private FeedbackService feedbackService;
+
+    /**
+     * 意见反馈
+     * @return
+     */
+    @PostMapping("/save")
+    public Result saveFeedback(@RequestBody Feedback feedback){
+        feedbackService.save(feedback);
+        return Result.success();
+    }
+
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/ShareController.java

@@ -74,6 +74,7 @@ public class ShareController {
      * @return
      */
     @GetMapping("/pc")
+    @ResponseBody
     public Result getPcUrl(String basePath, String companyName, @RequestParam(value = "delay", defaultValue = "1")Long delay){
         Long companyId = BaseContextHolder.getCompanyId();
         String username = BaseContextHolder.getUserName();

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/FeedbackMapper.java

@@ -0,0 +1,9 @@
+package com.usoftchina.saas.commons.mapper;
+
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.commons.po.Feedback;
+
+public interface FeedbackMapper extends CommonBaseMapper<Feedback> {
+
+
+}

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

@@ -0,0 +1,12 @@
+package com.usoftchina.saas.commons.service;
+
+import com.usoftchina.saas.commons.po.Feedback;
+
+public interface FeedbackService {
+    /**
+     * 保存
+     * @param feedback
+     * @return
+     */
+    boolean save(Feedback feedback);
+}

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

@@ -0,0 +1,26 @@
+package com.usoftchina.saas.commons.service.impl;
+
+import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.mapper.FeedbackMapper;
+import com.usoftchina.saas.commons.po.Feedback;
+import com.usoftchina.saas.commons.service.FeedbackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 意见反馈
+ * @Author chenwei
+ * @Date 2018/12/22
+ */
+@Service
+public class FeedbackServiceImpl extends CommonBaseServiceImpl<FeedbackMapper, Feedback> implements FeedbackService {
+
+    @Autowired
+    private FeedbackMapper feedbackMapper;
+
+    @Override
+    public boolean save(Feedback feedback){
+        return feedbackMapper.insertSelective(feedback) > 0;
+    }
+
+}

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

@@ -16,7 +16,7 @@ public class BomDetail extends CommonBaseEntity implements Serializable {
 
     private String bd_unit;
 
-    private Integer bd_baseqty;
+    private Double bd_baseqty;
 
     private String bd_replace;
 
@@ -82,11 +82,11 @@ public class BomDetail extends CommonBaseEntity implements Serializable {
         this.bd_unit = bd_unit == null ? null : bd_unit.trim();
     }
 
-    public Integer getBd_baseqty() {
+    public Double getBd_baseqty() {
         return bd_baseqty;
     }
 
-    public void setBd_baseqty(Integer bd_baseqty) {
+    public void setBd_baseqty(Double bd_baseqty) {
         this.bd_baseqty = bd_baseqty;
     }
 

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

@@ -8,7 +8,7 @@
     <result column="bd_sonid" property="bd_sonid" jdbcType="INTEGER" />
     <result column="bd_soncode" property="bd_soncode" jdbcType="VARCHAR" />
     <result column="bd_unit" property="bd_unit" jdbcType="VARCHAR" />
-    <result column="bd_baseqty" property="bd_baseqty" jdbcType="INTEGER" />
+    <result column="bd_baseqty" property="bd_baseqty" jdbcType="DOUBLE" />
     <result column="bd_replace" property="bd_replace" jdbcType="VARCHAR" />
     <result column="bd_remark" property="bd_remark" jdbcType="VARCHAR" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
@@ -73,7 +73,7 @@
       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}, 
+      #{bd_baseqty,jdbcType=DOUBLE}, #{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},
@@ -157,7 +157,7 @@
         #{bd_unit,jdbcType=VARCHAR},
       </if>
       <if test="bd_baseqty != null" >
-        #{bd_baseqty,jdbcType=INTEGER},
+        #{bd_baseqty,jdbcType=DOUBLE},
       </if>
       <if test="bd_replace != null" >
         #{bd_replace,jdbcType=VARCHAR},
@@ -219,7 +219,7 @@
         bd_unit = #{bd_unit,jdbcType=VARCHAR},
       </if>
       <if test="bd_baseqty != null" >
-        bd_baseqty = #{bd_baseqty,jdbcType=INTEGER},
+        bd_baseqty = #{bd_baseqty,jdbcType=DOUBLE},
       </if>
       <if test="bd_replace != null" >
         bd_replace = #{bd_replace,jdbcType=VARCHAR},
@@ -261,7 +261,7 @@
       bd_sonid = #{bd_sonid,jdbcType=INTEGER},
       bd_soncode = #{bd_soncode,jdbcType=VARCHAR},
       bd_unit = #{bd_unit,jdbcType=VARCHAR},
-      bd_baseqty = #{bd_baseqty,jdbcType=INTEGER},
+      bd_baseqty = #{bd_baseqty,jdbcType=DOUBLE},
       bd_replace = #{bd_replace,jdbcType=VARCHAR},
       bd_remark = #{bd_remark,jdbcType=VARCHAR},
       companyId = #{companyId,jdbcType=INTEGER},
@@ -287,7 +287,7 @@
       (
       #{item.bd_bomid,jdbcType=INTEGER}, #{item.bd_detno,jdbcType=INTEGER},
       #{item.bd_sonid,jdbcType=INTEGER}, #{item.bd_soncode,jdbcType=VARCHAR}, #{item.bd_unit,jdbcType=VARCHAR},
-      #{item.bd_baseqty,jdbcType=INTEGER}, #{item.bd_replace,jdbcType=VARCHAR}, #{item.bd_remark,jdbcType=VARCHAR},
+      #{item.bd_baseqty,jdbcType=DOUBLE}, #{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},
@@ -316,7 +316,7 @@
           bd_unit = #{item.bd_unit,jdbcType=VARCHAR},
         </if>
         <if test="item.bd_baseqty != null" >
-          bd_baseqty = #{item.bd_baseqty,jdbcType=INTEGER},
+          bd_baseqty = #{item.bd_baseqty,jdbcType=DOUBLE},
         </if>
         <if test="item.bd_replace != null" >
           bd_replace = #{item.bd_replace,jdbcType=VARCHAR},

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -31,7 +31,7 @@ Ext.define('saas.view.core.form.FormPanel', {
     remoteConfig: true, // 是否需要从远端读取form配置
     toolBtns: [], // 自定义按钮
     codeInHeader: true, // 单据编号显示在toolbar
-    invalidText: '表单校验有误，请检查', // 校验未通过提示内容
+    invalidText: '表单校验有误，请检查后重试', // 校验未通过提示内容
     dirtyAuditText: '表单数据有修改，是否先保存修改？', // 有修改时点击审核提示内容
     noDirtySaveText: '表单数据无修改', // 无修改点击保存提示内容
 

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

@@ -170,7 +170,8 @@ Ext.define('saas.view.document.product.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pr_vendname", 
-        fieldLabel : "供应商名称"
+        fieldLabel : "供应商名称",
+        readOnly: true
     },{
         ignore:true,
         readOnly:true,
@@ -237,7 +238,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.document.ProductDetail',
         detnoColumn: 'pd_detno',
-        showCount: false,
+        showCount: true,
         allowEmpty:true,
         // hidden: true,
         deleteDetailUrl:'/api/document/product/deleteDetail',

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

@@ -22,7 +22,8 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         listeners: {
             beforequery: function(f) {
                 return !!f.value;
-            }
+            },
+            change: 'pi_custname_change'
         }
     }, {
         xtype: 'condatefield',

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

@@ -15,5 +15,12 @@ Ext.define('saas.view.money.report.CustomerCheckController', {
                 }
             }
         });
+    },
+
+    pi_custname_change: function(field, value) {
+        var me = this,
+        reportPanel = me.getView();
+
+        reportPanel.reportTitle = '客户对账单(' + value + ')'
     }
 });

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

@@ -22,7 +22,8 @@ Ext.define('saas.view.money.report.VendorCheck', {
         listeners: {
             beforequery: function(f) {
                 return !!f.value;
-            }
+            },
+            change: 'pi_vendname_change'
         }
     }, {
     //     xtype: 'monthdatefield',

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

@@ -15,5 +15,12 @@ Ext.define('saas.view.money.report.VendorCheckController', {
                 }
             }
         });
+    },
+
+    pi_vendname_change: function(field, value) {
+        var me = this,
+        reportPanel = me.getView();
+
+        reportPanel.reportTitle = '供应商对账单(' + value + ')'
     }
 });

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

@@ -135,6 +135,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '税率(%)',
         dataIndex: 'pd_taxrate',
+        exportFormat: 'Integer',
         xtype: 'numbercolumn',
         width: 80
     }, {

frontend/saas-web/overrides/exporter/Stylesheet.js

@@ -10,50 +10,56 @@ Ext.define('saas.override.exporter.Stylesheet', {
         'Currency': '"$"#,##0.00',
         'Euro Currency': '"€"#,##0.00',
         /**  new  */
-        'Number0': function(v) {
-            return Ext.util.Format.number(v, '0');
-        },
-        'Number1': function(v) {
-            return Ext.util.Format.number(v, '0.0');
-        },
-        'Number2': function(v) {
-            return Ext.util.Format.number(v, '0.00');
-        },
-        'Number3': function(v) {
-            return Ext.util.Format.number(v, '0.000');
-        },
-        'Number4': function(v) {
-            return Ext.util.Format.number(v, '0.0000');
-        },
-        'Integer': function(v) {
-            return Ext.util.Format.number(v, '0');
-        },
+        // 'Number0': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 0, false);
+        //     return Number(t);
+        // },
+        'Number0': '#,##0',
+        // 'Number1': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 1, false);
+        //     return Number(t);
+        // },
+        'Number1': '#,##0.0',
+        // 'Number2': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+        //     return Number(t);
+        // },
+        'Number2': '#,##0.00',
+        // 'Number3': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 3, false);
+        //     return Number(t);
+        // },
+        'Number3': '#,##0.000',
+        // 'Number4': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 4, false);
+        //     return Number(t);
+        // },
+        'Number4': '#,##0.0000',
+        // 'Integer': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 0, false);
+        //     return Number(t);
+        // },
+        'Integer': '#,##0',
         // 'Total':function(v) {
-        //     var arr = (v + '.').split('.');
-        //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-        //     var format = '0,000.' + xr.join('');
-        //     return Ext.util.Format.number(v, format);
+        //     var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+        //     return Number(t);
         // },
         'Total': '#,##0.00',
-        'Amount': function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        },
-        'Quantity': function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        },
-        'Price': function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        },
-        // 'Price': '#,##0.00',
+        // 'Amount': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+        //     return Number(t);
+        // },
+        'Amount': '#,##0.00',
+        // 'Quantity': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 3, false);
+        //     return Number(t);
+        // },
+        'Quantity': '#,##0.000',
+        // 'Price': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 4, false);
+        //     return Number(t);
+        // },
+        'Price': '#,##0.00',
     },
 
 });

frontend/saas-web/overrides/exporter/file/Style.js

@@ -12,37 +12,35 @@ Ext.define('saas.override.exporter.file.Style', {
         }
 
         if(f === 'Number0') {
-            return Ext.util.Format.number(v, '0');
+            var t = saas.util.BaseUtil.numberFormat(v, 0, false);
+            return Number(t);
         }else if(f === 'Number1') {
-            return Ext.util.Format.number(v, '0.0');
+            var t = saas.util.BaseUtil.numberFormat(v, 1, false);
+            return Number(t);
         }else if(f === 'Number2') {
-            return Ext.util.Format.number(v, '0.00');
+            var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+            return Number(t);
         }else if(f === 'Number3') {
-            return Ext.util.Format.number(v, '0.000');
+            var t = saas.util.BaseUtil.numberFormat(v, 3, false);
+            return Number(t);
         }else if(f === 'Number4') {
-            return Ext.util.Format.number(v, '0.0000');
+            var t = saas.util.BaseUtil.numberFormat(v, 4, false);
+            return Number(t);
         }else if(f === 'Integer') { // new
-            return Ext.util.Format.number(v, '0');
+            var t = saas.util.BaseUtil.numberFormat(v, 0, false);
+            return Number(t);
         }else if(f === 'Total') {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+            return Number(t);
         }else if(f === 'Amount') {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+            return Number(t);
         }else if(f === 'Quantity') {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            var t = saas.util.BaseUtil.numberFormat(v, 3, false);
+            return Number(t);
         }else if(f === 'Price') {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            var t = saas.util.BaseUtil.numberFormat(v, 4, false);
+            return Number(t);
         }else if(f === 'Currency'){
             return fmt.currency(v);
         }else if(f === 'Euro Currency') {