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/po/SaleDownDetail.java

@@ -18,7 +18,7 @@ public class SaleDownDetail extends CommonBaseEntity{
 
     private Integer b2b_pd_id;
 
-    private Integer sd_prodid;
+    private Long sd_prodid;
 
     private String sd_prodcode;
 
@@ -104,11 +104,11 @@ public class SaleDownDetail extends CommonBaseEntity{
         this.b2b_pd_id = b2b_pd_id;
     }
 
-    public Integer getSd_prodid() {
+    public Long getSd_prodid() {
         return sd_prodid;
     }
 
-    public void setSd_prodid(Integer sd_prodid) {
+    public void setSd_prodid(Long sd_prodid) {
         this.sd_prodid = sd_prodid;
     }
 

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/service/impl/SaleDownServiceImpl.java

@@ -84,8 +84,8 @@ public class SaleDownServiceImpl implements SaleDownService{
             main.setSa_code(code);
             main.setCreateTime(new Date());
             main.setCompanyId(companyId);
-            main.setSa_status(Status.AUDITED.getDisplay());
-            main.setSa_statuscode(Status.AUDITED.name());
+            main.setSa_status(Status.UNAUDITED.getDisplay());
+            main.setSa_statuscode(Status.UNAUDITED.name());
             main.setSa_seller(emp.getData().getRealname());
             main.setSa_sellerid(emp.getData().getId());
             saledownMapper.insertSelective(main);

frontend/saas-web/app/model/sale/b2b/PurchaseDetail.js

@@ -6,7 +6,7 @@ Ext.define('saas.model.sale.b2b.PurchaseDetail', {
         { name: 'sd_prodid', type: 'int' }, // 物料id
         { name: 'sd_prodcode', type: 'string' }, // 物料编号
         { name: 'sd_proddetail', type: 'string' }, // 物料名称
-        { name: 'sd_proddbrand', type: 'string' }, // 品牌
+        { name: 'sd_prodbrand', type: 'string' }, // 品牌
         { name: 'sd_orispeccode', type: 'string' }, // 型号
         { name: 'sd_prodspec', type: 'string' }, // 规格
     ],

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

@@ -113,7 +113,7 @@ Ext.define('saas.view.sale.b2b.PurchaseDetail', {
                         }, {
                             from: 'pr_spec', to: 'sd_prodspec'
                         },{
-                            from: 'pr_brand', to: 'sd_proddbrand'
+                            from: 'pr_brand', to: 'sd_prodbrand'
                         },{
                             from: 'pr_orispeccode', to: 'sd_orispeccode'
                         },{
@@ -127,7 +127,7 @@ Ext.define('saas.view.sale.b2b.PurchaseDetail', {
                 }, {
                     text: "品牌",
                     width: 100.0,
-                    dataIndex: "sd_proddbrand"
+                    dataIndex: "sd_prodbrand"
                 }, {
                     text: "型号",
                     width: 200.0,