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

applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml

@@ -31,7 +31,7 @@
     select 
     <include refid="Base_Column_List" />
     from paybalancedet
-    where pd_rbid = #{pdRbId,jdbcType=INTEGER}
+    where pd_rbid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteItem" parameterType="java.lang.Integer" >
     delete from paybalancedet

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

@@ -169,7 +169,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             },{
                 xtype:'textfield',
                 fieldLabel: '单据名称',
-                name: 'mn_caller',
+                name: 'mn_name',
                 allowBlank:false,
                 editable:false,
                 readOnly:true

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

@@ -31,20 +31,20 @@ Ext.define('saas.view.document.product.FormPanel', {
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 'pr_detail',
-        fieldLabel: '物料名称',
+        name: 'pr_code',
+        fieldLabel: '物料编号',
         allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 'pr_code',
-        fieldLabel: '物料编号',
+        name: 'pr_detail',
+        fieldLabel: '物料名称',
         allowBlank: false,
         columnWidth: 0.25
     },{
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pr_status',
-        fieldLabel: '可用状态',
+        fieldLabel: '状态',
         allowBlank: true,
         columnWidth: 0.25
     },{
@@ -53,6 +53,12 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel: '状态码',
         allowBlank: true,
         columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'pr_spec',
+        fieldLabel: '规格',
+        allowBlank: false,
+        columnWidth: 0.25
     },{
         editable:false,
         xtype : "remotecombo", 
@@ -79,6 +85,12 @@ Ext.define('saas.view.document.product.FormPanel', {
             this.dialog.show();
         }
     },{
+        xtype: 'textfield',
+        name: 'pr_orispeccode',
+        fieldLabel: '型号',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{  
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/productunit/getCombo',
@@ -153,24 +165,48 @@ Ext.define('saas.view.document.product.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pr_whname", 
-        bind : "{pr_whname}", 
         fieldLabel : "仓库名称", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
+        ignore:true,
+        readOnly:true,
         xtype : "numberfield", 
         name : "pr_standardprice", 
-        bind : "{pr_standardprice}", 
         fieldLabel : "标准单价", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
+        ignore:true,
+        readOnly:true,
+        xtype : "numberfield", 
+        name : "pr_purcprice", 
+        fieldLabel : "最新采购单价", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        ignore:true,
+        readOnly:true,
+        xtype : "numberfield", 
+        name : "pr_saleprice", 
+        fieldLabel : "最新出货单价", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        xtype : "numberfield", 
+        name : "pr_zxbzs", 
+        fieldLabel : "最小包装数", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{  
+        hidden:true,
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "创建时间", 
         allowBlank : true, 
         columnWidth : 0.25
     },{  
+        hidden:true,
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间", 

frontend/saas-web/app/view/sys/maxnumbers/DataList.js

@@ -17,7 +17,7 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
 
     tbar: [{
         width: 150,
-        name: 'mn_caller',
+        name: 'mn_name',
         xtype: 'textfield',
         emptyText : '单据名称'
     },{
@@ -81,7 +81,7 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
     },{
         text : "单据名称", 
         width : 200.0, 
-        dataIndex : "mn_caller", 
+        dataIndex : "mn_name", 
         xtype : "", 
     }, 
     {