LG88888888 3 年 前
コミット
2035f38705

+ 5 - 5
src/main/java/net/chenlin/dp/modules/api/service/PayrequestService.java

@@ -285,7 +285,7 @@ public class PayrequestService extends BaseService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc8 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc8.setName("存货数量");
                 if (s.getIapplyamt_s()!=null&&!s.getIapplyamt_s().equals("0E-10")){
-                    fc8.setValue(s.getIapplyamt_s());
+                    fc8.setValue(new BigDecimal(s.getIapplyamt_s()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc8.setValue("0");
                 }
@@ -293,7 +293,7 @@ public class PayrequestService extends BaseService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc9 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc9.setName("单价");
                 if (s.getInattaxprice()!=null&&!s.getInattaxprice().equals("0E-10")){
-                    fc9.setValue(s.getInattaxprice());
+                    fc9.setValue(new BigDecimal(s.getInattaxprice()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc9.setValue("0");
                 }
@@ -302,7 +302,7 @@ public class PayrequestService extends BaseService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc10= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc10.setName("金额");
                 if (s.getIapplyamt()!=null&&!s.getIapplyamt().equals("0E-10")){
-                    fc10.setValue(s.getIapplyamt());
+                    fc10.setValue(new BigDecimal(s.getIapplyamt()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                     BigDecimal b=new BigDecimal(s.getIapplyamt());
                     BigDecimal add = a.add(b);
                     a=add;
@@ -313,8 +313,8 @@ public class PayrequestService extends BaseService {
                 ls.add(mingxilist);
             }
             OapiProcessinstanceCreateRequest.FormComponentValueVo fc5 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
-            fc5.setName("申请金额(元)");
-            fc5.setValue(a.toString());
+            fc5.setName("申请金额");
+            fc5.setValue(a.setScale(4,BigDecimal.ROUND_HALF_UP).toString());
 //                fc5.setValue(so.getPersonname());
             formComponentValueVoList.add(fc5);
 

+ 8 - 8
src/main/java/net/chenlin/dp/modules/api/service/PurchaseOrderService.java

@@ -256,7 +256,7 @@ public class PurchaseOrderService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fo = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fo.setName("数量");
                 if (s.getQuantity()!=null&&!s.getQuantity().equals("0E-10")){
-                    fo.setValue(s.getQuantity());
+                    fo.setValue(new BigDecimal(s.getQuantity()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fo.setValue("0");
                 }
@@ -265,7 +265,7 @@ public class PurchaseOrderService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc7 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc7.setName("含税单价");
                 if (s.getTaxprice()!=null&&!s.getTaxprice().equals("0E-10")){
-                    fc7.setValue(s.getTaxprice());
+                    fc7.setValue(new BigDecimal(s.getTaxprice()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc7.setValue("0");
                 }
@@ -274,7 +274,7 @@ public class PurchaseOrderService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc8 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc8.setName("无税单价");
                 if (s.getPrice()!=null&&!s.getPrice().equals("0E-10")){
-                    fc8.setValue(s.getPrice());
+                    fc8.setValue(new BigDecimal(s.getPrice()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc8.setValue("0");
                 }
@@ -283,7 +283,7 @@ public class PurchaseOrderService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc9 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc9.setName("税率");
                 if (s.getTaxrate()!=null&&!s.getTaxrate().equals("0E-10")){
-                    fc9.setValue(s.getTaxrate());
+                    fc9.setValue(new BigDecimal(s.getTaxrate()).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc9.setValue("暂无");
                 }
@@ -292,7 +292,7 @@ public class PurchaseOrderService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc10= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc10.setName("无税金额");
                 if (s.getMoney()!=null&&!s.getMoney().equals("0E-10")){
-                    fc10.setValue(s.getMoney());
+                    fc10.setValue(new BigDecimal(s.getMoney()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc10.setValue("0");
                 }
@@ -304,7 +304,7 @@ public class PurchaseOrderService {
                     BigDecimal sum=new BigDecimal(s.getSum());
                     BigDecimal money=new BigDecimal(s.getMoney());
                     BigDecimal subtract = sum.subtract(money);
-                    fc11.setValue(subtract.toString());
+                    fc11.setValue(subtract.setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc11.setValue("0");
                 }
@@ -315,7 +315,7 @@ public class PurchaseOrderService {
                 fc12.setName("价税合计");
                 if (s.getSum()!=null&&!s.getSum().equals("0E-10")){
                     countSum=countSum.add(new BigDecimal(s.getSum()));
-                    fc12.setValue(s.getSum());
+                    fc12.setValue(new BigDecimal(s.getSum()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc12.setValue("0");
                 }
@@ -342,7 +342,7 @@ public class PurchaseOrderService {
             }
             OapiProcessinstanceCreateRequest.FormComponentValueVo pso = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
             pso.setName("总金额");
-            pso.setValue(countSum.toString());
+            pso.setValue(countSum.setScale(4,BigDecimal.ROUND_HALF_UP).toString());
             formComponentValueVoList.add(pso);
 
 

+ 4 - 5
src/main/java/net/chenlin/dp/modules/api/service/SaleOrderService.java

@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.*;
 
 public class SaleOrderService {
@@ -432,7 +433,6 @@ public class SaleOrderService {
         req.setOriginatorUserId(userid);
         req.setDeptId(deptid);
         req.setCcPosition("START");
-        BigDecimal countSum=new BigDecimal("0");
         if (!useridshenh.equals("")){
             List<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo> processInstanceApproverVoList = new ArrayList<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo>();
             OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
@@ -524,7 +524,7 @@ public class SaleOrderService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc7 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc7.setName("单价(含税)");
                 if(s.getTaxunitprice()!=null&&!s.getTaxunitprice().equals("0E-10")){
-                    fc7.setValue(s.getTaxunitprice());
+                    fc7.setValue(new BigDecimal(s.getTaxunitprice()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc7.setValue("0");
                 }
@@ -533,7 +533,7 @@ public class SaleOrderService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc8 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc8.setName("订购数量");
                 if(s.getQuantity()!=null&&!s.getQuantity().equals("")){
-                    fc8.setValue(s.getQuantity());
+                    fc8.setValue(new BigDecimal(s.getQuantity()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc8.setValue("0");
                 }
@@ -543,8 +543,7 @@ public class SaleOrderService {
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc12= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc12.setName("总金额(含税)");
                 if(s.getSum()!=null&&!s.getSum().equals("0E-10")){
-                    countSum=countSum.add(new BigDecimal(s.getSum()));
-                    fc12.setValue(s.getSum());
+                    fc12.setValue(new BigDecimal(s.getSum()).setScale(4,BigDecimal.ROUND_HALF_UP).toString());
                 }else {
                     fc12.setValue("0");
                 }