merge

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

@@ -23,6 +23,7 @@
     <result column="bk_text3" property="bk_text3" jdbcType="VARCHAR" />
     <result column="bk_text4" property="bk_text4" jdbcType="VARCHAR" />
     <result column="bk_text5" property="bk_text5" jdbcType="VARCHAR" />
+    <result column="bk_remark" property="bk_remark" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.document.entities.Bankinformation" extends="BaseResultMap" >
     <result column="bk_remark" property="bk_remark" jdbcType="LONGVARCHAR" />
@@ -30,7 +31,7 @@
   <sql id="Base_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount, 
     bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid, 
-    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5
+    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark
   </sql>
   <sql id="Blob_Column_List" >
     bk_remark

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

@@ -428,6 +428,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_inoutno(piInoutno);
         targetPi.setPi_class(BillCodeSeq.PURCHASEOUT.getName());
         targetPi.setPi_date(new Date());
+        targetPi.setPi_status("未审核");
+        targetPi.setPi_statuscode("UNAUDITED");
         targetPi.setPi_recorddate(new Date());
         targetPi.setPi_vendid(sourcePi.getPi_vendid());
         targetPi.setPi_vendcode(sourcePi.getPi_vendcode());

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
 management:
   endpoints:
     web:

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

@@ -96,7 +96,7 @@
             <if test="companyId != null">
               and   purchase.companyId = #{companyId}
             </if>
-        </where>  order by pu_id desc,pd_detno desc
+        </where>  order by pu_date desc
     </select>
 
     <select id="selectPurchaseBycondition"  resultMap="BaseResultMap">

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

@@ -91,7 +91,7 @@
             <if test="companyId != null">
                 and   sale.companyId = #{companyId}
             </if>
-        </where>  order by sd_detno desc
+        </where>  order by sa_date desc
     </select>
 
     <select id="selectSaleByCondition" resultMap="BaseResultMap">

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/report/ProdinoutCountView.java

@@ -10,4 +10,23 @@ import java.io.Serializable;
  */
 @Data
 public class ProdinoutCountView implements Serializable{
+
+    private String  pwm_yearmonth;
+    private String pr_kind;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String wh_description;
+    private Double pwm_beginqty;
+    private Double pwm_beginamount;
+    private Double pwm_nowinqty;
+    private Double pwm_nowinamount;
+    private Double pwm_nowoutqty;
+    private Double pwm_nowoutamount;
+    private Double pwm_endqty;
+    private Double pwm_endamount;
+    private Integer companyid;
+
+
 }

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

@@ -22,6 +22,27 @@
   </resultMap>
 
 
+  <resultMap id="ProdinoutCountMap" type="com.usoftchina.saas.storage.po.report.ProdinoutCountView">
+    <result column="pwm_yearmonth" jdbcType="VARCHAR" property="pwm_yearmonth" />
+    <result column="pr_kind" jdbcType="VARCHAR" property="pr_kind" />
+    <result column="pr_code" jdbcType="VARCHAR" property="pr_code" />
+    <result column="pr_detail" jdbcType="VARCHAR" property="pr_detail" />
+    <result column="pr_spec" jdbcType="VARCHAR" property="pr_spec" />
+    <result column="pr_unit" jdbcType="VARCHAR" property="pr_unit" />
+    <result column="wh_description" jdbcType="VARCHAR" property="wh_description" />
+    <result column="pwm_beginqty" jdbcType="DOUBLE" property="pwm_beginqty" />
+    <result column="pwm_beginamount" jdbcType="DOUBLE" property="pwm_beginamount" />
+    <result column="pwm_nowinqty" jdbcType="DOUBLE" property="pwm_nowinqty" />
+    <result column="pwm_nowinamount" jdbcType="DOUBLE" property="pwm_nowinamount" />
+    <result column="pwm_nowoutqty" jdbcType="DOUBLE" property="pwm_nowoutqty" />
+    <result column="pwm_nowoutamount" jdbcType="DOUBLE" property="pwm_nowoutamount" />
+    <result column="pwm_endqty" jdbcType="DOUBLE" property="pwm_endqty" />
+    <result column="pwm_endamount" jdbcType="DOUBLE" property="pwm_endamount" />
+    <result column="companyid" jdbcType="INTEGER" property="companyid" />
+  </resultMap>
+
+
+
 
   <select id="selectProdiodetailByCondition" resultMap="ProdiodetailMap">
     select  *  from prodiodetail_view
