楚江ERP：延期发货相关修改

@@ -157,7 +157,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 handleReplenishmentOrderStatus(flowStatus, businessId);
                 break;
             case "DELAYED_SHIPMENT":
-                handleDelayedShipmentData(flowStatus, businessId, variable.get("shipmentsOrderId"));
+                handleDelayedShipmentData(flowStatus, businessId);
                 break;
             default:
                 break;
@@ -494,6 +494,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         Object o = redisHandler.get("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
         if (o != null) {
             ticketVo.setPurchaseOrderId(String.valueOf(o));
+            redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
         }
         return ticketVo;
     }
@@ -504,13 +505,14 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
      * @param flowStatus
      * @param businessId
      */
-    private void handleDelayedShipmentData(String flowStatus, String businessId, Object shipmentsOrderId) {
+    private void handleDelayedShipmentData(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
             delayedShipmentService.updateStatus(businessId, "PASS");
             QueryDelayedShipmentDetailVo vo = new QueryDelayedShipmentDetailVo();
             vo.setDelayedShipmentId(businessId);
             List<DelayedShipmentDetail> query = delayedShipmentDetailService.query(vo);
+            Object shipmentsOrderId = redisHandler.get("GET_SHIPMENTS_ORDER_ID_" + businessId);
             if (shipmentsOrderId != null) {
                 QueryRequestCarTicketVo vo2 = new QueryRequestCarTicketVo();
                 vo2.setShipmentsOrderId(String.valueOf(shipmentsOrderId));
@@ -528,9 +530,11 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                         if (difference.compareTo(BigDecimal.ZERO) == 0) {
                             //删除要车单
                             requestCarTicketService.deleteById(requestCarTicketId);
+                            redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + businessId);
                         } else {
                             //更新计划吨位
                             requestCarTicketService.updateQuantity(requestCarTicketId, difference);
+                            redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + businessId);
                         }
                     }
                 }

@@ -10,6 +10,7 @@ import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.mq.core.service.MqProducerService;
+import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;;
@@ -43,6 +44,7 @@ import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.delay.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -78,6 +80,8 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     private RequestCarTicketService requestCarTicketService;
+    @Autowired
+    private RedisHandler redisHandler;
 
 
     @Override
@@ -210,6 +214,8 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         if (delayedExceedOneDay && !hasAny) {
             //开启审核
             vo.setWorkshopCode(delayedShipmentDetail.getWorkshopCode());
+            String key = "GET_SHIPMENTS_ORDER_ID_" + data.getId();
+            redisHandler.set(key, vo.getShipmentsOrderId());
 
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
         } else {