楚江ERP：要车单-审核人

@@ -175,9 +175,15 @@ public class GetDraftRequestCarTicketBo extends BaseBo<DraftRequestCarTicket> {
     /**
     /**
      * 是否展示审核按钮
      * 是否展示审核按钮
      */
      */
-    @TableField(exist = false)
+    @ApiModelProperty("是否展示审核按钮")
     private boolean showExamine;
     private boolean showExamine;
 
 
+    /**
+     * 来源
+     */
+    @ApiModelProperty("来源")
+    private String source;
+
     public GetDraftRequestCarTicketBo() {
     public GetDraftRequestCarTicketBo() {
 
 
     }
     }

@@ -154,6 +154,11 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
     private String status;
     private String status;
 
 
     /**
     /**
+     * 来源
+     */
+    private String source;
+
+    /**
      * 是否展示审核按钮
      * 是否展示审核按钮
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -19,6 +19,7 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.service.order.*;
 import com.lframework.xingyun.sc.service.order.*;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
+import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
@@ -27,6 +28,8 @@ import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
+import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
+import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -39,6 +42,7 @@ import org.springframework.stereotype.Component;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -86,6 +90,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private DelayedShipmentService delayedShipmentService;
     private DelayedShipmentService delayedShipmentService;
     @Resource
     @Resource
     private DelayedShipmentDetailService delayedShipmentDetailService;
     private DelayedShipmentDetailService delayedShipmentDetailService;
+    @Resource
+    private CarRequestPlanService carRequestPlanService;
 
 
 
 
 
 
@@ -439,6 +445,18 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             draftRequestCarTicketService.updateStatus(businessId, "PASS");
             draftRequestCarTicketService.updateStatus(businessId, "PASS");
             //更新外办审核人
             //更新外办审核人
             draftRequestCarTicketService.updateExamineUser(businessId, SecurityUtil.getCurrentUser().getId(), null, null);
             draftRequestCarTicketService.updateExamineUser(businessId, SecurityUtil.getCurrentUser().getId(), null, null);
+            //如果是发货计划生成的草稿要车单-需要生成要车单和要车计划
+            DraftRequestCarTicket draftRequestCarTicket = draftRequestCarTicketService.findById(businessId);
+            if (StringUtils.isNotEmpty(draftRequestCarTicket.getSource()) && "SHIPMENTSPLAN".equals(draftRequestCarTicket.getSource())) {
+                // 生成要车计划
+                CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
+                planCreateVo.setRequestCarDate(LocalDate.now());
+                planCreateVo.setWorkshopId(draftRequestCarTicket.getWorkshopId());
+                String requestCarPlanId = carRequestPlanService.create(planCreateVo);
+                // 生成要车单
+                CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(draftRequestCarTicket,requestCarPlanId);
+                requestCarTicketService.create(ticketCreateVo);
+            }
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
                 || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
@@ -448,6 +466,35 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         }
         }
     }
     }
 
 
+    /**
+     * 封装要车单数据
+     *
+     * @param draftRequestCarTicket 草稿要车单
+     * @return CreateRequestCarTicketVo
+     */
+    private CreateRequestCarTicketVo packRequestCarTicket(DraftRequestCarTicket draftRequestCarTicket, String requestCarPlanId) {
+        CreateRequestCarTicketVo ticketVo = new CreateRequestCarTicketVo();
+        PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(draftRequestCarTicket.getId());
+        ticketVo.setDraftId(draftRequestCarTicket.getId());
+        ticketVo.setPlanId(requestCarPlanId);
+        ticketVo.setPurchaseOrderId(draftRequestCarTicket.getPurchaseOrderId());
+        ticketVo.setRequestCarDate(LocalDate.now());
+        ticketVo.setDeptId(draftRequestCarTicket.getDeptId());
+        ticketVo.setDeliveryDate(draftRequestCarTicket.getDeliveryDate());
+        ticketVo.setWorkshopId(draftRequestCarTicket.getWorkshopId());
+        ticketVo.setOrderNo(draftRequestCarTicket.getOrderNo());
+        ticketVo.setOrderingUnit(draftRequestCarTicket.getOrderingUnit());
+        if (orderInfo.getTotalQuantity() != null) {
+            BigDecimal result = orderInfo.getTotalQuantity().divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
+            ticketVo.setQuantity(result);
+        }
+        //外办审核人(草稿要车单审核人)
+        ticketVo.setExternalAuditor(SecurityUtil.getCurrentUser().getId());
+        //经营办审核人(发货计划提交人)
+        ticketVo.setBusinessOfficeAuditor(draftRequestCarTicket.getBusinessOfficeAuditor());
+        return ticketVo;
+    }
+
     private void handleDelayedShipmentData(String flowStatus, String businessId) {
     private void handleDelayedShipmentData(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {

@@ -529,7 +529,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 planCreateVo.setWorkshopId(orderInfo.getWorkshopId());
                 planCreateVo.setWorkshopId(orderInfo.getWorkshopId());
                 String requestCarPlanId = carRequestPlanService.create(planCreateVo);
                 String requestCarPlanId = carRequestPlanService.create(planCreateVo);
                 // 生成要车单
                 // 生成要车单
-                CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(orderInfo, requestCarPlanId, draftTicket.getId(), plan.getTomoPreShipDate());
+                CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(orderInfo, requestCarPlanId,
+                        draftTicket.getId(), plan.getTomoPreShipDate(), draftTicket.getExternalAuditor());
                 requestCarTicketService.create(ticketCreateVo);
                 requestCarTicketService.create(ticketCreateVo);
             } else {
             } else {
                 throw new DefaultClientException("请先补充草稿要车单数据！");
                 throw new DefaultClientException("请先补充草稿要车单数据！");
@@ -557,6 +558,10 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             BigDecimal result = orderInfo.getTotalQuantity().divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
             BigDecimal result = orderInfo.getTotalQuantity().divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
             draftTicketVo.setQuantity(result);
             draftTicketVo.setQuantity(result);
         }
         }
+        //经营办审核人(发货计划提交人)
+        draftTicketVo.setBusinessOfficeAuditor(SecurityUtil.getCurrentUser().getId());
+        //发货计划
+        draftTicketVo.setSource("SHIPMENTSPLAN");
         return draftTicketVo;
         return draftTicketVo;
     }
     }
 
 
