Merge branch 'master_cj_zq' into master_sample_order

@@ -545,6 +545,25 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 // 生成要车单
                 // 生成要车单
                 CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(draftRequestCarTicket, requestCarPlanId, variable);
                 CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(draftRequestCarTicket, requestCarPlanId, variable);
                 requestCarTicketService.create(ticketCreateVo);
                 requestCarTicketService.create(ticketCreateVo);
+                // 处理发货单
+                List<String> orderIds = shipmentsPlanDetailService.getOrderIdByShipmentOrderId(ticketCreateVo.getShipmentsOrderId());
+                List<DraftRequestCarTicket> draftRequestCarTicketList = draftRequestCarTicketService.listByOrderId(orderIds);
+                if (CollectionUtils.isNotEmpty(draftRequestCarTicketList)) {
+                    boolean flag = true;
+                    for (DraftRequestCarTicket draftTicket : draftRequestCarTicketList) {
+                        if (businessId.equals(draftTicket.getId())) {
+                            continue;
+                        }
+                        if (!"PASS".equals(draftTicket.getStatus())) {
+                            flag = false;
+                            break;
+                        }
+                    }
+                    if (flag) {
+                        // 更新订货单状态（草稿转为正常）
+                        shipmentsOrderInfoService.updateStatus(ticketCreateVo.getShipmentsOrderId(), "UN_SHIPMENTS");
+                    }
+                }
             }
             }
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
@@ -575,12 +594,12 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         ticketVo.setOrderNo(draftRequestCarTicket.getOrderNo());
         ticketVo.setOrderNo(draftRequestCarTicket.getOrderNo());
         ticketVo.setOrderingUnit(draftRequestCarTicket.getOrderingUnit());
         ticketVo.setOrderingUnit(draftRequestCarTicket.getOrderingUnit());
         ticketVo.setQuantity(draftRequestCarTicket.getQuantity());
         ticketVo.setQuantity(draftRequestCarTicket.getQuantity());
-        ticketVo.setDestination(String.valueOf(variable.get("destination")));
-        ticketVo.setConsignee(String.valueOf(variable.get("consignee")));
-        ticketVo.setPhone(String.valueOf(variable.get("phone")));
-        ticketVo.setReturnPlanArrangement(String.valueOf(variable.get("returnPlanArrangement")));
-        ticketVo.setOther(String.valueOf(variable.get("other")));
-        ticketVo.setSpecialLoadingRequirement(String.valueOf(variable.get("specialLoadingRequirement")));
+        ticketVo.setDestination((String) variable.get("destination"));
+        ticketVo.setConsignee((String) variable.get("consignee"));
+        ticketVo.setPhone((String) variable.get("phone"));
+        ticketVo.setReturnPlanArrangement((String) variable.get("returnPlanArrangement"));
+        ticketVo.setOther((String) variable.get("other"));
+        ticketVo.setSpecialLoadingRequirement((String) variable.get("specialLoadingRequirement"));
         //外办审核人(草稿要车单审核人)
         //外办审核人(草稿要车单审核人)
         ticketVo.setExternalAuditor(SecurityUtil.getCurrentUser().getId());
         ticketVo.setExternalAuditor(SecurityUtil.getCurrentUser().getId());
         //经营办审核人(发货计划提交人)
         //经营办审核人(发货计划提交人)
@@ -600,8 +619,6 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             String loadingTime = minTime.format(formatter);
             String loadingTime = minTime.format(formatter);
             ticketVo.setLoadingTime(loadingTime);
             ticketVo.setLoadingTime(loadingTime);
             redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
             redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
-            // 更新订货单状态（草稿转为正常）
-            shipmentsOrderInfoService.updateStatus(ticketVo.getShipmentsOrderId(), "UN_SHIPMENTS");
         }
         }
         return ticketVo;
         return ticketVo;
     }
     }

@@ -302,7 +302,7 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
         vo.setOrderingUnit(purchaseOrderInfo.getOrderingUnit());
         vo.setOrderingUnit(purchaseOrderInfo.getOrderingUnit());
         vo.setSettlementTerms(purchaseOrderInfo.getSettlementTerms());
         vo.setSettlementTerms(purchaseOrderInfo.getSettlementTerms());
         vo.setDeliveryMethod(purchaseOrderInfo.getDeliveryMethod());
         vo.setDeliveryMethod(purchaseOrderInfo.getDeliveryMethod());
-        vo.setContractCreateById(purchaseOrderInfo.getContractCreateById());
+        vo.setContractCreateById(data.getCreateById());
         vo.setDeptId(purchaseOrderInfo.getDeptId());
         vo.setDeptId(purchaseOrderInfo.getDeptId());
         vo.setRegion(purchaseOrderInfo.getRegion());
         vo.setRegion(purchaseOrderInfo.getRegion());
         vo.setStockUpCompanyId(purchaseOrderInfo.getStockUpCompanyId());
         vo.setStockUpCompanyId(purchaseOrderInfo.getStockUpCompanyId());

@@ -559,6 +559,20 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         getBaseMapper().delete(updateWrapper);
         getBaseMapper().delete(updateWrapper);
     }
     }
 
 
+    @Override
+    public List<String> getOrderIdByShipmentOrderId(String shipmentOrderId) {
+        if (StringUtils.isBlank(shipmentOrderId)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+        queryWrapper.eq(ShipmentsPlanDetail::getShipmentOrderId, shipmentOrderId);
+        List<ShipmentsPlanDetail> detailList = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(detailList)) {
+            return Collections.emptyList();
+        }
+        return detailList.stream().map(ShipmentsPlanDetail::getOrderId).distinct().collect(Collectors.toList());
+    }
+
 
 
     /**
     /**
      * 封装发货计划明细数据
      * 封装发货计划明细数据

@@ -154,4 +154,12 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @param orderIds  订货单ID集合
      * @param orderIds  订货单ID集合
      */
      */
     void delByOrderIds(List<String> orderIds);
     void delByOrderIds(List<String> orderIds);
+
+    /**
+     * 根据发货单ID获取所有订货单
+     *
+     * @param shipmentOrderId   发货单ID
+     * @return                  List<String>
+     */
+    List<String> getOrderIdByShipmentOrderId(String shipmentOrderId);
 }
 }