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/service/impl/ProdInOutServiceImpl.java

@@ -96,9 +96,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setCompanyId(companyId);
         prodInOut.setCreatorId(userId);
         prodInOut.setCreateTime(new Date());
-        prodInOut.setPi_recordmanid(userId);
-        prodInOut.setPi_recorddate(new Date());
-        prodInOut.setPi_recordman(BaseContextHolder.getUserName());
 
         if(prodInOut.getPi_date() == null){
             prodInOut.setPi_date(new Date());
@@ -423,9 +420,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setCompanyId(sourcePi.getCompanyId());
         targetPi.setCreateTime(new Date());
         targetPi.setCreatorId(BaseContextHolder.getUserId());
-        targetPi.setPi_recordmanid(BaseContextHolder.getUserId());
-        targetPi.setPi_recorddate(new Date());
-        targetPi.setPi_recordman("TESTADMIN");
         targetPi.setPi_ioid(id);
         targetPi.setPi_inoutno(piInoutno);
         targetPi.setPi_class(BillCodeSeq.SALEIN.getName());

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

@@ -454,7 +454,6 @@ public class SaleServiceImpl implements SaleService{
         prodInOut.setPi_date(new Date());
         prodInOut.setPi_status(Status.UNAUDITED.getDisplay());
         prodInOut.setPi_statuscode(Status.UNAUDITED.name());
-        prodInOut.setPi_recorddate(new Date());
         prodInOut.setPi_custid(sale.getSa_custid());
         prodInOut.setPi_custcode(sale.getSa_custcode());
         prodInOut.setPi_custname(sale.getSa_custname());

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

@@ -9,23 +9,54 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
     modal: true,
     width: 500,
     //工具类
-    height: 260,
+    height: 280,
     listeners:{
       show:function(w){
-          if(w.record){
-              w.down('form').loadRecord(w.record);
-          }
           //自动适应窗口
           var items = w.down('form').items.items;
           var count = 0;
+          var codeField;
           Ext.Array.each(items,function(item) {
             if(item.xtype!='hidden'){
                 count++;
             }
+            if(item.autoCode){
+                codeField = item.name
+            }
           });
           if(count!=0&&count<4){
             w.setHeight(114+40*count)
           }
+          if(w.record){
+              w.down('form').loadRecord(w.record);
+          }else{
+              //判断是否有code字段
+              if(codeField){
+                w.setLoading(true);
+                //取后台编号
+                var caller = w._parent.caller;
+                saas.util.BaseUtil.request({
+                    url: '/api/commons/number/getMaxnumber',
+                    headers: {
+                        "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
+                    },
+                    params: {
+                        caller:caller
+                    },
+                    method: 'POST',
+                }).then(function(res) {
+                    w.setLoading(false);
+                    if(res.success){
+                        w.down('[name='+codeField+']').setValue(res.data);
+                    }else {
+                        saas.util.BaseUtil.showErrorToast(res.message);
+                    }
+                }).catch(function(res) {
+                    saas.util.BaseUtil.showErrorToast(res.message);
+                    w.setLoading(true);
+                })
+              }
+          }
       }
     },
     initComponent:function(){
@@ -107,6 +138,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 name:'bk_bankcode',
                 allowBlank:false,
                 fieldLabel:'账户编号',
+                autoCode:true,
                 maxLength: 20
             },{
                 xtype:'textfield',
@@ -389,6 +421,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 fieldLabel: '仓库编号',
                 name: 'wh_code',
+                autoCode:true,
                 allowBlank:false,
                 maxLength: 20
             },{
@@ -438,6 +471,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             },{
                 xtype:'textfield',
                 fieldLabel: '人员编号',
+                autoCode:true,
                 name: 'em_code',
                 allowBlank:false,
                 maxLength: 20

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

@@ -266,7 +266,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
                 dataIndex: 'email',
             }],
-            reqUrl: 'http://192.168.253.31:8560/api/account/account/register/add',
+            reqUrl: '/api/account/account/register/add',
         },
         employee:{
             columns: [{

frontend/saas-web/app/view/document/other/BankInformation.js

@@ -6,6 +6,7 @@ Ext.define('saas.view.document.other.BankInformation', {
     xtype: 'other-bankinformation',
     autoScroll: true,
     layout:'fit',
+    caller:'BankInformation',
     defaultType:'bankinformation',
     tbar: ['->',{
         xtype:'button',

frontend/saas-web/app/view/document/other/Employee.js

@@ -3,6 +3,7 @@ Ext.define('saas.view.document.other.Employee', {
     xtype: 'other-employee',
     autoScroll: true,
     layout:'fit',
+    caller:'Employee',
     _openUrl:'/api/document/employee/open',
     _closeUrl:'/api/document/employee/close',
     defaultType:'employee',

frontend/saas-web/app/view/document/other/Warehouse.js

@@ -3,6 +3,7 @@ Ext.define('saas.view.document.other.Warehouse', {
     xtype: 'other-warehouse',
     autoScroll: true,
     layout:'fit',
+    caller:'Warehouse',
     _openUrl:'/api/document/warehouse/open',
     _closeUrl:'/api/document/warehouse/close',
     defaultType:'warehouse',

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -121,7 +121,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 text : "本次转出金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "ftd_nowbalance",
-                width : 150.0, 
+                width : 150.0,
+                allowBlank : false,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2

frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js

@@ -39,5 +39,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                 }
             }
         });
+    },
+    myInitCopyData: function(formData) {
+        var main = formData.main;
+        main.ft_auditman = '';
+        main.ft_auditdate = null;
+        return formData;
     }
 });

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -114,7 +114,8 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 text : "金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "ord_nowbalance", 
-                width : 110.0, 
+                width : 110.0,
+                allowBlank : false,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -130,5 +130,11 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
         viewModel.set('or_amount',sum_nowbalance);
 
         me.save();
+    },
+    myInitCopyData: function(formData) {
+        var main = formData.main;
+        main.or_auditman = '';
+        main.or_auditdate = null;
+        return formData;
     }
 });

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -115,6 +115,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 xtype: 'numbercolumn',
                 dataIndex : "osd_nowbalance", 
                 width : 110.0,
+                allowBlank : false,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -133,5 +133,11 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
         viewModel.set('os_amount',sum_nowbalance);
 
         me.save();
+    },
+    myInitCopyData: function(formData) {
+        var main = formData.main;
+        main.os_auditman = '';
+        main.os_auditdate = null;
+        return formData;
     }
 });

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -122,6 +122,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             xtype: 'numbercolumn',
             dataIndex: "pd_amount",
             width : 110.0,
+            allowBlank : false,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -235,5 +235,11 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             c ='';
         }
         dbfindtrigger.defaultCondition = "sl_vendid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0" + c;
+    },
+    myInitCopyData: function(formData) {
+        var main = formData.main;
+        main.pb_auditman = '';
+        main.pb_auditdate = null;
+        return formData;
     }
 });

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -122,6 +122,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             xtype: 'numbercolumn',
             dataIndex: "rd_amount",
             width : 110.0,
+            allowBlank : false,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -233,5 +233,11 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
         }
         dbfindtrigger.defaultCondition = "sl_custid<>0 and sl_kind in ('期初余额','出货单','销售退货单') and sl_namount<>0" + c;
 
+    },
+    myInitCopyData: function(formData) {
+        var main = formData.main;
+        main.rb_auditman = '';
+        main.rb_auditdate = null;
+        return formData;
     }
 });