异常结束

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/SaleOrderServiceImpl.java

@@ -7,11 +7,13 @@ import com.zkqy.business.domain.*;
 import com.zkqy.business.domain.vo.SaleOrderVO;
 import com.zkqy.business.domain.vo.SaleProductsVo;
 import com.zkqy.business.mapper.*;
+import com.zkqy.business.service.ISaleProductsService;
 import com.zkqy.common.core.domain.entity.SysRole;
 import com.zkqy.common.core.domain.entity.SysUser;
 import com.zkqy.common.utils.DateUtils;
 import com.zkqy.common.utils.SecurityUtils;
 import com.zkqy.common.utils.bean.BeanUtils;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
 import com.zkqy.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +34,9 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
     @Autowired
     private SaleProductsMapper saleProductsMapper;
 
+    @Autowired // 执行流程
+    private BpmExecuteProcessMapper runBpmExecuteProcessMapper;
+
     @Autowired
     private SaleCraftMapper saleCraftMapper;
 
@@ -53,6 +58,8 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
     @Autowired
     private ProductOutboundRecordBatchMapper productOutboundRecordBatchMapper;
 
+    @Autowired
+    private ISaleProductsService saleProductsService;
     /**
      * 查询销售订单
      *
@@ -365,6 +372,19 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
 //            ret
 //        }
 
+        //修改任务状态
+        SaleProducts saleProducts = new SaleProductsVo();
+        saleProducts.setSaleOrderNo(saleOrder.getSaleNo());
+        List<SaleProducts> list = saleProductsService.selectSaleProductsList(saleProducts);
+        for(int i = 0;i < list.size();i++)
+        {
+            String openid = list.get(i).getId().toString();
+            // 更改任务流程状态
+            int c = runBpmExecuteProcessMapper.endProcessExit(openid);
+        }
+        //修改产品上机状态
+        saleProducts.setStatus("12");
+        saleProductsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         ProductInvoice productInvoice1 = new ProductInvoice();
         // 发货单/通知单-》完成状态
         productInvoice1.setStatus("2");

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -336,7 +336,8 @@
             <if test="onBoardState != null">on_board_state = #{onBoardState},</if>
             <if test="colours != null">colours = #{colours},</if>
         </trim>
-        where sale_order_no = #{saleOrderNo} and id=#{id}
+        where sale_order_no = #{saleOrderNo}
+        <if test="id != null">and id=#{id}</if>
     </update>
 
     <delete id="deleteSaleProductsById" parameterType="Long">

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/mapper/BpmExecuteProcessMapper.java

@@ -148,6 +148,14 @@ public interface BpmExecuteProcessMapper {
      */
     int endProcess(String taskKey);
 
+    /**
+     * 异常结束流程
+     *
+     * @param taskKey
+     * @return
+     */
+    int endProcessExit(String taskKey);
+
     /**
      * 修改当前流程执行节点
      *

zkqy-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteProcessMapper.xml

@@ -467,6 +467,12 @@
         where task_key = #{taskKey}
     </update>
 
+    <update id="endProcessExit" parameterType="String">
+        update {DBNAME}.bpm_execute_process
+        SET task_process_state = 2
+        where task_plan_key = #{taskKey}
+    </update>
+
     <update id="updateProcessNode" parameterType="com.zkqy.execution.produce.dispersed.entity.BpmExecuteProcess">
         update {DBNAME}.bpm_execute_process
         <trim prefix="SET" suffixOverrides=",">