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

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

@@ -267,6 +267,6 @@
         AND companyId = #{companyId}
       </if>
     </where>
-    ORDER BY BO_ID
+    ORDER BY BO_ID DESC
   </select>
 </mapper>

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

@@ -49,7 +49,7 @@
       <if test="companyId != null">
         and   customer.companyid = #{companyId}
       </if>
-    </where>  order by cu_id
+    </where>  order by cu_id DESC
   </select>
 
   <select id="selectDbFind" resultMap="BaseResultMap">
@@ -75,7 +75,7 @@
         and  companyid = #{companyId}
       </if>
     </where>
-    order by cu_id
+    order by cu_id DESC
   </select>
 
 

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

@@ -70,6 +70,7 @@
                 and  PRODUCT.companyid = #{companyId}
             </if>
         </where>
+        ORDER BY PR_ID DESC
     </select>
 
     <select id="getProdUnit" resultType="com.usoftchina.saas.commons.dto.ComboDTO">

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

@@ -50,7 +50,7 @@
                 AND companyId = #{companyId}
             </if>
         </where>
-        ORDER BY VE_ID
+        ORDER BY VE_ID DESC
     </select>
 
     <resultMap id="VendorListResultMapper" type="com.usoftchina.saas.document.entities.VendorList">

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

@@ -326,7 +326,7 @@
                 and  companyid = #{companyId}
             </if>
         </where>
-        order by wh_id
+        order by wh_id DESC
     </select>
 
     <select id="selectCountByName" resultType="int">

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -10,7 +10,6 @@ import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
-import com.usoftchina.saas.document.mapper.BankinformationMapper;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.BanksubledgerMapper;
 import com.usoftchina.saas.money.mapper.OthreceiptsMapper;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -10,7 +10,6 @@ import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
-import com.usoftchina.saas.document.mapper.BankinformationMapper;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.*;
 import com.usoftchina.saas.money.po.*;

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -137,6 +137,10 @@ Ext.define('saas.view.core.base.GridPanel', {
         me.callParent(arguments);
     },
 
+    onLoad:function(){
+        this.store.load();
+    },
+
     onVastDeal:function(url,type){
         var form = this.ownerCt;
         var grid = this;
@@ -157,8 +161,9 @@ Ext.define('saas.view.core.base.GridPanel', {
                     showToast('操作成功');
                     grid.store.load();
                 })
-                .catch(function(response) {
-                    showToast('操作失败');
+                .catch(function(res) {
+                    console.error(res);
+                    showToast('操作失败: ' + res.message);
                 });
         }else{
             showToast('请勾选至少一条明细。');
@@ -188,8 +193,9 @@ Ext.define('saas.view.core.base.GridPanel', {
                             view.ownerCt.store.load();
                         }
                     })
-                    .catch(function() {
-                        showToast('删除失败');
+                    .catch(function(res) {
+                        console.error(res);
+                        showToast('删除失败: ' + res.message);
                     });
                 }
             }

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

@@ -206,7 +206,15 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_purcprice", 
         fieldLabel : "最新采购单价", 
         allowBlank : true, 
-        columnWidth : 0.25
+        columnWidth : 0.25,
+        decimalPrecision: 8,
+        minValue:0,
+        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);
+        },
     },{
         ignore:true,
         readOnly:true,
@@ -214,11 +222,21 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_saleprice", 
         fieldLabel : "最新出货单价", 
         allowBlank : true, 
-        columnWidth : 0.25
+        columnWidth : 0.25,
+        decimalPrecision: 8,
+        minValue:0,
+        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 : "numberfield", 
         name : "pr_zxbzs", 
         fieldLabel : "最小包装数", 
+        minValue:0,
+        decimalPrecision: 0,
         allowBlank : true, 
         columnWidth : 0.25
     },{  

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

@@ -86,7 +86,10 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
+                            from:'pr_detail',to:'pr_detail',
+                        },{
                             from:'pr_code',to:'pd_prodcode',
+                        },{
                             from:'pr_unit',to:'pd_unit'
                         }],
                         dbtpls:[{