@@ -564,12 +569,13 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
      * 封装要车单数据
      * 封装要车单数据
      *
      *
      * @param orderInfo 订货单数据
      * @param orderInfo 订货单数据
-     * @return          CreateRequestCarTicketVo
+     * @return CreateRequestCarTicketVo
      */
      */
-    private CreateRequestCarTicketVo packRequestCarTicket(PurchaseOrderInfo orderInfo, String planId, String draftId, LocalDate shipmentsDate) {
+    private CreateRequestCarTicketVo packRequestCarTicket(PurchaseOrderInfo orderInfo, String planId, String draftId,
+                                                          LocalDate shipmentsDate, String externalAuditor) {
         CreateRequestCarTicketVo ticketVo = new CreateRequestCarTicketVo();
         CreateRequestCarTicketVo ticketVo = new CreateRequestCarTicketVo();
         ticketVo.setDraftId(draftId);
         ticketVo.setDraftId(draftId);
-        ticketVo.setPlanId(draftId);
+        ticketVo.setPlanId(planId);
         ticketVo.setPurchaseOrderId(orderInfo.getId());
         ticketVo.setPurchaseOrderId(orderInfo.getId());
         ticketVo.setRequestCarDate(LocalDate.now());
         ticketVo.setRequestCarDate(LocalDate.now());
         ticketVo.setDeptId(orderInfo.getDeptId());
         ticketVo.setDeptId(orderInfo.getDeptId());
@@ -581,6 +587,10 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             BigDecimal result = orderInfo.getTotalQuantity().divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
             BigDecimal result = orderInfo.getTotalQuantity().divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
             ticketVo.setQuantity(result);
             ticketVo.setQuantity(result);
         }
         }
+        //外办审核人(草稿要车单审核人)
+        ticketVo.setExternalAuditor(externalAuditor);
+        //经营办审核人(发货计划提交人)
+        ticketVo.setBusinessOfficeAuditor(SecurityUtil.getCurrentUser().getId());
         return ticketVo;
         return ticketVo;
     }
     }
 }
 }

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -18,22 +19,26 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.CarRequestPlan;
 import com.lframework.xingyun.sc.entity.CarRequestPlan;
+import com.lframework.xingyun.sc.entity.RequestCarTicket;
 import com.lframework.xingyun.sc.mappers.CarRequestPlanMapper;
 import com.lframework.xingyun.sc.mappers.CarRequestPlanMapper;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
