Merge branch 'dev'

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -233,16 +233,16 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             map.put("v_companyid",BaseContextHolder.getCompanyId());
             map.put("v_res","");
             vendorMapper.check(map);
-            Object result =  map.get("v_res");
-            if(!StringUtils.isEmpty(result)){
-                //限制关联单据不可修改金额
-                Vendor vendor = getMapper().selectByPrimaryKey(main.getId());
-                if (vendor.getVe_beginapamount().doubleValue() != main.getVe_beginapamount().doubleValue() ||
-                        vendor.getVe_beginprepayamount().doubleValue() != main.getVe_beginprepayamount().doubleValue() ||
-                        vendor.getVe_begindate().compareTo(main.getVe_begindate()) != 0){
-                    throw new BizException(BizExceptionCode.BIZ_RELUPDATE_AMOUNT);
-                }
-            }
+//            Object result =  map.get("v_res");
+//            if(!StringUtils.isEmpty(result)){
+//                //限制关联单据不可修改金额
+//                Vendor vendor = getMapper().selectByPrimaryKey(main.getId());
+//                if (vendor.getVe_beginapamount().doubleValue() != main.getVe_beginapamount().doubleValue() ||
+//                        vendor.getVe_beginprepayamount().doubleValue() != main.getVe_beginprepayamount().doubleValue() ||
+//                        vendor.getVe_begindate().compareTo(main.getVe_begindate()) != 0){
+//                    throw new BizException(BizExceptionCode.BIZ_RELUPDATE_AMOUNT);
+//                }
+//            }
             //检查期初日期是否已结转
             count = getMapper().validFinish(mainId,companyId);
             if (count>0) {