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

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

@@ -17,9 +17,33 @@ public class QuotationRspDTO implements Serializable {
      * 拒绝采纳理由
      */
     private String refusereason;
+    /**
+     * 交期
+     */
+    private Long leadTime;
+    /**
+     * 税率
+     */
+    private Double taxRate;
 
     private List<InquiryReplayDTO> replies;
 
+    public Long getLeadTime() {
+        return leadTime;
+    }
+
+    public void setLeadTime(Long leadTime) {
+        this.leadTime = leadTime;
+    }
+
+    public Double getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(Double taxRate) {
+        this.taxRate = taxRate;
+    }
+
     public Short getAgreed() {
         return agreed;
     }

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

@@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -782,6 +783,8 @@ public class SaleServiceImpl implements SaleService{
                 if (!ObjectUtils.isEmpty(publicInquiryItem)) {
                     quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
                     quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
+                    quotationRspDTO.setLeadTime(publicInquiryItem.getLeadtime());
+                    quotationRspDTO.setTaxRate(new BigDecimal(publicInquiryItem.getTaxrate()).doubleValue());
                     //分段报价明细
                     List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
                     List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
@@ -829,6 +832,8 @@ public class SaleServiceImpl implements SaleService{
                 if (!ObjectUtils.isEmpty(publicInquiryItem)) {
                     quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
                     quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
+                    quotationRspDTO.setLeadTime(publicInquiryItem.getLeadtime());
+                    quotationRspDTO.setTaxRate(new BigDecimal(publicInquiryItem.getTaxrate()).doubleValue());
                     //分段报价明细
                     List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
                     List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();

frontend/saas-web/app/model/sale/SaleInDetail.js

@@ -10,7 +10,7 @@ Ext.define('saas.model.sale.SaleInDetail', {
         { name: 'pr_orispeccode', type: 'string' }, // 型号
         { name: 'pr_spec', type: 'string' }, // 规格
         { name: 'pd_inqty', type: 'float' }, // 数量
-        { name: 'pr_unit', type: 'float' }, // 单位
+        { name: 'pr_unit', type: 'string' }, // 单位
         { name: 'pd_netprice', type: 'float', // 单价
         },
         { name: 'pd_sendprice', type: 'float', // 含税单价

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

@@ -143,7 +143,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 },{
-                    text: '转存汇率(%)',
+                    text: '转存汇率',
                     xtype: 'numbercolumn',
                     dataIndex: 'ftd_rate',
                     width: 110,
@@ -151,12 +151,12 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 6, true);
                     },
                 }, {
-                        text: "结算号",
-                        dataIndex: "ftd_paycode",
-                        width: 150,
-                        editor: {
-                            xtype: ''
-                        }
+                    text: "结算号",
+                    dataIndex: "ftd_paycode",
+                    width: 150,
+                    editor: {
+                        xtype: ''
+                    }
                 },{
                     text: '结算方式',
                     dataIndex: 'ftd_paymethod',

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

@@ -129,12 +129,13 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                 }, {
                     text: '币别',
                     dataIndex: 'or_currency',
-                    width: 120
+                    align:'center',
+                    width: 65
                 } ,{
-                    text: '汇率(%)',
+                    text: '汇率',
                     dataIndex: 'or_rate',
                     xtype: 'numbercolumn',
-                    width: 120,
+                    width: 80,
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 6, false);
                     },
@@ -180,12 +181,13 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                 }, {
                     text: '币别',
                     dataIndex: 'or_currency',
-                    width: 120
+                    align:'center',
+                    width: 65
                 } ,{
-                    text: '汇率(%)',
+                    text: '汇率',
                     dataIndex: 'or_rate',
                     xtype: 'numbercolumn',
-                    width: 120,
+                    width: 80,
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 6, false);
                     },

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

@@ -127,12 +127,13 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                 }, {
                     text: '币别',
                     dataIndex: 'os_currency',
-                    width: 120
+                    align:'center',
+                    width: 65
                 } ,{
-                    text: '汇率(%)',
+                    text: '汇率',
                     dataIndex: 'os_rate',
                     xtype: 'numbercolumn',
-                    width: 120,
+                    width: 80,
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 6, false);
                     },
