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

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

@@ -271,6 +271,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
         subledger.setSl_namount(Math.abs(amount));
         Long sl_id = subledgerMapper.selectByKindCodeVendid("期初余额","期初余额",
                 Math.toIntExact(main.getId()),BaseContextHolder.getCompanyId(),YM);
+
         subledger.setId(sl_id);
         if ( sl_id!=null && sl_id > 0 ) {
             subledgerMapper.updateByPrimaryKeySelective(subledger);

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

@@ -469,13 +469,17 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             List<VerificationdetDTO> items1 = formData.getItems1();
             //获取从表2
             List<VerificationdetailDTO> items2 = formData.getItems2();
-            for(VerificationdetDTO det : items1){
-                Double nowbalanceDet = det.getVd_nowbalance()==null?new Double(0):det.getVd_nowbalance();
-                updateAuditSubledeger(det.getVd_slid(),nowbalanceDet);
+            if(items1!=null){
+                for(VerificationdetDTO det : items1){
+                    Double nowbalanceDet = det.getVd_nowbalance()==null?new Double(0):det.getVd_nowbalance();
+                    updateAuditSubledeger(det.getVd_slid(),nowbalanceDet);
+                }
             }
-            for(VerificationdetailDTO detail : items2){
-                Double nowbalanceDet = detail.getVcd_nowbalance()==null?new Double(0):detail.getVcd_nowbalance();
-                updateAuditSubledeger(detail.getVcd_slid(),nowbalanceDet);
+            if(items2!=null){
+                for(VerificationdetailDTO detail : items2){
+                    Double nowbalanceDet = detail.getVcd_nowbalance()==null?new Double(0):detail.getVcd_nowbalance();
+                    updateAuditSubledeger(detail.getVcd_slid(),nowbalanceDet);
+                }
             }
         }
         baseDTO.setId(id);

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@localhost:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510:8500/eureka/
 management:
   endpoints:
     web:

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

@@ -583,8 +583,8 @@ public class SaleServiceImpl implements SaleService{
             purchaseDetail.setPd_saledetno(detail.getSd_detno());
             purchaseDetail.setPd_saleid(sale.getId());
             purchaseDetail.setPd_taxrate(taxRate);
-            purchaseDetail.setPd_taxprice(Price*(1+taxRate/100));
-            purchaseDetail.setPd_taxtotal((Price*(1+taxRate/100))*qty);
+            purchaseDetail.setPd_taxprice(Price*(1-taxRate/100));
+            purchaseDetail.setPd_taxtotal((Price*(1-taxRate/100))*qty);
             purchaseDetail.setCompanyId(BaseContextHolder.getCompanyId());
             purchaseDetail.setCreatorId(BaseContextHolder.getUserId());
             purchaseDetail.setCreateTime(new Date());
@@ -601,7 +601,7 @@ public class SaleServiceImpl implements SaleService{
 
         DocBaseDTO log = new DocBaseDTO(sale.getId(),sale.getSa_code(),BillCodeSeq.SALE.getCaller());
         messageLogService.customizeLog(log, Operation.TURNPURCHASE);
-        return log;
+        return baseDTO;
     }
 
     //更新最新销售总额