@@ -37,8 +58,8 @@
   </select>
 
 
-  <select id="selectProdinoutCountByCondition"  resultMap="ProdiodetailMap">
-    select  *  from prodinout
+  <select id="selectProdinoutCountByCondition"  resultMap="ProdinoutCountMap">
+    select  *  from prodinoutcount_view
     <where>
       <if test="con != null">
         ${con}
@@ -47,7 +68,6 @@
         and  companyid = #{companyId}
       </if>
     </where>
-    order by pi_id
   </select>
 
 

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

@@ -247,6 +247,16 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 Ext.applyIf(c, {
                     format: 'Y-m-d'
                 })
+            }else if(c.xtype == 'numbercolumn') {
+                Ext.applyIf(c, {
+                    align: 'end',
+                    renderer : function(v) {
+                        var arr = (v + '.').split('.');
+                        var xr = (new Array(arr[1].length)).fill('0');
+                        var format = '0.' + xr.join();
+                        return Ext.util.Format.number(v, format);
+                    }
+                });
             }
         })
 

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
     //字段属性
     _title:'BOM资料',
     _idField: 'id',
-    _codeField: 'bo_mothercode',
+    _codeField: 'codefied',
     _statusField: 'bo_status',
     _statusCodeField: 'bo_statuscode',
     _readUrl:'/api/document/bom/read/',

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

@@ -101,7 +101,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: '期间',
             dataIndex: 'pd_ym',
-            hidden:true
+            hidden:true,
+            defaultValue: Ext.Date.format(new Date(), 'Ym'),
             // editor: {
             //     xtype: 'hidden',
                 // xtype: 'textfield,

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

@@ -65,15 +65,11 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
+                            "width": 100
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
+                            "width": 100
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -97,6 +97,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: '期间',
             dataIndex: 'rd_ym',
+            defaultValue: Ext.Date.format(new Date(), 'Ym'),
             // editor: {
             //     xtype: 'numberfield'
             // },

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

@@ -359,5 +359,37 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
             console.error(res);
             showToast('转单失败: ' + res.message);
         });
-     }
+     },
+    onSave: function() {
+        var me = this,
+            form = me.getView(),
+            viewModel = me.getViewModel(),
+            store1 = viewModel.get('detail0').detailStore,
+            store2 = viewModel.get('detail1').detailStore;
+
+        var valid = form.isValid();
+        if(!valid) {
+            showToast(form.invalidText);
+            return false;
+        }
+
+        var sum_rd_amount = store1.sum('rd_amount'); // 付款金额合计
+        var rb_discounts = viewModel.get('rb_discounts'); // 折扣金额
+        var sum_rbd_nowbalance = store2.sum('rbd_nowbalance'); // 本次核销金额合计
+
+        var flag = sum_rd_amount + rb_discounts - sum_rbd_nowbalance;
+
+        if(flag != 0) {
+            var t = flag > 0 ? '大' : '小';
+
+            showConfirm('提示', '收款金额' + t + '于本次折扣后核销金额，是否仍要保存？')
+                .then(function(y) {
+                    if(y == 'yes') {
+                        me.save();
+                    }
+                });
+        }else {
+            me.save();
+        }
+    }
 });

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.AccountBalance', {
 
     groupField: null,
     listUrl: '/api/money/report/accountBalance',
-    // listUrl: 'http://192.168.253.35:8880/report/accountBalance',
     defaultCondition: null,
     reportTitle: '资金账户收支明细',
     QueryWidth:0.1,