@@ -179,12 +180,13 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                 }, {
                     text: '币别',
                     dataIndex: 'os_currency',
-                    width: 120
+                    align:'center',
+                    width: 65
                 } ,{
-                    text: '汇率(%)',
+                    text: '汇率',
                     dataIndex: 'os_rate',
                     xtype: 'numbercolumn',
-                    width: 120,
+                    width: 80,
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 6, false);
                     },

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

@@ -100,12 +100,13 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                     }, {
                         text: '币别',
                         dataIndex: 'pb_currency',
-                        width: 120
+                        align:'center',
+                        width: 65
                     } ,{
-                        text: '汇率(%)',
+                        text: '汇率',
                         dataIndex: 'pb_rate',
                         xtype: 'numbercolumn',
-                        width: 120,
+                        width: 80,
                         renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 6, false);
                         },
@@ -160,12 +161,13 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 } ,{
                     text: '币别',
                     dataIndex: 'pb_currency',
-                    width: 120
+                    align:'center',
+                    width: 65
                 } ,{
-                    text: '汇率(%)',
+                    text: '汇率',
                     dataIndex: 'pb_rate',
                     xtype: 'numbercolumn',
-                    width: 120,
+                    width: 80,
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 6, false);
                     },

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

@@ -91,12 +91,13 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                 }, {
                     text: '币别',
                     dataIndex: 'rb_currency',
-                    width: 120
+                    align:'center',
+                    width: 65
                 } ,{
-                    text: '汇率(%)',
+                    text: '汇率',
                     dataIndex: 'rb_rate',
                     xtype: 'numbercolumn',
-                    width: 120,
+                    width: 80,
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 6, false);
                     },
@@ -152,12 +153,13 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                 }, {
                     text: '币别',
                     dataIndex: 'rb_currency',
-                    width: 120
+                    align:'center',
+                    width: 65
                 } ,{
-                    text: '汇率(%)',
+                    text: '汇率',
                     dataIndex: 'rb_rate',
                     xtype: 'numbercolumn',
-                    width: 120,
+                    width: 80,
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 6, false);
                     },

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

@@ -131,12 +131,13 @@ Ext.define('saas.view.money.verification.QueryPanel', {
                 },{
                     text: '币别',
                     dataIndex: 'vc_currency',
-                    width: 120
+                    align:'center',
+                    width: 65
                 } ,{
-                    text: '汇率(%)',
+                    text: '汇率',
                     dataIndex: 'vc_rate',
                     xtype: 'numbercolumn',
-                    width: 120,
+                    width: 80,
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 6, false);
                     },

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

@@ -235,6 +235,14 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

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

@@ -246,6 +246,14 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

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

@@ -252,6 +252,14 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

frontend/saas-web/app/view/sale/b2b/Business.js

