1

src/main/java/net/chenlin/dp/modules/api/service/AcceptOrderService.java

@@ -23,6 +23,12 @@ public class AcceptOrderService {
         DynamicDataSource.setDataSource("");
         if (iAcceptOrders!=null &&iAcceptOrders.size()>0){
             for (IAcceptOrder ls:iAcceptOrders){
+                String[] split = ls.getVouchcode().split("#");
+                if (split.length>1){
+                    ls.setVouchcode(split[0]+split[1]);
+                }else {
+                    ls.setVouchcode(split[0]);
+                }
                 AcceptOrderMin acceptOrderMin=new AcceptOrderMin();
                 List<AcceptOrderMin> entry = ls.getEntry();
                 ls.setBalancecode("1");

src/main/java/net/chenlin/dp/modules/api/service/SaleOrderService.java

@@ -206,6 +206,7 @@ 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();
@@ -281,10 +282,6 @@ public class SaleOrderService {
 //            f2.setValue("2021-11-12");
 //            formComponentValueVoList.add(f2);
 
-            OapiProcessinstanceCreateRequest.FormComponentValueVo f3= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
-            f3.setName("货物单价");
-            f3.setValue("0");
-            formComponentValueVoList.add(f3);
 
             OapiProcessinstanceCreateRequest.FormComponentValueVo f= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
             f.setName("制单人");
@@ -358,6 +355,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());
                 }else {
                     fc12.setValue("0");
@@ -388,6 +386,11 @@ public class SaleOrderService {
                 ls.add(mingxilist);
 
             }
+            OapiProcessinstanceCreateRequest.FormComponentValueVo f3= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
+            f3.setName("货物单价");
+            f3.setValue(countSum.toString());
+            formComponentValueVoList.add(f3);
+
             OapiProcessinstanceCreateRequest.FormComponentValueVo obj7 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
             obj7.setName("表格");
             obj7.setValue(JSON.toJSONString(ls));
@@ -453,6 +456,12 @@ public class SaleOrderService {
 
             if (saleOrderFTHS!=null&&saleOrderFTHS.size()>0){
                 for (SaleOrderFTH i:saleOrderFTHS){
+                    String[] split = i.getcVouchID().split("#");
+                    if (split.length>1){
+                        i.setcVouchID(split[0]+split[1]);
+                    }else {
+                        i.setcVouchID(split[0]);
+                    }
                     String cid=i.getDlid();
                     DynamicDataSource.setDataSource("slave-data-source");
                     String dlid=String.valueOf(testU8Service.callGetMaxCode("01"));
@@ -613,6 +622,12 @@ public class SaleOrderService {
 
             if (saleOrderBJS!=null&&saleOrderBJS.size()>0){
                 for (SaleOrderBJ i:saleOrderBJS){
+                    String[] split = i.getcCode().split("#");
+                    if (split.length>1){
+                        i.setcCode(split[0]+split[1]);
+                    }else {
+                        i.setcCode(split[0]);
+                    }
                     DynamicDataSource.setDataSource("slave-data-source");
                     int sumt = saleOrderMapper.UInsertSaleOrderBJ(i);
                     String s = saleOrderMapper.SaleOrderBJID(i.getcCode());
@@ -687,6 +702,12 @@ public class SaleOrderService {
             DynamicDataSource.setDataSource("");
             if (saleOrderFTHS!=null&&saleOrderFTHS.size()>0){
                 for (SaleOrderFTH i:saleOrderFTHS){
+                    String[] split = i.getcVouchID().split("#");
+                    if (split.length>1){
+                        i.setcVouchID(split[0]+split[1]);
+                    }else {
+                        i.setcVouchID(split[0]);
+                    }
                     String cid=i.getDlid();
                     DynamicDataSource.setDataSource("slave-data-source");
                     String dlid=String.valueOf(testU8Service.callGetMaxCode("01"));
@@ -1065,6 +1086,12 @@ public class SaleOrderService {
             DynamicDataSource.setDataSource("");
             if (saleOrderFTHS!=null&&saleOrderFTHS.size()>0){
                 for (SaleOrderFTH i:saleOrderFTHS){
+                    String[] split = i.getcVouchID().split("#");
+                    if (split.length>1){
+                        i.setcVouchID(split[0]+split[1]);
+                    }else {
+                        i.setcVouchID(split[0]);
+                    }
                     DynamicDataSource.setDataSource("slave-data-source");
                     String dlid=String.valueOf(testU8Service.callGetMaxCode("01"));
                     DynamicDataSource.setDataSource("");