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

applications/purchase/purchase-server/pom.xml

@@ -81,10 +81,6 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>document-api</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -11,7 +11,6 @@ import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
-import com.usoftchina.saas.commons.po.Operation;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.api.EmployeeApi;
@@ -111,8 +110,12 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();
         //人员Id
-        Map<String,Object>  emp= employeeApi.getEmployeeByAccount();
-        Long userId = (Long)emp.get("em_id");
+        Long userId = BaseContextHolder.getUserId();
+
+
+        Map<String,Object> emp = employeeApi.getEmployeeByAccount();
+
+
         //获取主表信息
         PurchaseDTO main = formdata.getMain();
         List<PurchaseDetailDTO> items = formdata.getItems();
@@ -471,8 +474,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
         //采购验收单相关计算
         prodInOutService.calcProdInout(pi_id,"采购验收单");
-        DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEIN.getName());
-        messageLogService.customizeLog(baseDTO, Operation.TURNPURCCHECKIN);
+        DocBaseDTO baseDTO = new DocBaseDTO();
+        baseDTO.setId(pi_id);
+        baseDTO.setCode(piInoutno);
+        baseDTO.setName("采购验收单");
         return Result.success(baseDTO);
     }
 

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

@@ -127,11 +127,11 @@ Ext.define('saas.view.document.kind.Kind', {
         },
         bankinformation:{
             columns: [{
-                text: '账户',
+                text: '账户编号',
                 dataIndex: 'bk_bankcode',
                 flex: 1
             },{
-                text: '名称',
+                text: '账户名称',
                 dataIndex: 'bk_bankname',
                 flex: 1
             },{
@@ -249,28 +249,6 @@ Ext.define('saas.view.document.kind.Kind', {
             reqUrl:'/api/account/role/save',
             updateUrl:'/api/account/role/update',
         },
-        accountinformation:{
-            columns: [{
-                text: '账户',
-                dataIndex: 'wh_code',
-                width: 200
-            },{
-                text: '账户',
-                dataIndex: 'wh_description',
-                width: 200
-            },{
-                text: '账户',
-                dataIndex: 'wh_type',
-                width: 200
-            },{  
-                text: '账户',
-                dataIndex: 'wh_status',
-                hidden:true,
-            }],
-            keyField:'id',
-            reqUrl: '/api/document/warehouse/save',
-            delUrl: '/api/document/warehouse/delete'
-        },
         warehouse:{
             columns: [{
                 text: '编号',

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

@@ -52,11 +52,31 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "客户名称",
         allowBlank : false
     }, {
-        xtype : "textfield", 
         name : "sa_toplace", 
+        editable:false,
+        xtype : "remotecombo", 
+        storeUrl:'/api/document/address/getCombo',
         fieldLabel : "交货地址", 
+        allowBlank : false, 
         columnWidth : 0.5,
-        allowBlank : false
+        hiddenBtn:false,//true 则会关闭新增按钮功能
+        addHandler:function(b){
+            var document = Ext.create('saas.view.document.kind.Kind',{});
+            var form = this.ownerCmp.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增交货地址'
+                },
+                dataKind:'address',
+                belong:document.etc['address'],
+                _parent:form,
+                _combo:this.ownerCmp,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }
     }, {
         name : "detailGridField", 
         xtype : "detailGridField",