LG88888888 %!s(int64=3) %!d(string=hai) anos
pai
achega
b1748dbdd2

+ 3 - 3
src/main/java/net/chenlin/dp/modules/TaskDemo.java

@@ -52,7 +52,7 @@ public class TaskDemo {
     public static void autoSaleToDingJob() throws OpenAPIException, ApiException {
         SaleOrderController saleOrderController=new SaleOrderController();
         saleOrderController.dingSaleOrder("slave-data-source","1");
-        saleOrderController.dingSaleOrder("slave-data-source02","2");
+        saleOrderController.dingSaleOrder("slave-data-source03","3");
         System.out.println("===========销售订单同步至钉钉定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }
@@ -63,7 +63,7 @@ public class TaskDemo {
     public static void autoOrderToDingJob() throws OpenAPIException, ApiException {
         PurchaseOrderController purchaseOrderController=new PurchaseOrderController();
         purchaseOrderController.dingPurchaseOrder("slave-data-source","1");
-        purchaseOrderController.dingPurchaseOrder("slave-data-source02","2");
+        purchaseOrderController.dingPurchaseOrder("slave-data-source03","3");
         System.out.println("===========采购订单同步至钉钉定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }
@@ -74,7 +74,7 @@ public class TaskDemo {
     public static void autoFkdToDingJob() throws OpenAPIException, ApiException {
         PayrequestController payrequestController=new PayrequestController();
         payrequestController.dingPayrequest("slave-data-source","1");
-        payrequestController.dingPayrequest("slave-data-source02","2");
+        payrequestController.dingPayrequest("slave-data-source03","3");
         System.out.println("===========付款申请单同步至钉钉定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }

+ 28 - 0
src/main/java/net/chenlin/dp/modules/api/service/SaleOrderService.java

@@ -364,6 +364,16 @@ public class SaleOrderService {
                 }
                 mingxilist.add(fc12);
 
+
+                OapiProcessinstanceCreateRequest.FormComponentValueVo je= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
+                je.setName("金额(元)");
+                if(s.getSum()!=null&&!s.getSum().equals("0E-10")){
+                    je.setValue(s.getSum());
+                }else {
+                    je.setValue("0");
+                }
+                mingxilist.add(je);
+
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc13= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc13.setName("交期");
                 if (s.getDefine23()!=null&&!s.getDefine23().equals("")){
@@ -986,6 +996,12 @@ public class SaleOrderService {
             List<ISaleOrder> saleOrderFHS = saleOrderMapper.CrmISYDOrder();
             if (saleOrderFHS!=null&&saleOrderFHS.size()>0){
                 for (ISaleOrder i:saleOrderFHS){
+                    String[] split = i.getCode().split("#");
+                    if (split.length>1){
+                        i.setCode(split[0]+split[1]);
+                    }else {
+                        i.setCode(split[0]);
+                    }
                     String id=i.getCloser();
                     i.setTypecode("02");
                     List<ISaleOrderMin> saleOrderFHMins = saleOrderMapper.CrmISYDOrderMin(i.getCloser());
@@ -1144,6 +1160,12 @@ public class SaleOrderService {
             List<ISaleOrder> iSaleOrders = saleOrderMapper.ISaleOrderList();
             if (iSaleOrders!=null&&iSaleOrders.size()>0){
                 for (ISaleOrder i:iSaleOrders){
+                    String[] split = i.getCode().split("#");
+                    if (split.length>1){
+                        i.setCode(split[0]+split[1]);
+                    }else {
+                        i.setCode(split[0]);
+                    }
                     String id=i.getCloser();
                     List<ISaleOrderMin> iSaleOrderMins = saleOrderMapper.ISaleOrderMin(i.getCloser());
                     i.setEntry(iSaleOrderMins);
@@ -1171,6 +1193,12 @@ public class SaleOrderService {
             List<ISaleOrder> iSaleOrders = saleOrderMapper.IDYDOrder();
             if (iSaleOrders!=null&&iSaleOrders.size()>0){
                 for (ISaleOrder i:iSaleOrders){
+                    String[] split = i.getCode().split("#");
+                    if (split.length>1){
+                        i.setCode(split[0]+split[1]);
+                    }else {
+                        i.setCode(split[0]);
+                    }
                     String id=i.getCloser();
                     List<ISaleOrderMin> iSaleOrderMins = saleOrderMapper.IDYDOrderMin(i.getCloser());
                     i.setEntry(iSaleOrderMins);