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

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

@@ -20,16 +20,16 @@ public interface EmployeeMapper extends CommonBaseMapper<Employee> {
 
     List<EmployeeDTO> selectEmployeeListByCondition(@Param("con") String con,@Param("companyId") Long companyId);
 
-    Integer validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
+    int validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
 
-    Integer validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long company);
+    int validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long company);
 
-    Integer validatePhoneWhenInsert(@Param("phone") String phone, @Param("companyId") Long companyId);
+    int validatePhoneWhenInsert(@Param("phone") String phone, @Param("companyId") Long companyId);
 
-    Integer validatePhoneWhenUpdate(@Param("phone") String phone, @Param("id") Long id, @Param("companyId") Long company);
+    int validatePhoneWhenUpdate(@Param("phone") String phone, @Param("id") Long id, @Param("companyId") Long company);
 
 
-    Integer validateNameAndCodeWhenInsert(@Param("code") String code,@Param("name") String em_name,@Param("companyId") Long companyId);
+    int validateNameAndCodeWhenInsert(@Param("code") String code,@Param("name") String em_name,@Param("companyId") Long companyId);
 
-    Integer validateNameAndCodeWhenUpdate(@Param("code") String code,@Param("name") String em_name,@Param("id") Long em_id,@Param("companyId") Long id);
+    int validateNameAndCodeWhenUpdate(@Param("code") String code,@Param("name") String em_name,@Param("id") Long id,@Param("companyId") Long companyId);
 }

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

