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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -88,8 +88,8 @@ public enum BizExceptionCode implements BaseExceptionCode {
     CHECK_SETACOUNT_EXIS(74006, "不能删除单据日期小于等于结账期间<u>%s</u>的单据"),
     VERIFICATION_CHECK_BALANCE(74007,"核销金额不能大于未核销金额"),
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
-    DOCUMENTS_AUDITED(74009,"审核失败，存在已审核单据"),
-    DOCUMENTS_UNAUDITED(74009,"反审核失败，存在未审核单据"),
+    DOCUMENTS_AUDITED(74009,"审核失败，存在已审核单据:%S"),
+    DOCUMENTS_UNAUDITED(74009,"反审核失败，存在未审核单据:%S"),
 
 
 

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

@@ -287,7 +287,8 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Fundtransfer fundtransfers = fundtransferMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
             if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(fundtransfers.getFt_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+                throw new BizException(500, String.format(message, fundtransfers.getFt_code()));
             }
             Fundtransfer fundtransfer = new Fundtransfer();
             fundtransfer.setId(Long.valueOf(docBaseDTO.getId()));
@@ -307,7 +308,8 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Fundtransfer fundtransfers = fundtransferMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
             if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(fundtransfers.getFt_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+                throw new BizException(500, String.format(message, fundtransfers.getFt_code()));
             }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }

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

@@ -341,7 +341,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Othreceipts othreceipts1 = othreceiptsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
             if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(othreceipts1.getOr_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+                throw new BizException(500, String.format(message, othreceipts1.getOr_code()));
             }
             Othreceipts othreceipts = new Othreceipts();
             othreceipts.setId(Long.valueOf(docBaseDTO.getId()));
@@ -361,7 +362,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Othreceipts othreceipts1 = othreceiptsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
             if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(othreceipts1.getOr_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+                throw new BizException(500, String.format(message, othreceipts1.getOr_code()));
             }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }

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

@@ -336,7 +336,8 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Othspendings othspendings1 = othspendingsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
             if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(othspendings1.getOs_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+                throw new BizException(500, String.format(message, othspendings1.getOs_code()));
             }
             Othspendings othspendings = new Othspendings();
             othspendings.setId(Long.valueOf(docBaseDTO.getId()));
@@ -356,7 +357,8 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Othspendings othspendings1 = othspendingsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
             if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(othspendings1.getOs_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+                throw new BizException(500, String.format(message, othspendings1.getOs_code()));
             }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }

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

@@ -441,7 +441,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Paybalance paybalance1 = paybalanceMapper.selectByPrimaryKey(docBaseDTO.getId());
             if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(paybalance1.getPb_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+                throw new BizException(500, String.format(message, paybalance1.getPb_code()));
             }
             Paybalance paybalance = new Paybalance();
             paybalance.setId(Long.valueOf(docBaseDTO.getId()));
@@ -467,7 +468,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Paybalance paybalance1 = paybalanceMapper.selectByPrimaryKey(docBaseDTO.getId());
             if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(paybalance1.getPb_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+                throw new BizException(500, String.format(message, paybalance1.getPb_code()));
             }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }

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

@@ -446,7 +446,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Recbalance recbalance1 = recbalanceMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
             if (com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay().equals(recbalance1.getRb_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_AUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_AUDITED.getMessage();
+                throw new BizException(500, String.format(message, recbalance1.getRb_code()));
             }
             Recbalance recbalance = new Recbalance();
             recbalance.setId(Long.valueOf(docBaseDTO.getId()));
@@ -472,7 +473,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
             Recbalance recbalance1 = recbalanceMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
             if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(recbalance1.getRb_status())){
-                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+                String message = BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage();
+                throw new BizException(500, String.format(message, recbalance1.getRb_code()));
             }
             this.unAudit(docBaseDTO.getId());
         }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -414,9 +414,9 @@ public class AccountController {
     public Result enableAccount(@RequestParam long accountId) {
         accountService.enable(accountId);
         //同步到优软云
-        Long userUU = accountService.findByPrimaryKey(accountId).getUu();
-        Long companyUU = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId()).getUu();
-        String result = ssoUserApi.bind("bind", "trade-app", userUU, companyUU);
+//        Long userUU = accountService.findByPrimaryKey(accountId).getUu();
+//        Long companyUU = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId()).getUu();
+//        String result = ssoUserApi.bind("bind", "trade-app", userUU, companyUU);
         accountService.clearCache(accountId);
         return Result.success();
     }

