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

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

@@ -552,6 +552,11 @@ public class SaleServiceImpl implements SaleService{
     @Override
     public DocBaseDTO saleTurnPurchase(Long id) {
         Sale sale = saleMapper.selectByPrimaryKey(id);
+
+        //检查销售订单是否关闭
+        if(sale.getSa_sendstatuscode().equals("CLOSE")){
+            throw new BizException(BizExceptionCode.SALE_CLOSE.getCode(),BizExceptionCode.SALE_CLOSE.getMessage());
+        }
         List<SaleList> dateilList = saleListMapper.selectSaleListByCondition("sa_id="+id,BaseContextHolder.getCompanyId());
 
         //判断是否已转采购单

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/StocktakingServiceImpl.java

@@ -128,6 +128,7 @@ public class StocktakingServiceImpl extends CommonBaseServiceImpl<StockTakingMap
                 prodInDetail.setCompanyId(companyId);
                 prodInDetail.setCreateTime(new Date());
                 prodInDetail.setCreatorId(userId);
+                prodInDetail.setPd_remark("盘盈单");
                 prodIODetailMapper.insertSelective(prodInDetail);
             }
             DocBaseDTO baseDTOIN = new DocBaseDTO(inid,piInno,"其它入库单");
@@ -167,6 +168,7 @@ public class StocktakingServiceImpl extends CommonBaseServiceImpl<StockTakingMap
                 prodOutDetail.setCompanyId(companyId);
                 prodOutDetail.setCreateTime(new Date());
                 prodOutDetail.setCreatorId(userId);
+                prodOutDetail.setPd_remark("盘亏单");
                 prodIODetailMapper.insertSelective(prodOutDetail);
             }
             DocBaseDTO baseDTOOUT = new DocBaseDTO(outid,piOutno,"其它出库单");

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

@@ -52,15 +52,6 @@ Ext.define('saas.view.core.form.FormPanel', {
         me.initFormItems();
 
         me.defaultBtns = me.defaultBtns || [{
-            cls: 'x-formpanel-btn-blue',
-            xtype: 'button',
-            text: '刷新',
-            hidden: true,
-            bind: {
-                hidden: '{!id}'
-            },
-            handler: 'refresh'
-        }, {
             cls: 'x-formpanel-btn-blue',
             xtype: 'button',
             text: '新增',
@@ -104,6 +95,15 @@ Ext.define('saas.view.core.form.FormPanel', {
                 hidden:'{!showAuditBtn}'
             },
             handler: "auditBtnClick",
+        }, {
+            cls: 'x-formpanel-btn-white',
+            xtype: 'button',
+            text: '刷新',
+            hidden: true,
+            bind: {
+                hidden: '{!id}'
+            },
+            handler: 'refresh'
         }, {
             cls:'x-formpanel-btn-white',
             text:'打印',

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

@@ -84,42 +84,48 @@ Ext.define('saas.view.core.report.ReportPanel', {
                                     includeSummary: true
                                 }
                             }, {
-                                text: 'Excel xml',
-                                cfg: {
-                                    type: 'excel03',
-                                    ext: 'xml'
-                                }
-                            }, {
-                                text: 'Excel xml (包含分组合计)',
-                                cfg: {
-                                    type: 'excel03',
-                                    ext: 'xml',
-                                    includeGroups: true,
-                                    includeSummary: true
-                                }
-                            }, {
+                            //     text: 'Excel xml',
+                            //     cfg: {
+                            //         type: 'excel03',
+                            //         ext: 'xml'
+                            //     }
+                            // }, {
+                            //     text: 'Excel xml (包含分组合计)',
+                            //     cfg: {
+                            //         type: 'excel03',
+                            //         ext: 'xml',
+                            //         includeGroups: true,
+                            //         includeSummary: true
+                            //     }
+                            // }, {
                                 text: 'CSV',
                                 cfg: {
                                     type: 'csv'
                                 }
                             }, {
-                                text: 'TSV',
-                                cfg: {
-                                    type: 'tsv',
-                                    ext: 'csv'
-                                }
-                            }, {
-                                text: 'HTML',
-                                cfg: {
-                                    type: 'html'
-                                }
-                            }, {
-                                text: 'HTML (包含分组合计)',
+                                text: 'CSV (包含分组合计)',
                                 cfg: {
-                                    type: 'html',
+                                    type: 'csv',
                                     includeGroups: true,
                                     includeSummary: true
                                 }
+                            //     text: 'TSV',
+                            //     cfg: {
+                            //         type: 'tsv',
+                            //         ext: 'csv'
+                            //     }
+                            // }, {
+                            //     text: 'HTML',
+                            //     cfg: {
+                            //         type: 'html'
+                            //     }
+                            // }, {
+                            //     text: 'HTML (包含分组合计)',
+                            //     cfg: {
+                            //         type: 'html',
+                            //         includeGroups: true,
+                            //         includeSummary: true
+                            //     }
                             }]
                         }
                     }]

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

@@ -30,7 +30,7 @@ Ext.define('saas.view.core.report.ReportPanelController', {
                 }
                 //font:
             },
-            fileName: title + Ext.Date.format(new Date(),'Y-m-d_H-i-s') +'.' + (btn.cfg.ext || btn.cfg.type)
+            fileName: title + Ext.Date.format(new Date(),'Y-m-d H-i-s') +'.' + (btn.cfg.ext || btn.cfg.type)
         }, btn.cfg);
         grid.store.exportPageSize = 5000;
         grid.store.exportNumber = 1;