@@ -65,10 +65,12 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
     @Override
     public DocBaseDTO saveFormData(Employee employee) {
         DocBaseDTO docBaseDTO = null;
-        String code = pushMaxnubmer(employee.getEm_code(), employee.getId());
+        Long companyId = BaseContextHolder.getCompanyId();
+        employee.setCompanyId(companyId);
         if(employee.getId() == 0){
+            String code = pushMaxnubmer(employee.getEm_code(), employee.getId());
             //检查名称和编号
-            int count = getMapper().validateNameAndCodeWhenInsert(code,employee.getEm_name(),BaseContextHolder.getCompanyId());
+            int count = getMapper().validateNameAndCodeWhenInsert(code,employee.getEm_name(),companyId);
             if (count>0) {
                 throw new BizException(BizExceptionCode.REPEAT_EMNAMECODE);
             }
@@ -77,7 +79,6 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
             if (count>0) {
                 throw new BizException(BizExceptionCode.REPEAT_TEL);
             }
-            employee.setCompanyId(BaseContextHolder.getCompanyId());
             employee.setCreatorId(BaseContextHolder.getUserId());
             employee.setCreateTime(new Date());
             employee.setCreatorName(BaseContextHolder.getUserName());
@@ -87,7 +88,7 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
             messageLogService.save(docBaseDTO);
         }else{
             //检查名称和编号
-            int count = getMapper().validateNameAndCodeWhenUpdate(code,employee.getEm_name(),employee.getId(),BaseContextHolder.getCompanyId());
+            int count = getMapper().validateNameAndCodeWhenUpdate(employee.getEm_code(),employee.getEm_name(),employee.getId(),companyId);
             if (count>0) {
                 throw new BizException(BizExceptionCode.REPEAT_EMNAMECODE);
             }

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

@@ -239,8 +239,9 @@
   <select id="validateNameAndCodeWhenInsert" resultType="int">
     select count(*) from Employee where (em_code = #{code} or em_name = #{name}) and companyId =#{companyId}
   </select>
-  <select id="validateNameAndCodeWhenUpdate" resultType="int" >
-    select count(*) from Employee where (em_code = #{code} or em_name = #{name}) and em_id !=#{id} and companyId =#{companyId}
+  
+  <select id="validateNameAndCodeWhenUpdate" resultType="int">
+    select count(*) from Employee where (em_code = #{code} or em_name = #{name}) and em_id !=#{id}  and companyId =#{companyId}
   </select>
 
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -404,7 +404,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         double pdQty=0, pdYqty=0;
         //检查转单状态
         String acceptstatus = purchase.getPu_acceptstatuscode();
-
         if (Status.CLOSE.name().equals(acceptstatus)){
             return Result.error(ExceptionCode.CLOSED_EXIST);
         }
@@ -530,12 +529,19 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
     @Transactional
     public void singleUnAudit(Long id) {
-        Purchase purchase = new Purchase();
+        //校验关闭状态
+        Purchase purchase = getMapper().selectByPrimaryKey(id);
+        //检查转单状态
+        String acceptstatus = purchase.getPu_acceptstatuscode();
+        if (Status.CLOSE.name().equals(acceptstatus)){
+            throw new  BizException(ExceptionCode.CLOSED_EXIST);
+        }
         //检查是否已转验收单
         Integer num = getMapper().checkTurnInstatus(id);
         if (num > 0) {
             throw new BizException(BizExceptionCode.PURCHASE_UNAUDIT_ERROR);
         }
+        purchase = new Purchase();
         //生成更新对象
         purchase.setId(id);
         purchase.setPu_status(Status.UNAUDITED.getDisplay());

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

@@ -415,7 +415,7 @@
     select count(1) from prodinout where pi_inoutno = #{pi_inoutno} and companyid = #{companyId}
   </select>
   <select id="validateCodeWhenUpdate" resultType="int" >
-    select count(1) from prodinout where pi_inoutno = #{pi_inoutno} and pi_id != #{id} and companyid != #{companyId}
+    select count(1) from prodinout where pi_inoutno = #{pi_inoutno} and pi_id != #{id} and companyid = #{companyId}
   </select>
 
   <select id="selectCodeById" resultType="string" parameterType="long">

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

@@ -402,7 +402,7 @@
     and purchasedetail.companyid= #{companyid}
   </select>
   <select id="checkCustomer" parameterType="long" resultType="integer">
-    select count(1) from sale left join  customer on sa_custid=cu_id  where  cu_statuscode='CLOSE' and cu_statuscode='CLOSE'
+    select count(1) from sale left join  customer on sa_custid=cu_id  where  cu_statuscode='CLOSE' and sa_id=#{id}
   </select>
   
   <!-- 销售订单转采购单-->

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

@@ -403,7 +403,7 @@
     select count(1) from prodinout where pi_inoutno = #{pi_inoutno} and companyid = #{companyId}
   </select>
   <select id="validateCodeWhenUpdate" resultType="int" >
-    select count(1) from prodinout where pi_inoutno = #{pi_inoutno} and pi_id != #{id} and companyid != #{companyId}
+    select count(1) from prodinout where pi_inoutno = #{pi_inoutno} and pi_id != #{id} and companyid = #{companyId}
   </select>
 
   <select id="selectCodeById" resultType="string" parameterType="long">

frontend/saas-web/app/Application.scss

@@ -230,6 +230,10 @@ body.launching {
 .x-column-header {
   background: #E5F7FF;
   border-right: 1px solid #ABDAFF;
+
+  &:last-child {
+    border: none;
+  }
 }
 
 .x-column-header-text-inner {
@@ -305,8 +309,6 @@ body.launching {
   background-color: #ffefbb;
 }
 
-
-
 /*滚动条样式*/
 div::-webkit-scrollbar {
   width: 10px;

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -282,9 +282,11 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             }
             if(c.xtype == 'datecolumn') {
                 Ext.applyIf(c, {
-                    exportStyle: {
-                        format: 'Medium Date'
-                    },
+                    format:'Y-m-d',
+                    //只导出年月日
+                    // exportStyle: {
+                    //     format: 'Medium Date'
+                    // },
                     exportRenderer: function (value) {
                         return Ext.Date.format(new Date(value), 'Y-m-d');
                     }

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

@@ -92,6 +92,8 @@ Ext.define('saas.view.core.report.ReportPanel', {
                             }, {
                                 text: 'Excel xml (包含分组合计)',
                                 cfg: {
+                                    type: 'excel03',
+                                    ext: 'xml',
                                     includeGroups: true,
                                     includeSummary: true
                                 }
@@ -319,6 +321,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
 
             if(c.xtype == 'datecolumn') {
                 Ext.applyIf(c, {
+                    // 这两个都要写上，才能控制到不同类型的导出格式，原因不明- -!
                     format: 'Y-m-d',
                     exportStyle: [{
                         type: 'csv',
@@ -326,6 +329,10 @@ Ext.define('saas.view.core.report.ReportPanel', {
                     }],
                     exportRenderer: function (value) {
                         return Ext.Date.format(new Date(value), 'Y-m-d');
+                    },
+                    // 下面这个方法不写会造成日期列求和，原因不明- -!
+                    exportSummaryRenderer: function(v) {
+                        return v;
                     }
                 })
             }else if(c.xtype == 'numbercolumn') {
@@ -336,14 +343,15 @@ Ext.define('saas.view.core.report.ReportPanel', {
                         var xr = (new Array(arr[1].length)).fill('0');
                         var format = '0.' + xr.join();
                         return Ext.util.Format.number(v, format);
-                    }
+                    },
                 });
             }
 
             if(c.summaryType) {
+                me.initSummaryType(c);
                 summarys.push({
                     field: c.dataIndex,
-                    operation: c.summaryType,
+                    operation: c.summaryTypeName,
                 });
             }
         })
@@ -353,6 +361,19 @@ Ext.define('saas.view.core.report.ReportPanel', {
         return columns;
     },
 
+    initSummaryType: function(column) {
+        var summaryType = column.summaryType;
+        if(Ext.isString(summaryType)) {
+            column.summaryTypeName = summaryType;
+        }
+        if(summaryType == 'sum') {
+            // 原生的求和方法使用的是Store.sum，在数据存在null时计算结果为NaN，这里重写一下
+            column.summaryType = function(records, values) {
+                return Ext.Array.sum(values);
+            }
+        }
+    },
+
     initSearchItems: function() {
         var me = this,
         items = me.searchItems,
@@ -470,6 +491,8 @@ Ext.define('saas.view.core.report.ReportPanel', {
             type = 'number';
         }else if(me.isContainsAny(xtypes, ['datefield', 'condatefield'])) {
             type = 'date';
+        }else if(me.isContainsAny(xtypes, ['dbfindtrigger'])) {
+            type = 'string';
         }else if(me.isContainsAny(xtypes, ['combobox', 'multicombo', 'combo', 'radiofield', 'radio'])) {
             type = 'enum';
         }else {
@@ -524,6 +547,8 @@ Ext.define('saas.view.core.report.ReportPanel', {
             to = value.to;
 
             conditionValue = Ext.Date.format(new Date(from), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(to), 'Y-m-d 23:59:59');
+        }else if(me.isContainsAny(xtypes, ['dbfindtrigger'])) {
+            conditionValue = value;
         }else if(me.isContainsAny(xtypes, ['combobox', 'combo'])) {
             conditionValue = '\'' + value + '\'';
         }else if(me.isContainsAny(xtypes, ['multicombo'])) {

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

@@ -1,3 +1,5 @@
+$border-color: #999;
+
 .x-report-panel {
     
     .x-report-grid {
@@ -5,14 +7,14 @@
         .x-panel-bodyWrap {
 
             .x-panel-default-outer-border-trl {
-                border-color: #999 !important;
+                border-color: $border-color !important;
             }
 
             .x-grid-header-ct {
-                border-color: #999 !important;
+                border-color: $border-color !important;
 
                 .x-column-header {
-                    border-color: #999 !important;
+                    border-color: $border-color !important;
 
                     .x-column-header-text-inner {
                         font-weight: bold;
@@ -21,25 +23,54 @@
             }
 
             .x-grid-body {
-                border-color: #999 !important;
+                border-color: $border-color !important;
                 border-width: 1px;
-                
-                .x-grid-cell-inner {
-                    border-right: 1px solid #999;
-                    border-bottom: 1px solid #999;
+
+                .x-grid-row {
+                    .x-grid-cell-inner {
+                        border-right: 1px solid $border-color;
+                        border-bottom: 1px solid $border-color;
+                    }
+
+                    .x-grid-cell {
+                        &:last-child {
+                            .x-grid-cell-inner {
+                                border-right: none;
+                            }
+                        }
+                    }
+                }
+
+                .x-grid-item {
+                    &:first-child {
+                        .x-grid-group-hd {
+                            border-top: none;
+                        }
+                    }
                 }
             }
 
             .x-toolbar-docked-bottom {
-                border-color: #999 !important;
+                border-color: $border-color !important;
                 border-width: 1px !important;
             }
             .x-panel-default-outer-border-rl {
-                border-right-color: #999 !important;
+                border-right-color: $border-color !important;
                 border-right-width: 1px !important;
-                border-left-color:  #999 !important;
+                border-left-color:  $border-color !important;
                 border-left-width: 1px !important;
             }
         }
+
+        .x-grid-group-hd {
+            border-top: 1px solid $border-color;
+            border-bottom: 1px solid $border-color;
+        }
+
+        .x-grid-row-summary {
+            .x-grid-cell {
+                border-top: none;
+            }
+        }
     }
 }

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

@@ -158,7 +158,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "employeeDbfindTrigger", 
         name : "cu_sellername", 
         fieldLabel : "业务员", 
-        editable:false,
         allowBlank : false, 
         columnWidth : 0.25
     },{

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

@@ -183,7 +183,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'datefield',
                 name:'bk_date',
                 fieldLabel:'建账日期',
-                format:'Y-m-d H:i:s',
+                format:'Y-m-d',
                 listeners:{
                     beforerender:function(d){
                         d.setValue(new Date())
@@ -631,12 +631,19 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         Ext.Array.each(names,function(name) {
             if(name){
                 var dataField = form.down('[name='+name+']');
-                if(dataField&&dataField.value){
-                    params[name] = dataField.value;
-                    params._value = dataField.value;
+                if(dataField){
+                    var value = dataField.getValue();
+    
+                    if(Ext.isDate(value)) {
+                        value = Ext.Date.format(value, 'Y-m-d H:i:s');
+                    }
+
+                    params[name] = value;
+                    params._value = value;
                 }
             }
         });
+
         var idField = form.down('[name='+belong.keyField+']');
         params[belong.keyField] = idField.value || 0;
         //保存接口

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

@@ -5,7 +5,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
     id: 'purchase_trend',
 
     bind: {
-        title: '近六月采购趋势图'
+        title: '近六月采购趋势图（万元）'
     },
 
     initComponent: function() {

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

@@ -5,7 +5,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
     id: 'sale_trend',
 
     bind: {
-        title: '近六月销售趋势图'
+        title: '近六月销售趋势图（万元）'
     },
 
     initComponent: function() {

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

@@ -5,7 +5,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
     id: 'stock_amount',
 
     bind: {
-        title: '近六月库存金额图'
+        title: '近六月库存金额图（万元）'
     },
 
     initComponent: function() {

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

@@ -85,6 +85,7 @@ Ext.define('saas.view.main.Main', {
                             }
                         },{
                             text: '用户手册',
+                            hidden:true,
                             //fa-address-book-o sa-userBook
                             iconCls:'x-fa sa-navicon  fa-address-book-o',
                             handler:function(){

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

@@ -59,7 +59,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             dataIndex: 've_beginapamount',
             xtype: 'numbercolumn',
-            width: 110,
+            width: 180,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -78,7 +78,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             xtype: 'numbercolumn',
-            width: 110,
+            width: 180,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -82,7 +82,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             xtype: 'numbercolumn',
             dataIndex:'rb_rdamount',
             xtype: 'numbercolumn',
-            width: 110,
+            width: 180,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -99,7 +99,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '客户编号',
             dataIndex: 'sa_custcode',
-            width: 0
+            hidden :true
         }, {
             text: '客户名称',
             dataIndex: 'sa_custname',
@@ -132,7 +132,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '录入人',
             dataIndex: 'creatorName',
-            width: 0
+            hidden :true
         }, {
             text: '审核人',
             dataIndex: 'sa_auditman',
@@ -140,7 +140,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '收货地址',
             dataIndex: 'sa_toplace',
-            width: 0
+            hidden :true
         }, {
             text: '备注',
             dataIndex: 'sa_remark',

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

@@ -124,7 +124,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 0
+            hidden :true
         }],
         relativeColumn: [{
             text: 'id',

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

@@ -159,7 +159,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }, {
                 text : "仓库ID", 
                 dataIndex : "pd_whid", 
-                width : 0
+                hidden :true
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whcode", 

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

@@ -121,11 +121,11 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '未含税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 0
+            hidden :true
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 0
+            hidden :true
         }],
         relativeColumn: [{
             text: 'id',

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

@@ -19,10 +19,10 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         emptyText:'请输入单号或物料',
         showDetail: true,
         getCondition: function(value) {
-            if(value != '') {
-                return  ' (pi_inoutno like\'%' + value + '%\' or pd_prodcode like \'%'+value+'%\' ) ';
-            }else {
+            if(value == ''|| value ==null) {
                 return '1=1';
+            }else {
+                return  ' (pi_inoutno like\'%' + value + '%\' or pd_prodcode like \'%'+value+'%\' ) ';
             }
         }
     }, {
@@ -66,10 +66,10 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         emptyText :'请输入仓库名或仓库编号',
         showDetail: true,
         getCondition: function(value) {
-            if(value != '') {
-                return  ' (pd_whcode like\'%' + value + '%\' or pd_whname like \'%'+value+'%\' or pd_inwhcode like\'%' + value + '%\' or pd_inwhname like \'%'+value+'%\') ';
-            }else {
+            if(value == '' || value == null) {
                 return '1=1';
+            }else {
+                return  ' (pd_whcode like\'%' + value + '%\' or pd_whname like \'%'+value+'%\' or pd_inwhcode like\'%' + value + '%\' or pd_inwhname like \'%'+value+'%\') ';                
             }
         }
     }],
@@ -167,7 +167,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 width: 80
             },{
                 text: '数量',
-                dataIndex: 'pd_inqty',
+                dataIndex: 'pd_outqty',
                 xtype:'numbercolumn',
                 width: 110
             },{

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

@@ -197,7 +197,8 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         text : "盘点库存", 
         dataIndex : "st_actqty", 
         width : 110.0, 
-        xtype : "numbercolumn",
+        // xtype : "numbercolumn",
+        align: 'right',
         editor : {
             xtype : "numberfield",
             decimalPrecision: 3,
@@ -224,7 +225,8 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         text : "盘盈盘亏", 
         dataIndex : "st_num", 
         width : 110.0, 
-        xtype : "numbercolumn",
+        // xtype : "numbercolumn",
+        aligin: 'right',
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');