base-servers/account/account-server/src/main/resources/application.yml

@@ -53,7 +53,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
 server:
   port: 8580
   tomcat:
@@ -82,7 +82,8 @@ mybatis:
 auth:
   public-key: auth/pub.key
 sso:
-  base-url: https://sso.ubtob.com
+#  base-url: https://sso.ubtob.com
+  base-url: http://192.168.253.12:32323
 ribbon:
   ReadTimeout: 6000
   ConnectTimeout: 2000

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/api/SsoUserApi.java

@@ -60,9 +60,6 @@ public interface SsoUserApi {
     @PostMapping("")
     String unbind(@RequestParam("_operate") String _operate, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
 
-    @PostMapping("")
-    String bind(@RequestParam("_operate") String _operate, @RequestParam("appId") String appId, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
-
     @Component
     class DefaultFallback implements SsoUserApi{
         @Override
@@ -85,10 +82,5 @@ public interface SsoUserApi {
             return null;
         }
 
-        @Override
-        public String bind(String _operate, String appId, Long userUU, Long spaceUU) {
-            return null;
-        }
-
     }
 }

frontend/saas-web/app/model/document/ProductDetail.js

@@ -8,8 +8,8 @@ Ext.define('saas.model.document.ProductDetail', {
         { name: 'pd_whcode', type: 'string' },
         { name: 'pd_whname', type: 'string' },
         { name: 'pd_whid', type: 'int' },
-        { name: 'pd_price', type: 'string' },
-        { name: 'pd_amount', type: 'int' },
-        { name: 'pd_num', type: 'int' }
+        { name: 'pd_price', type: 'float' },
+        { name: 'pd_amount', type: 'float' },
+        { name: 'pd_num', type: 'float' }
     ]
 });

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -448,7 +448,7 @@ Ext.define('saas.view.core.form.FormPanel', {
 
     isDirty: function () {
         var me = this,
-        formItems = me.formItems,
+        formItems = me.formItems || [],
         detailGrids = me.query('detailGridField'),
         dirty = false;
 

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

@@ -256,15 +256,15 @@ Ext.define('saas.view.document.product.FormPanel', {
             xtype : "numbercolumn", 
         },
         {
-            allowBlank:true,
             text : "期初数量", 
             dataIndex : "pd_num", 
-            xtype: 'numbercolumn',
+            // xtype: 'numbercolumn',
+            align: 'end',
             width : 110.0,
             allowBlank : false,
             editor : {
                 xtype : "numberfield",
-                decimalPrecision: 0,
+                decimalPrecision: 3,
                 minValue:0
             },
             listeners:{
@@ -287,8 +287,8 @@ Ext.define('saas.view.document.product.FormPanel', {
         {
             text : "单位成本", 
             dataIndex : "pd_price", 
-            allowBlank:false,
-            xtype: 'numbercolumn',
+            // xtype: 'numbercolumn',
+            align: 'end',
             width : 110.0,
             allowBlank : false,
             editor : {
@@ -301,34 +301,28 @@ Ext.define('saas.view.document.product.FormPanel', {
             },
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
-            summaryType: 'sum',
-            summaryRenderer: function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            }
         },
         {
             text : "期初总价", 
             dataIndex : "pd_amount", 
-            xtype: 'numbercolumn',
+            // xtype: 'numbercolumn',
+            align: 'end',
             width : 110.0,
             allowBlank : true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -313,14 +313,14 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
                 summaryType: 'sum',
                 summaryRenderer: function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -239,14 +239,14 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
                 summaryType: 'sum',
                 summaryRenderer: function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
@@ -274,14 +274,14 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
                 summaryType: 'sum',
                 summaryRenderer: function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
@@ -295,6 +295,11 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 },
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     },{
         xtype : "hidden", 
         name : "creatorId", 

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -210,21 +210,16 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 xtype: 'numbercolumn',
                 dataIndex: "pd_total",
                 width: 110.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 2,
-                    editable:false
-                },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
                 summaryType: 'sum',
                 summaryRenderer: function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
@@ -245,21 +240,16 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 xtype: 'numbercolumn',
                 dataIndex: "pd_nettotal", 
                 width : 110.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 2,
-                    editable:false
-                },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
                 summaryType: 'sum',
                 summaryRenderer: function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
@@ -273,6 +263,11 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 },
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     },{
         xtype : "hidden", 
         name : "creatorId",