@@ -44,14 +43,16 @@ Ext.define('saas.view.money.report.AccountBalance', {
             dataIndex: 'kind'
         },{
             text:'收入',
-            dataIndex:'outamount'
+            dataIndex:'outamount',
+            xtype: 'numbercolumn'
         },{
             text:'支出',
-            dataIndex:'thisamount'
+            dataIndex:'thisamount',
+            xtype: 'numbercolumn'
         },{
             text: '账户余额',
-            xtype: 'numbercolumn',
-            dataIndex: 'pr_code'
+            dataIndex: 'pr_code',
+            xtype: 'numbercolumn'
         }, {
             text: '往来单位',
             dataIndex: 'bcode'

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
 
     groupField: null,
     listUrl: '/api/money/report/customercheck',
-    // listUrl: 'http://192.168.253.35:8880/report/customercheck',
     defaultCondition: null,
     reportTitle: '客户对账单',
     QueryWidth:0.1,
@@ -45,7 +44,8 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             width: 200
         }, {
             text: '序号',
-            dataIndex: 'pd_pdno'
+            dataIndex: 'pd_pdno',
+            xtype: 'numbercolumn'
         },{
             text:'客户编号',
             dataIndex:'pi_vendcode',
@@ -70,30 +70,43 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             text: '数量',
             xtype: 'numbercolumn',
             dataIndex: 'qty',
-            summaryType: 'count',
-            align: 'end'
+            xtype: 'numbercolumn'
         }, {
             text: '单价',
-            xtype: 'numbercolumn',
-            dataIndex: 'pd_orderprice'
+            dataIndex: 'pd_orderprice',
+            xtype: 'numbercolumn'
         }, {
             text: '税率',
-            xtype: 'numbercolumn',
-            dataIndex: 'pd_taxrate'
+            dataIndex: 'pd_taxrate',
+            xtype: 'numbercolumn'
         }, {
             text: '金额',
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '不含税单价',
-            xtype: 'numbercolumn',
-            dataIndex: 'pd_netprice'
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn'
         }, {
             text: '不含税金额',
             xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '备注',
             dataIndex: 'pd_remark'

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

@@ -4,12 +4,10 @@ Ext.define('saas.view.money.report.PayDetail', {
 
     controller: 'money-report-paydetail',
     viewModel: 'money-report-paydetail',
-
     viewName: 'money-report-paydetail',
 
     groupField: null,
     listUrl: '/api/money/report/payDetail',
-    // listUrl: 'http://192.168.253.35:8880/report/payDetail',
     defaultCondition: null,
     reportTitle: '应付账款明细表',
     QueryWidth:0.1,
@@ -59,17 +57,35 @@ Ext.define('saas.view.money.report.PayDetail', {
             text: '期初应付余额',
             xtype: 'numbercolumn',
             dataIndex: 've_beginapamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '本期付款金额',
             xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应付余额',
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应付日期',
             dataIndex: 'mustdate',
@@ -77,7 +93,13 @@ Ext.define('saas.view.money.report.PayDetail', {
             text: '单据总金额',
             xtype: 'numbercolumn',
             dataIndex: 'pi_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '备注',
             dataIndex: 'pi_remark'

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.RecDetail', {
 
     groupField: null,
     listUrl: '/api/money/report/recDetail',
-    // listUrl: 'http://192.168.253.35:8880/report/recDetail',
     defaultCondition: null,
     reportTitle: '应收账款明细',
     QueryWidth:0.1,
@@ -49,7 +48,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             width: 200
         },{
             text: '业务员',
-            dataIndex: 'PU_BUYERNAME',
+            dataIndex: 'pu_buyername',
             width: 200
         }, {
             text: '单据日期',
@@ -57,28 +56,47 @@ Ext.define('saas.view.money.report.RecDetail', {
             width: 200,
         }, {
             text: '序号',
-            dataIndex: 'pd_pdno'
+            dataIndex: 'pd_pdno',
+            xtype: 'numbercolumn'
         },{
             text:'期初应收',
             dataIndex:'cu_beginaramount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         },{
             text:'本期收款金额',
             xtype: 'numbercolumn',
             dataIndex:'pb_pdamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+            }
         },{
             text: '应收余额',
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应收日期',
             dataIndex: 'mustdate'
         }, {
             text: '单据总金额',
-            xtype: 'numbercolumn',
-            dataIndex: 'pi_total'
+            dataIndex: 'pi_total',
+            xtype: 'numbercolumn'
         }, {
             text: '备注',
             dataIndex: 'pd_unit'

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.VendorCheck', {
 
     groupField: null,
     listUrl: '/api/money/report/vendorCheck',
-    // listUrl: 'http://192.168.253.35:8880/report/vendorCheck',
     defaultCondition: null,
     reportTitle: '供应商对账单',
     QueryWidth:0.1,
@@ -68,29 +67,40 @@ Ext.define('saas.view.money.report.VendorCheck', {
             text: '采购数量',
             xtype: 'numbercolumn',
             dataIndex: 'qty',
-            summaryType: 'count',
-            align: 'end'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '单价',
-            xtype: 'numbercolumn',
-            dataIndex: 'pd_orderprice'
+            dataIndex: 'pd_orderprice',
+            xtype: 'numbercolumn'
         }, {
             text: '税率',
-            xtype: 'numbercolumn',
-            dataIndex: 'pd_taxrate'
+            dataIndex: 'pd_taxrate',
+            xtype: 'numbercolumn'
         }, {
             text: '金额',
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+            }
         }, {
             text: '不含税单价',
-            xtype: 'numbercolumn',
-            dataIndex: 'pd_netprice'
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn'
         }, {
             text: '不含税金额',
-            xtype: 'numbercolumn',
-            dataIndex: 'pd_nettotal'
+            dataIndex: 'pd_nettotal',
+            xtype: 'numbercolumn'
         }, {
             text: '备注',
             dataIndex: 'pd_remark'

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

@@ -22,14 +22,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
      _unAuditUrl: '/api/purchase/purchase/unAudit/',
      _deleteUrl:'/api/purchase/purchase/delete/',
      _turnInUrl:'/api/purchase/purchase/turnProdin/',
-
-    // _readUrl:'http://localhost:8800/purchase/read/',
-    // _saveUrl:'http://localhost:8800/purchase/save',
-    // _auditUrl:'http://localhost:8800/purchase/audit',
-    // _unAuditUrl:'http://localhost:8800/purchase/unAudit/',
-    // _deleteUrl:'http://localhost:8800/purchase/delete/',
-    // _turnInUrl:'http://localhost:8800/purchase/turnProdin/',
-
      initId:0,
  
      toolBtns: [{
@@ -319,7 +311,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "PU_REMARK", 
+        name : "pu_remark", 
         fieldLabel : "备注", 
         columnWidth : 1
     },
@@ -332,7 +324,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pu_auditman", 

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

@@ -22,17 +22,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _unAuditUrl:'/api/purchase/prodinout/unAudit/',
     _deleteUrl:'/api/purchase/prodinout/delete/',
     _turnOutUrl:'/api/purchase/prodinout/turnProdOut/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:8800/prodinout/read/',
-    // _saveUrl:'http://localhost:8800/prodinout/save',
-    // _auditUrl:'http://localhost:8800/prodinout/audit',
-    // _unAuditUrl:'http://localhost:8800/prodinout/unAudit/',
-    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
-    // _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
-
-
-
     initId:0,
 
     toolBtns: [{
@@ -46,14 +35,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true, 
@@ -61,25 +48,21 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_vendid", 
-        bind : "{pi_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         columnWidth : 0.0
     },{
         xtype: 'hidden',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank : false,
     },{
         xtype : "datefield", 
         name : "pi_date", 
-        bind : "{pi_date}", 
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25,
@@ -87,7 +70,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     },{
         xtype : "textfield", 
         name : "pi_total", 
-        bind : "{pi_total}", 
         fieldLabel : "总额", 
         allowBlank : true,
         readOnly: true,
@@ -95,14 +77,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_puid", 
-        bind : "{pi_puid}", 
         fieldLabel : "采购单id", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
         xtype : "hidden", 
         name : "pi_pucode", 
-        bind : "{pi_pucode}", 
         fieldLabel : "采购单号", 
         allowBlank : true, 
         columnWidth : 0.25
@@ -110,7 +90,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
         deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [

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

@@ -21,30 +21,17 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _auditUrl:'/api/purchase/prodinout/audit',
     _unAuditUrl:'/api/purchase/prodinout/unAudit/',
     _deleteUrl:'/api/purchase/prodinout/delete/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:8800/prodinout/read/',
-    // _saveUrl:'http://localhost:8800/prodinout/save',
-    // _auditUrl:'http://localhost:8800/prodinout/audit',
-    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
-
-
-
     initId:0,
-
     toolBtns: [],
-
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true, 
@@ -52,7 +39,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_vendid", 
-        bind : "{pi_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         hidden:true,
@@ -60,18 +46,15 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     },{
         xtype: 'hidden',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank : false,
     },{
         xtype : "datefield", 
         name : "pi_date", 
-        bind : "{pi_date}", 
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25,

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

@@ -65,7 +65,8 @@ Ext.define('saas.view.purchase.report.Purchase', {
         dataIndex: 'pu_date'
     }, {
         text: '序号',
-        dataIndex: 'pd_detno'
+        dataIndex: 'pd_detno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料编号',
         dataIndex: 'pd_prodcode'
@@ -97,7 +98,13 @@ Ext.define('saas.view.purchase.report.Purchase', {
         text: '采购数量',
         dataIndex: 'pd_qty',
         xtype: 'numbercolumn',
-        summaryType: 'count'
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '单价',
         dataIndex: 'pd_price',
@@ -110,7 +117,13 @@ Ext.define('saas.view.purchase.report.Purchase', {
         text: '金额',
         dataIndex: 'pd_total',
         xtype: 'numbercolumn',
-        summaryType: 'count'
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '不含税单价',
         dataIndex: 'pd_taxprice',

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
-        name: 'pu_date',
+        name: 'pb_recorddate',
         fieldLabel: '单据日期',
         columnWidth: 0.5
     }],
@@ -62,13 +62,8 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         text: '采购金额',
         xtype: 'numbercolumn',
         dataIndex: 'pbd_amount',
+        xtype: 'numbercolumn',
         width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -79,13 +74,8 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     }, {//∑求和
         text: '本次付款',
         dataIndex: 'pbd_nowbalance',
+        xtype: 'numbercolumn',
         width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -97,18 +87,12 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         text: '应付余额',
         xtype: 'numbercolumn',
         dataIndex: 'pb_pbdamount',
-        width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn'
     }, {
         text: '付款比例',
         //本次付款/采购金额*100%
         dataIndex: 'pb_payrate',
-        width: 200
+        xtype: 'numbercolumn'
     }, {
         text: '备注',
         dataIndex: 'pd_remark',

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

@@ -70,7 +70,8 @@ Ext.define('saas.view.sale.report.Sale', {
         dataIndex: 'sa_date'
     }, {
         text: '序号',
-        dataIndex: 'sd_detno'
+        dataIndex: 'sd_detno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料编号',
         dataIndex: 'sd_prodcode',
@@ -121,26 +122,16 @@ Ext.define('saas.view.sale.report.Sale', {
         text: '单价',
         xtype: 'numbercolumn',
         dataIndex: 'sd_price',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        xtype: 'numbercolumn'
     }, {
         text: '税率',
-        xtype: 'numbercolumn',
-        dataIndex: 'sd_taxrate'
+        dataIndex: 'sd_taxrate',
+        xtype: 'numbercolumn'
     }, {//∑金额
         text: '金额',
         xtype: 'numbercolumn',
         dataIndex: 'sd_total',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -152,12 +143,7 @@ Ext.define('saas.view.sale.report.Sale', {
         text: '不含税金额',
         xtype: 'numbercolumn',
         dataIndex: 'sd_nettotal',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');

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

@@ -81,32 +81,32 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'pr_unit'
     }, {
         text: '数量',
-        xtype: 'numbercolumn',
-        dataIndex: 'pd_outqty'
+        dataIndex: 'pd_outqty',
+        xtype: 'numbercolumn'
     }, {
         text: '单价',
-        xtype: 'numbercolumn',
-        dataIndex: 'pd_sendprice'
+        dataIndex: 'pd_sendprice',
+        xtype: 'numbercolumn'
     }, {
         text: '税率%',
-        xtype: 'numbercolumn',
-        dataIndex: 'pd_taxrate'
+        dataIndex: 'pd_taxrate',
+        xtype: 'numbercolumn'
     }, {
         text: '含税金额',
-        xtype: 'numbercolumn',
-        dataIndex: 'pd_ordertotal'
+        dataIndex: 'pd_ordertotal',
+        xtype: 'numbercolumn'
     }, {
         text: '成本金额',
-        xtype: 'numbercolumn',
-        dataIndex: 'pd_total'
+        dataIndex: 'pd_total',
+        xtype: 'numbercolumn'
     }, {
         text: '毛利润',
-        xtype: 'numbercolumn',
-        dataIndex: 'pd_profit'
+        dataIndex: 'pd_profit',
+        xtype: 'numbercolumn'
     }, {
         text: '毛利率%',
-        xtype: 'numbercolumn',
-        dataIndex: 'pd_profitpresent'
+        dataIndex: 'pd_profitpresent',
+        xtype: 'numbercolumn'
     }, {
         text : "备注", 
         dataIndex : "pd_remark",

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

@@ -65,11 +65,14 @@ Ext.define('saas.view.sale.report.SaleRec', {
     }, {
         text: '应收余额',
         xtype: 'numbercolumn',
+        dataIndex: 'rb_rbdamount'
     }, {
         text: '回款比例',
+        xtype: 'numbercolumn',
+        dataIndex: 'rb_backrate'
     }, {
         text: '备注',
-        dataIndex: 'rbd_remark'
+        dataIndex: 'rb_remark'
     }]
 
 });

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

@@ -54,7 +54,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
     }, {
         xtype : "datefield", 
         name : "sa_date", 
-        fieldLabel : "单据日期"
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_toplace", 
@@ -284,7 +286,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "datefield", 
         name : "sa_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_auditman", 

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

@@ -49,6 +49,13 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         name : "pi_custname", 
         fieldLabel : "客户名称",
         allowBlank:false,
+    }, {
+        xtype : "datefield", 
+        name : "pi_date", 
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        columnWidth : 0.25,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -270,7 +277,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "datefield", 
         name : "pi_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -110,12 +110,14 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '含税金额',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '未税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
@@ -165,22 +167,26 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -57,6 +57,13 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         name : "pi_custname", 
         fieldLabel : "客户名称",
         allowBlank:false,
+    }, {
+        xtype : "datefield", 
+        name : "pi_date", 
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        columnWidth : 0.25,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -275,7 +282,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         xtype : "datefield", 
         name : "pi_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -21,32 +21,18 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
     _auditUrl:'/api/storage/prodinout/audit',
     _unAuditUrl: '/api/storage/prodinout/unAudit/',
     _deleteUrl:'/api/storage/prodinout/delete/',
-
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:9000/prodinout/read/',
-    // _saveUrl:'http://localhost:9000/prodinout/save',
-    // _auditUrl:'http://localhost:9000/prodinout/audit',
-    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
-
-
-
-
     initId:0,
 
     toolBtns: [],
-
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true, 
@@ -54,61 +40,42 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_vendid", 
-        bind : "{pi_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         columnWidth : 0.0
     },{
         xtype: 'hidden',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称'
     },{
         xtype : "hidden", 
         name : "pi_custid", 
-        bind : "{pi_custid}", 
         fieldLabel : "客户ID", 
         allowBlank : true, 
         columnWidth : 0.0
     },{
         xtype: 'hidden',
         name: 'pi_custcode',
-        bind: '{pi_custcode}',
         fieldLabel: '客户编号'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_custname',
-        bind: '{pi_custname}',
         fieldLabel: '客户名称'
     },{
         xtype : "datefield", 
         name : "pi_date", 
-        bind : "{pi_date}", 
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25,
         defaultValue: new Date()
-    }
-    // ,{
-    //     xtype : "textfield", 
-    //     name : "pi_total", 
-    //     bind : "{pi_total}", 
-    //     fieldLabel : "总额", 
-    //     allowBlank : true,
-    //     readOnly: true,
-    //     columnWidth : 0.25
-    // }
-    ,
-     {
+    }, {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        // deleteDetailUrl:'http://localhost:9000/prodinout/deleteDetail/',
         deleteDetailUrl:'/api/storage/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
@@ -255,69 +222,31 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     xtype : "dbfindtrigger"
                 }
             }
-        //     ,
-        //     {
-        //         text : "单价", 
-        //         dataIndex : "pd_orderprice",
-        //         editor : {
-        //             xtype : "numberfield"
-        //         },   
-        //         width : 120.0, 
-        //         xtype : "numbercolumn", 
-        //         items : null
-        //     }, 
-        //    {
-        //         text : "含税金额", 
-        //         dataIndex : "pd_total", 
-        //         width : 120.0, 
-        //         xtype : "numbercolumn"
-        //     }, {
-        //         text : "税率", 
-        //         dataIndex : "pd_taxrate",
-        //         editor : {
-        //             xtype : "numberfield"
-        //         },   
-        //         width : 120.0, 
-        //         xtype : "numbercolumn", 
-        //         items : null
-        //     },
-        //     {
-        //         text : "未税金额", 
-        //         dataIndex : "pd_nettotal", 
-        //         xtype : "numbercolumn"
-        //     }
         ]
     }, {
-        xtype : "datefield", 
-        name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "录入日期", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 0.75
+    }, {
+        xtype : "textfield", 
+        name : "pi_recordman", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
         xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新日期", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_recorddate", 
+        fieldLabel : "录入日期",
+        readOnly:true
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_status", 
-        bind : "{pi_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_auditman", 
+        fieldLabel : "审核人", 
+        readOnly:true
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_statuscode", 
-        bind : "{pi_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        xtype : "datefield", 
+        name : "pi_auditdate", 
+        fieldLabel : "审核日期",
+        readOnly:true
     }]
 });

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

@@ -10,28 +10,24 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        bind: '{pi_inoutno}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        bind: '{pi_date}',
         fieldLabel: '单据日期',
         allowBlank: true,
         columnWidth: 0.5
     }, {
         xtype: 'textfield',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号',
         allowBlank: true,
         hidden:true,
@@ -39,26 +35,22 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
         showDetail: true
     }, {
         xtype: 'textfield',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
         columnWidth: 0.25,
@@ -81,26 +73,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             }
         }
     }],
-    moreQueryFormItems: [{
-        xtype: 'textfield',
-        name: 'pu_buyername',
-        bind: '{pu_buyername}',
-        fieldLabel: '采购员',
-        allowBlank: true
-    }, {
-        xtype: 'textfield',
-        name: 'pu_total',
-        bind: '{pu_total}',
-        fieldLabel: '金额',
-        allowBlank: true
-    }, {
-        xtype: 'condatefield',
-        name: 'pu_delivery',
-        bind: '{pu_delivery}',
-        fieldLabel: '交货日期',
-        allowBlank: true,
-        columnWidth: 1
-    }],
+    moreQueryFormItems: [],
     queryGridConfig: {
         idField:'id',
         codeField:'pi_inoutno',
@@ -108,7 +81,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         addXtype:'stock-appropriationinout-formpanel',
         defaultCondition:' pi_class = \'调拨单\'',
         baseVastUrl:'/api/storage/prodinout/',
-        // baseVastUrl:"http://localhost:9000/prodinout/",
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

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

@@ -8,27 +8,27 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     viewName: 'stock-report-prodinoutCount',
     //按物料分组
     groupField: null,
-    listUrl: '/api/stock/report/prodinoutCount',
+    listUrl: '/api/storage/report/prodinoutCount',
     defaultCondition: null,
     reportTitle: '物料收发汇总表',
-    QueryWidth:0.25,
+    QueryWidth:0.1,
     //筛选：仓库、物料、物料类型、时间			
     searchItems: [{		
         xtype: 'dbfindtrigger',
-        name: 'pd_whcode',
-        fieldLabel: '仓库编号',
-        columnWidth: 0.25
+        name: 'wh_description',
+        fieldLabel: '仓库',
+        columnWidth: 0.2
     }, {		
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {		
         xtype: 'remotecombo',
         editable:false,
         name: 'pd_prodcode',
         fieldLabel: '物料类型',
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         storeUrl:'/api/document/producttype/getCombo',
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
@@ -76,30 +76,46 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     }, {
         text: '期初',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_beginqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_beginamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '入库合计',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_nowinqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_nowinamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '出库合计',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_nowoutqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_nowoutamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '结存',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_endqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_endamount',
+            xtype: 'numbercolumn'
         }]
     }]
 });

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

@@ -1,6 +1,6 @@
 Ext.define('saas.view.stock.report.ProdinoutCountController', {
     extend: 'saas.view.core.report.ReportPanelController',
-    alias: 'stock-report-prodinoutCount',
+    alias: 'controller.stock-report-prodinoutCount',
     init: function (form) {
         this.control({
            //放大镜赋值关系 以及 tpl模板
@@ -104,7 +104,7 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
 
                 }
             },
-            'dbfindtrigger[name=pd_whcode]':{
+            'dbfindtrigger[name=wh_description]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'wh_code',
@@ -114,7 +114,7 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                         dbfinds:[{
                             from:'id',to:'id',ignore:true 
                         }, { 
-                            from:'wh_code',to:'pd_whcode'
+                            from:'wh_code',to:'wh_code'
                         }, {
                             from:'wh_description',to:'wh_description'
                         }],

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

@@ -1,4 +1,4 @@
 Ext.define('saas.view.stock.report.ProdinoutCountModel', {
     extend: 'saas.view.core.report.ReportPanelModel',
-    alias: 'stock-report-prodinoutCount'
+    alias: 'viewmodel.stock-report-prodinoutCount'
 });

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

@@ -8,17 +8,17 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     viewName: 'stock-report-prodiodetail',
   //  按物料分组
     groupField: 'pd_prodcode',
-    listUrl: '/api/stock/report/prodiodetail',
+    listUrl: '/api/storage/report/prodioDetail',
     defaultCondition: null,
     reportTitle: '物料出入库明细表',
-    QueryWidth:0.25,
+    QueryWidth:0.1,
     //筛选：单据类型、物料、日期
     searchItems: [{
         xtype: 'multicombo',
         name: 'pi_class',
         fieldLabel: '单据类型',
         allowBlank: true,
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         datas: [
             ["采购验收单", "采购验收单"],
             ["采购验退单", "采购验退单"],
@@ -35,7 +35,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
@@ -70,7 +70,8 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         xtype: 'datecolumn'
     }, {
         text: '序号',
-        dataIndex: 'pd_pdno'
+        dataIndex: 'pd_pdno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料类型',
         dataIndex: 'pr_kind'
@@ -92,12 +93,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         text: '入库数量',
         xtype: 'numbercolumn',
         dataIndex: 'inqty',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -109,12 +105,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         text: '出库数量',
         xtype: 'numbercolumn',
         dataIndex: 'outqty',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -126,12 +117,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         text: '成本单价',
         xtype: 'numbercolumn',
         dataIndex: 'pd_price',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        xtype: 'numbercolumn'
     }, {
         text: '备注',
         dataIndex: 'pd_remark',

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

@@ -1,6 +1,6 @@
 Ext.define('saas.view.stock.report.ProdiodetailController', {
     extend: 'saas.view.core.report.ReportPanelController',
-    alias: 'stock-report-prodiodetail',
+    alias: 'controller.stock-report-prodiodetail',
     init: function (form) {
         this.control({
             //放大镜赋值关系 以及 tpl模板

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

@@ -1,4 +1,4 @@
 Ext.define('saas.view.stock.report.ProdiodetailModel', {
     extend: 'saas.view.core.report.ReportPanelModel',
-    alias: 'stock-report-prodiodetail'
+    alias: 'viewmodel.stock-report-prodiodetail'
 });