+import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryCarRequestPlanVo;
+import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.UpdateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.UpdateCarRequestPlanVo;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanMapper, CarRequestPlan> implements CarRequestPlanService {
 public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanMapper, CarRequestPlan> implements CarRequestPlanService {
+    @Resource
+    private RequestCarTicketService requestCarTicketService;
 
 
     @Override
     @Override
     public PageResult<CarRequestPlan> query(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo) {
     public PageResult<CarRequestPlan> query(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo) {
@@ -115,6 +120,18 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
 
 
+        //更新要车单运作科审核人
+        QueryRequestCarTicketVo vo1 = new QueryRequestCarTicketVo();
+        vo1.setPlanId(vo.getId());
+        List<RequestCarTicket> query = requestCarTicketService.query(vo1);
+        if (CollectionUtil.isNotEmpty(query)) {
+            List<String> ids = query.stream()
+                    .map(RequestCarTicket::getId)
+                    .collect(Collectors.toList());
+            String currentUserId = SecurityUtil.getCurrentUser().getId();
+            requestCarTicketService.updateExamineUserBatch(ids, null, null, currentUserId);
+        }
+
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
     }
     }

@@ -157,6 +157,9 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         } else {
         } else {
             data.setStatus("AUDIT");
             data.setStatus("AUDIT");
         }
         }
+        if (!StringUtil.isBlank(vo.getSource())) {
+            data.setSource(vo.getSource());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -197,19 +198,15 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         OpLogUtil.setExtra(id);
         OpLogUtil.setExtra(id);
     }
     }
 
 
-    @OpLog(type = OtherOpLogType.class, name = "更新要车单审核人，ID：{}", params = {"#id"})
+    @OpLog(type = OtherOpLogType.class, name = "批量更新要车单审核人，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
-    public void updateExamineUser(String id, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor) {
-        if (StringUtils.isBlank(id)) {
+    public void updateExamineUserBatch(List<String> ids, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor) {
+        if (CollectionUtil.isEmpty(ids)) {
             return;
             return;
         }
         }
-        RequestCarTicket data = getBaseMapper().findById(id);
-        if (ObjectUtil.isNull(data)) {
-            throw new DefaultClientException("要车单不存在！");
-        }
         LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
         LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
-                .eq(RequestCarTicket::getId, id);
+                .in(RequestCarTicket::getId, ids);
         if (externalAuditor != null) {
         if (externalAuditor != null) {
             updateWrapper.set(RequestCarTicket::getExternalAuditor, externalAuditor);
             updateWrapper.set(RequestCarTicket::getExternalAuditor, externalAuditor);
         }
         }
@@ -222,8 +219,8 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
 
 
-        OpLogUtil.setVariable("id", data.getId());
-        OpLogUtil.setExtra(id);
+        OpLogUtil.setVariable("id", ids);
+        OpLogUtil.setExtra(ids);
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "删除要车单表，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "删除要车单表，ID：{}", params = {"#id"})

@@ -57,12 +57,12 @@ public interface RequestCarTicketService extends BaseMpService<RequestCarTicket>
     /**
     /**
      * 更新审核人
      * 更新审核人
      *
      *
-     * @param id     主键
-     * @param externalAuditor 外办审核人
-     * @param businessOfficeAuditor 经营办审核人
+     * @param ids                          主键集合
+     * @param externalAuditor             外办审核人
+     * @param businessOfficeAuditor       经营办审核人
      * @param operationsDepartmentAuditor 运作科审核人
      * @param operationsDepartmentAuditor 运作科审核人
      */
      */
-    void updateExamineUser(String id, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor);
+    void updateExamineUserBatch(List<String> ids, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor);
 
 
     /**
     /**
      * 根据ID删除
      * 根据ID删除

@@ -130,4 +130,10 @@ public class CreateDraftRequestCarTicketVo implements BaseVo, Serializable {
     @ApiModelProperty("审核状态")
     @ApiModelProperty("审核状态")
     private String status;
     private String status;
 
 
+    /**
+     * 来源
+     */
+    @ApiModelProperty("来源")
+    private String source;
+
 }
 }

@@ -27,6 +27,7 @@
         <result column="operations_department_auditor" property="operationsDepartmentAuditor"/>
         <result column="operations_department_auditor" property="operationsDepartmentAuditor"/>
         <result column="operations_department_auditor_name" property="operationsDepartmentAuditorName"/>
         <result column="operations_department_auditor_name" property="operationsDepartmentAuditorName"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
+        <result column="source" property="source"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -61,6 +62,7 @@
             tb.operations_department_auditor,
             tb.operations_department_auditor,
             su2.name AS operations_department_auditor_name,
             su2.name AS operations_department_auditor_name,
             tb.status,
             tb.status,
+            tb.source,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,