异常结束，结束排产任务

zkqy-custom-business/src/main/java/com/zkqy/business/mapper/DetailsOfTheRefuelingPlanMapper.java

@@ -89,6 +89,12 @@ public interface DetailsOfTheRefuelingPlanMapper
      */
     public int deleteDetailsOfTheRefuelingPlanByIds(Long[] ids);
 
+    /**
+     * 根据订单号删除排产计划
+     * @param ids
+     * @return
+     */
+    public int deleteDetailsOfTheRefuelingPlanBySalesmanId(List<String> ids);
     /**
      * 删除当前机台下的虚拟数据，不管AB面
      * @param machineId

zkqy-custom-business/src/main/java/com/zkqy/business/mapper/DetailsOfTheRefuelingPlanSpinningMapper.java

@@ -97,4 +97,11 @@ public interface DetailsOfTheRefuelingPlanSpinningMapper
      * @return
      */
     List<DetailsOfTheRefuelingPlanSpinning> getUpdatePlanSpinningInfo(DetailsOfTheRefuelingPlanSpinningVo detailsOfTheRefuelingPlanSpinning);
+
+    /**
+     * 根据生产订单删除计划信息
+     * @param delPlanSaleNo
+     * @return
+     */
+    int deleteDetailsOfTheRefuelingPlanSpinningBySalesmanId(List<String> delPlanSaleNo);
 }

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

@@ -34,6 +34,12 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
     @Autowired
     private SaleProductsMapper saleProductsMapper;
 
+    @Autowired
+    private DetailsOfTheRefuelingPlanMapper detailsOfTheRefuelingPlanMapper;
+
+    @Autowired
+    private DetailsOfTheRefuelingPlanSpinningMapper detailsOfTheRefuelingPlanSpinningMapper;
+
     @Autowired // 执行流程
     private BpmExecuteProcessMapper runBpmExecuteProcessMapper;
 
@@ -60,6 +66,8 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
 
     @Autowired
     private ISaleProductsService saleProductsService;
+
+
     /**
      * 查询销售订单
      *
@@ -140,8 +148,9 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
             }
             //根据合同号删除通知单
             productInvoiceMapper.deleteProductInvoiceBySaleOrderNo(saleOrder.getSaleNo());
-
         });
+        //排产计划删除
+
         //删除销售工艺
         if (saleOrderNos.size() > 0) {
             saleCraftMapper.deleteSaleCraftBysaleOrderNos(saleOrderNos);
@@ -326,7 +335,6 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
     @Override
     @Transactional
     public int cancelRetailOrder(ProductInvoice productInvoice) {
-
         //删除通知单
         productInvoiceMapper.deleteProductInvoiceBySaleOrderNo(productInvoice.getSaleOrderNo());
 
@@ -371,20 +379,29 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
 //        if (sales.size() != 0) {
 //            ret
 //        }
+        if(saleOrder.getStatus().equals("12")){
+            //修改任务状态
+            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 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);
+            //改上机排产状态
+            List<String > delPlanSaleNo=new ArrayList<>();
+            delPlanSaleNo.add(saleOrder.getSaleNo());
+            int i1 = detailsOfTheRefuelingPlanMapper.deleteDetailsOfTheRefuelingPlanBySalesmanId(delPlanSaleNo);
+            int i2 = detailsOfTheRefuelingPlanSpinningMapper.deleteDetailsOfTheRefuelingPlanSpinningBySalesmanId(delPlanSaleNo);
+            //删除对应的排产计划
+
+            //修改产品上机状态
+            saleProducts.setStatus("12");
+            saleProductsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         }
-        //修改产品上机状态
-        saleProducts.setStatus("12");
-        saleProductsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         ProductInvoice productInvoice1 = new ProductInvoice();
         // 发货单/通知单-》完成状态
         productInvoice1.setStatus("2");
@@ -393,11 +410,13 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
         return saleOrderMapper.updateSaleOrder(saleOrder);
     }
 
+
     @Override
     public List<SaleOrderVO> outsourceOrderList(SaleOrder saleOrder) {
         return saleOrderMapper.selectOutsourceOrderList(saleOrder);
     }
 
+
     @Override
     @Transactional
     public int addOutsourceOrder(SaleOrderVO vo) {
@@ -418,6 +437,7 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
         return saleCraftMapper.insertSaleCraft(vo.getSaleCraft());
     }
 
+
     @Override
     public SaleOrderVO getOutsourceOrderInfo(String saleNo) {
         //销售单详情
@@ -435,6 +455,7 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
         return saleOrderVO;
     }
 
+
     @Override
     @Transactional
     public int editOutsourceOrder(SaleOrderVO vo) {

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

@@ -230,6 +230,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <delete id="deleteDetailsOfTheRefuelingPlanBySalesmanId" parameterType="String">
+        delete from {DBNAME}.details_of_the_refueling_plan where salesman_id in
+        <foreach item="id" collection="list" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
     <delete id="deleteDetailsOfTheRefuelingPlanByMachineId">
         delete from {DBNAME}.details_of_the_refueling_plan where machine_id = #{machineId} and timestamp_random_code='停机';
     </delete>

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

@@ -201,8 +201,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-
-
+    <delete id="deleteDetailsOfTheRefuelingPlanSpinningBySalesmanId">
+        delete from {DBNAME}.details_of_the_refueling_plan_spinning where salesman_id in
+        <foreach item="id" collection="list" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
 
     <insert id="insertBatchDetailsOfTheRefuelingPlanSpinning" parameterType="java.util.List">