dd

xggsve-order/app/base/service/impl/order/oorderSve.js

@@ -257,6 +257,7 @@ class OorderService extends ServiceBase {
     try {
     try {
       // 查询所有产品子项
       // 查询所有产品子项
       let productList = await this.oproductDao.findListByPid(productPid);
       let productList = await this.oproductDao.findListByPid(productPid);
+      let productMap = {};
 
 
       // 根据所选产品id, 查询产品流程
       // 根据所选产品id, 查询产品流程
       let productIds = [];    //结果  10010100 10010200 10010500 10010600
       let productIds = [];    //结果  10010100 10010200 10010500 10010600
@@ -266,6 +267,7 @@ class OorderService extends ServiceBase {
           continue;
           continue;
         }
         }
         productIds.push(product.id);
         productIds.push(product.id);
+        productMap[product.id] = product;
       }
       }
       if (productIds.length == 0) {
       if (productIds.length == 0) {
         return null;
         return null;
@@ -313,7 +315,10 @@ class OorderService extends ServiceBase {
         if(new_oorderProcessInfo[j].change_func_flag){
         if(new_oorderProcessInfo[j].change_func_flag){
           let current= new_oorderProcessInfo[j];
           let current= new_oorderProcessInfo[j];
           let pre= new_oorderProcessInfo[j-1];
           let pre= new_oorderProcessInfo[j-1];
-          pre.func=current.change_func;
+          let pre_product  = productMap[pre.productId];
+          if(pre_product.is_choose) {
+            pre.func=current.change_func;
+          }
           let preNextStatus = JSON.parse(pre.next_status)[0];
           let preNextStatus = JSON.parse(pre.next_status)[0];
           preNextStatus.next_status=current.status;
           preNextStatus.next_status=current.status;
           preNextStatus.next_name=current.name;
           preNextStatus.next_name=current.name;