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

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

@@ -88,6 +88,6 @@ public class ProdIODetailDTO implements Serializable {
 
     private Long pd_ioid;
 
-    private ProductDTO product;
+    private ProductDTO productDTO;
 
 }

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

@@ -126,6 +126,10 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             if (insertDetails.size()>0) {
                 prodIODetailMapper.batchInsert(insertDetails);
             }
+
+            ProdInOut prodInOutNow = checkAndReturnOrder(pi_id);
+            //更新明细金额等
+            setTotal(prodInOutNow);
             baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
             //日志记录
             messageLogService.save(baseDTO);

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

@@ -135,6 +135,7 @@ public class SaleServiceImpl implements SaleService{
                 detail.setSd_said(sa_id);
                 detail.setSd_code(sa_code);
                 detail.setSd_yqty(0.0);
+                detail.setCompanyId(companyId);
                 insertDetails.add(detail);
             }
             //插入从表

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

@@ -37,5 +37,5 @@ Ext.define('saas.model.sale.ProdIODetail', {
         { name: 'pd_ioid', type: 'int' },
     ],
     //一对一映射
-    associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'product'}]
+    associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'productDTO'}]
 });

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

@@ -15,5 +15,5 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'sd_pucode', type: 'string' }
     ],
     //一对一映射
-    associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'product'}]
+    associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'productDTO'}]
 });

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

@@ -56,7 +56,6 @@ Ext.define('saas.view.document.bom.FormPanel', {
         fieldLabel : "更新时间"
     }, {
         xtype : "detailGridField", 
-        detnoColumn:  'bd_detno',
         storeModel:'saas.model.document.bomdetail',
         deleteDetailUrl:'/api/document/bom/deleteDetail/',
         columns : [

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

@@ -138,7 +138,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
     }, {
         height: 169,
         xtype : "detailGridField", 
-        detnoColumn:  'cc_detno',
         storeModel:'saas.model.document.customercontact',
         deleteDetailUrl:'/api/document/customer/deletecontact/',
         columns : [
@@ -230,7 +229,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
     } ,{
         height: 169,
         xtype : "detailGridField", 
-        detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
         deleteDetailUrl:'/api/document/customer/deleteaddress/',
         columns : [

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

@@ -35,7 +35,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'ck_name',
                 allowBlank:false,
-                fieldLabel:'类型'
+                fieldLabel:'客户类型'
             }]
         },
         vendorkind:{
@@ -46,7 +46,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'vk_name',
                 allowBlank:false,
-                fieldLabel:'类型'
+                fieldLabel:'供应商类型'
             }]
         },
         productkind:{
@@ -57,7 +57,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'pt_name',
                 allowBlank:false,
-                fieldLabel:'类型'
+                fieldLabel:'物料类型'
             }]
         },
         bankinformation:{
@@ -94,7 +94,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'pb_name',
                 allowBlank:false,
-                fieldLabel:'类型'
+                fieldLabel:'物料品牌'
             }]
         },  
         productunit:{

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

@@ -136,7 +136,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         columnWidth : 0.25
     }, {
         xtype : "detailGridField", 
-        detnoColumn:  'vc_detno',
         storeModel:'saas.model.document.vendorcontact',
         deleteDetailUrl:'/api/document/vendor/deleteContact/',
         columns : [

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

@@ -99,7 +99,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				    return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
 				}
             }, {
                 text : "规格", 
@@ -107,7 +107,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				    return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
 				}
             }, {
                 text : "数量", 

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

@@ -94,7 +94,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				    return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
 				}
             }, {
                 text : "规格", 
@@ -102,7 +102,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				    return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
                 }
             }, {
                 text : "数量", 

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

@@ -104,7 +104,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				    return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
 				}
             }, {
                 text : "规格", 
@@ -112,7 +112,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				    return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
 				}
             },  {
                 text : "出货数量",