@@ -123,67 +123,47 @@ Ext.define('saas.view.sale.b2b.Business', {
                     text: '发布时间',
                     xtype: 'datecolumn',
                     dataIndex: 'startDate',
-                    format: 'Y-m-d H:i:s'
+                    format: 'Y-m-d H:i:s',
+                    width: 150
                 }, {
                     text: '截止时间',
                     xtype: 'datecolumn',
-                    dataIndex: 'endDate'
+                    dataIndex: 'endDate',
+                    format: 'Y-m-d H:i:s',
+                    width: 150
                 }, {
-                    text: '操作',
+                    text: '报价状态',
                     dataIndex: 'quoted',
+                    textAlign: 'center',
                     renderer:function(val, meta, record,x,y,store, view){
-                        if(val == 0){
-                            return '<a style="color: #35BAF6; cursor: pointer;">点击报价</a>';
-                        }
-                        var id = record.id;
-                        var grid = view.up('grid');
-                        
-                        if(!view.tip) {
-                            view.tip = Ext.create('Ext.tip.ToolTip', {
-                                hidden: true,
-                                target: view.el,
-                                delegate: '.x-grid-cell-'+meta.column.id,
-                                trackMouse: true,
-                                renderTo: Ext.getBody(),	
-                                maxWidth :830,
-                                layout:'anchor',
-                                listeners: {								          
-                                    beforeshow: function updateTipBody(tip) {
-                                        var dg = Ext.getCmp('grid-'+id);
-                                        var record = grid.focusRecord;
-                                        if(record.data.qutations.agreed) {
-                                            this.setHtml(null);
-                                            var replies = record.data.qutations.replies;
-                                            dg.store.loadData(replies);
-                                            dg.show();
-                                        }else {
-                                            dg.hide();
-                                            this.setHtml(record.data.qutations.refusereason || '无');
-                                        }
-                                    }
-                                },
-                                items : [Ext.create('Ext.grid.Panel', {
-                                    id: 'grid-'+id,
-                                    frame:true,
-                                    anchor: '100% 100%',
-                                    width:205,
-                                    store:[],
-                                    columns: [{
-                                        text: '分段数量',
-                                        dataIndex: 'lapQty',
-                                        width: 110
-                                    }, {
-                                        text: '分段价格',
-                                        dataIndex: 'price',
-                                        width: 90
-                                    }]
-                                })]
-                            });
+                        if(val == 0) {
+                            return '<div style="text-align: center;color: #35BAF6;">未报价</div>';
+                        }else {
+                            var qutations = record.data.qutations;
+                            if(qutations.agreed == null) {
+                                return '<div style="text-align: center;color: #FBBC05;">已报价</div>';
+                            }else if(qutations.agreed == 1){
+                                return '<div style="text-align: center;color: green;">被采纳</div>';
+                            }else if(qutations.agreed == 0) {
+                                return '<div style="text-align: center;color:#ff6c00;">被拒绝</div>';
+                            }
                         }
-                        if(record.data.qutations.agreed) {
-                            return '<div style="text-align: center;color: green;">查看报价信息</div>';
+                    }
+                }, {
+                    text: '操作',
+                    dataIndex: 'quoted',
+                    renderer:function(val, meta, record,x,y,store, view){
+                        if(val == 0) {
+                            return '<div style="text-align: center;color: #35BAF6;cursor: pointer;">点击报价</div>';
                         }else {
-                            return '<div style="text-align: center;color:#ff6c00;">查看拒绝理由</div>';
+                            var qutations = record.data.qutations;
+                            if(qutations.agreed == null) {
+                                return '<div style="text-align: center;color: #FBBC05;cursor: pointer;">查看报价信息</div>';
+                            }else if(qutations.agreed == 1){
+                                return '<div style="text-align: center;color: green;cursor: pointer;">查看报价信息</div>';
+                            }else if(qutations.agreed == 0) {
+                                return '<div style="text-align: center;color:#ff6c00;">查看报价信息</div>';
+                            }
                         }
                     },
                     listeners: {
@@ -191,10 +171,8 @@ Ext.define('saas.view.sale.b2b.Business', {
                             var dataIndex = this.dataIndex;
                             var record = tableView.store.getAt(rowIdx);
                             var value = record.get(dataIndex);
-                            
-                            if(value == '0') {
-                                me.getController().showQuoteWin(record);
-                            }
+
+                            me.getController().showQuoteWin(record, !!value);
                         },
                     }
                 }],

frontend/saas-web/app/view/sale/b2b/BusinessController.js

@@ -2,15 +2,18 @@ Ext.define('saas.view.sale.b2b.BusinessController', {
     extend: 'saas.view.core.base.BasePanelController',
     alias: 'controller.sale-b2b-business',
 
-    showQuoteWin: function(record) {
+    showQuoteWin: function(record, quoted) {
         var me = this,
         view = me.getView();
 
         var win = Ext.getCmp();
         if(!win) {
-            win = Ext.create('saas.view.sale.business.QuoteWin', {
+            win = Ext.create('saas.view.sale.b2b.QuoteWin', {
+                width: view.getBox().width * 0.8,
+                height: view.getBox().height * 0.8,
                 record: record,
-                listView: view
+                listView: view,
+                quoted: quoted
             });
             view.add(win);
         }

frontend/saas-web/app/view/sale/b2b/QuoteWin.js

@@ -3,7 +3,9 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
     xtype: 'quotewin',
 
     title: '报价信息',
-    width: 600,
+    width: '800',
+    height: '400',
+    scrollable: true,
     cls: 'x-window-dbfind',
     closlayout: 'fit',
     modal: true,
@@ -12,6 +14,7 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
     initComponent: function () {
         var me = this;
         var record = me.record;
+        var quoted = me.quoted;
         Ext.apply(me, {
             items: [{
                 xtype: 'form',
@@ -20,7 +23,7 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
                     margin: '0 0 10 0',
                     labelAlign: 'right',
                     labelWidth: 90,
-                    columnWidth: 0.5,
+                    columnWidth: 0.25,
                 },
                 isValid: function (values) {
                     var leadtimeField = this.getForm().findField('leadtime');
@@ -91,7 +94,7 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
                             name: 'no',
                             type: 'int'
                         }, {
-                            name: 'step',
+                            name: 'lapQty',
                             type: 'int'
                         }, {
                             name: 'price',
@@ -101,7 +104,7 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
                     }),
                     columns: [{
                         text: '梯度',
-                        dataIndex: 'step',
+                        dataIndex: 'lapQty',
                         xtype: 'numbercolumn',
                         editor: {
                             xtype: "numberfield",
@@ -124,12 +127,22 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
                             return saas.util.BaseUtil.numberFormat(v, 4, true);
                         },
                     }]
+                }, {
+                    xtype: 'textfield',
+                    name: 'message',
+                    columnWidth: 1,
+                    fieldLabel: '回复信息',
+                    hidden: true
                 }]
             }],
             buttonAlign: 'center',
             buttons: [{
-                text: '确定',
+                text: quoted && record.get('qutations') && record.get('qutations').agreed == 0 ? '重新发起报价' : '确定',
                 handler: function () {
+                    if(quoted && record.get('qutations') && record.get('qutations').agreed != 0) {
+                        me.close();
+                        return;
+                    }
                     var win = this.up('window'),
                         form = win.down('form'),
                         grid = form.down('grid');
@@ -155,6 +168,31 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
         me.callParent(arguments);
     },
 
+    listeners: {
+        afterrender: function() {
+            var me = this,
+            form = me.down('form'),
+            leadtimeField = form.getForm().findField('leadtime'),
+            taxrateField = form.getForm().findField('taxrate'),
+            messageField = form.getForm().findField('message'),
+            grid = form.down('grid'),
+            store = grid.store,
+            record = me.record,
+            qutations = record.get('qutations'),
+            quoted = me.quoted;
+
+            if(quoted) {
+                leadtimeField.setValue(qutations.leadTime);
+                taxrateField.setValue(qutations.taxRate);
+                store.loadData(qutations.replies || []);
+                if(qutations.agreed == 0) {
+                    messageField.setValue(qutations.refusereason);
+                    messageField.setVisible(true);
+                }
+            }
+        }
+    },
+
     onQuote: function (values) {
         var view = this;
         var params = {
@@ -173,7 +211,7 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
             leadtime: values.leadtime, // 交期
             replies: values.detail.map(function(d) {
                 return {
-                    lapQty: d.step,
+                    lapQty: d.lapQty,
                     price: d.price
                 }
             }), // 梯度价格,

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

@@ -174,11 +174,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                     text: '客户名称',
                     dataIndex: 'sa_custname',
                     width: 200
-                }, {
-                    text: '币别',
-                    dataIndex: "sa_currency",
-                    align:'center',
-                    width: 65
                 },{
                     text: '审核状态',
                     align: 'center',
@@ -244,6 +239,14 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                     renderer : function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'sd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'sd_taxamount',

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

@@ -25,7 +25,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                     });
                 }
             },
-            'multidbfindtrigger[name=pd_prodcode]': {
+            'productMultiDbfindTrigger[name=pd_prodcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{

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

@@ -246,6 +246,14 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

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

@@ -246,6 +246,14 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

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

@@ -11,25 +11,22 @@ Ext.define('saas.view.stock.report.DataList', {
     listUrl: '/api/document/product/ReserveCost',
     defaultCondition: null,
     reportTitle: '物料库存数量金额表',
-    QueryWidth: 0.4,
+    QueryWidth: 0.65,
     printAble: false,
     exportAble: true,
     queryMode: 'MAIN',
 
     searchItems: [{
         xtype: 'productDbfindTrigger',
-        name: 'pr_code',
-        emptyText: '请输入物料编号、名称或规格',
+        name: 'pr_detail',
+        emptyText: '请输入物料编号或名称',
         columnWidth: 0.25
     }, {
         xtype: 'warehouseDbfindTrigger',
         name: 'wh_description',
         emptyText: '请输入仓库编号或名称',
         hidden:true,
-        columnWidth: 0.25,
-        getCondition: function (v) {
-            return "(upper(wh_code) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
-        }
+        columnWidth: 0.25
     }, {
         xtype: 'checkboxfield',
         name: 'toggle',