Merge remote-tracking branch 'origin/master_0929' into master_0929

+package com.lframework.xingyun.sc.bo.shipments.car;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 草稿要车单表 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetDraftRequestCarTicketBo extends BaseBo<DraftRequestCarTicket> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
+     * 要车日期
+     */
+    @ApiModelProperty("要车日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate requestCarData;
+
+    /**
+     * 要车办事处
+     */
+    @ApiModelProperty("要车办事处")
+    private String deptId;
+
+    /**
+     * 要车办事处名称
+     */
+    @ApiModelProperty("要车办事处名称")
+    private String deptName;
+
+    /**
+     * 计划装货日期
+     */
+    @ApiModelProperty("计划装货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate deliveryDate;
+
+    /**
+     * 装货厂别
+     */
+    @ApiModelProperty("装货厂别")
+    private String workshopId;
+
+    /**
+     * 装货厂别名称
+     */
+    @ApiModelProperty("装货厂别名称")
+    private String workshopName;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 客户名称【简称】
+     */
+    @ApiModelProperty("客户名称【简称】")
+    private String customerShortName;
+
+    /**
+     * 卸货地点
+     */
+    @ApiModelProperty("卸货地点")
+    private String destination;
+
+    /**
+     * 计划吨位
+     */
+    @ApiModelProperty("计划吨位")
+    private BigDecimal quantity;
+
+    /**
+     * 接货人联络人
+     */
+    @ApiModelProperty("接货人联络人")
+    private String consignee;
+
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty("联系电话")
+    private String phone;
+
+    /**
+     * 回货计划安排（退料/角料）
+     */
+    @ApiModelProperty("回货计划安排（退料/角料）")
+    private String returnPlanArrangement;
+
+    /**
+     * 特殊需求、其他等
+     */
+    @ApiModelProperty("特殊需求、其他等")
+    private String other;
+
+    /**
+     * 外办审核人
+     */
+    @ApiModelProperty("外办审核人")
+    private String externalAuditor;
+
+    /**
+     * 外办审核人名称
+     */
+    @ApiModelProperty("外办审核人名称")
+    private String externalAuditorName;
+
+    /**
+     * 装货时间
+     */
+    @ApiModelProperty("装货时间")
+    private String loadingTime;
+
+    /**
+     * 装货特别要求/需求
+     */
+    @ApiModelProperty("装货特别要求/需求")
+    private String specialLoadingRequirement;
+
+    /**
+     * 经营办审核人
+     */
+    @ApiModelProperty("经营办审核人")
+    private String businessOfficeAuditor;
+
+    /**
+     * 经营办审核人名称
+     */
+    @ApiModelProperty("经营办审核人名称")
+    private String businessOfficeAuditorName;
+
+    /**
+     * 运作科审核人
+     */
+    @ApiModelProperty("运作科审核人")
+    private String operationsDepartmentAuditor;
+
+    /**
+     * 运作科审核人名称
+     */
+    @ApiModelProperty("运作科审核人名称")
+    private String operationsDepartmentAuditorName;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+    public GetDraftRequestCarTicketBo() {
+
+    }
+
+    public GetDraftRequestCarTicketBo(DraftRequestCarTicket dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<DraftRequestCarTicket> convert(DraftRequestCarTicket dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(DraftRequestCarTicket dto) {
+
+    }
+}

@@ -26,6 +26,18 @@ public class GetRequestCarTicketBo extends BaseBo<RequestCarTicket> {
     private String id;
 
     /**
+     * 草稿要车单ID
+     */
+    @ApiModelProperty("草稿要车单ID")
+    private String draftId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
      * 要车日期
      */
     @ApiModelProperty("要车日期")

+package com.lframework.xingyun.sc.controller.shipments.car;
+
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.xingyun.sc.bo.shipments.car.GetDraftRequestCarTicketBo;
+import com.lframework.xingyun.sc.bo.shipments.car.GetRequestCarTicketBo;
+import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
+import com.lframework.xingyun.sc.entity.RequestCarTicket;
+import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
+import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
+import com.lframework.xingyun.sc.vo.shipments.car.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 草稿要车单表 Controller
+ *
+ */
+@Api(tags = "草稿要车单表")
+@Validated
+@RestController
+@RequestMapping("/draftRequestCarTicket")
+public class DraftRequestCarTicketController extends DefaultBaseController {
+
+    @Autowired
+    private DraftRequestCarTicketService draftRequestCarTicketService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"requestCarTicket:requestcarticket:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<GetDraftRequestCarTicketBo>> query(@Valid QueryDraftRequestCarTicketVo vo) {
+
+        PageResult<DraftRequestCarTicket> pageResult = draftRequestCarTicketService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<DraftRequestCarTicket> datas = pageResult.getDatas();
+        List<GetDraftRequestCarTicketBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetDraftRequestCarTicketBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"requestCarTicket:requestcarticket:query"})
+    @GetMapping
+    public InvokeResult<GetDraftRequestCarTicketBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        DraftRequestCarTicket data = draftRequestCarTicketService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("草稿要车单不存在！");
+        }
+
+        GetDraftRequestCarTicketBo result = new GetDraftRequestCarTicketBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"requestCarTicket:requestcarticket:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid @RequestBody CreateDraftRequestCarTicketVo vo) {
+
+        draftRequestCarTicketService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"requestCarTicket:requestcarticket:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateDraftRequestCarTicketVo vo) {
+
+        draftRequestCarTicketService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:cancel"})
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
+
+        draftRequestCarTicketService.updateStatus(id, "CANCEL");
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"requestCarTicket:requestcarticket:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        draftRequestCarTicketService.deleteById(id);
+
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 草稿要车单表
+ * </p>
+ *
+ */
+@Data
+@TableName("draft_request_car_ticket")
+public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "DraftRequestCarTicket";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 订货单ID
+     */
+    private String purchaseOrderId;
+
+    /**
+     * 要车日期
+     */
+    private LocalDate requestCarData;
+
+    /**
+     * 要车办事处
+     */
+    private String deptId;
+
+    /**
+     * 要车办事处名称（非持久化字段）
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 计划装货日期
+     */
+    private LocalDate deliveryDate;
+
+    /**
+     * 装货厂别
+     */
+    private String workshopId;
+
+    /**
+     * 装货厂别名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 客户名称【简称】
+     */
+    private String customerShortName;
+
+    /**
+     * 卸货地点
+     */
+    private String destination;
+
+    /**
+     * 计划吨位
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 接货人联络人
+     */
+    private String consignee;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 回货计划安排（退料/角料）
+     */
+    private String returnPlanArrangement;
+
+    /**
+     * 特殊需求、其他等
+     */
+    private String other;
+
+    /**
+     * 外办审核人
+     */
+    private String externalAuditor;
+
+    /**
+     * 外办审核人名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String externalAuditorName;
+
+    /**
+     * 装货时间
+     */
+    private String loadingTime;
+
+    /**
+     * 装货特别要求/需求
+     */
+    private String specialLoadingRequirement;
+
+    /**
+     * 经营办审核人
+     */
+    private String businessOfficeAuditor;
+
+    /**
+     * 经营办审核人名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String businessOfficeAuditorName;
+
+    /**
+     * 运作科审核人
+     */
+    private String operationsDepartmentAuditor;
+
+    /**
+     * 运作科审核人名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String operationsDepartmentAuditorName;
+
+    /**
+     * 审核状态
+     */
+    private String status;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -30,6 +31,16 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     private String id;
 
     /**
+     * 草稿要车单ID
+     */
+    private String draftId;
+
+    /**
+     * 订货单ID
+     */
+    private String purchaseOrderId;
+
+    /**
      * 要车日期
      */
     private LocalDate requestCarData;

@@ -5,6 +5,7 @@ import com.lframework.starter.bpm.enums.FlowInstanceStatus;
 import com.lframework.starter.bpm.service.BusinessDataHandlerService;
 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.utils.IdUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
@@ -17,6 +18,7 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.service.order.*;
+import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
@@ -69,6 +71,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private TransactorHandler transactorHandler;
     @Resource
     private SpecLockDelayApplicationService specLockDelayApplicationService;
+    @Resource
+    private DraftRequestCarTicketService draftRequestCarTicketService;
 
 
     /**
@@ -124,6 +128,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "SPEC_LOCK_DELAY":
                 handleSpecLockDelayAuditData(flowStatus, businessId);
                 break;
+            case "DRAFT_REQUEST_CAR":
+                handleDraftRequestCarTicketData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -383,4 +390,24 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             orderChangeRecordService.updateStatus(businessId, "REFUSE");
         }
     }
+
+    /**
+     * 发货计划-草稿要车单业务数据处理
+     *
+     * @param businessId 业务ID
+     */
+    private void handleDraftRequestCarTicketData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            draftRequestCarTicketService.updateStatus(businessId, "PASS");
+            //更新外办审核人
+            draftRequestCarTicketService.updateExamineUser(businessId, SecurityUtil.getCurrentUser().getId(), null, null);
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            draftRequestCarTicketService.updateStatus(businessId, "REFUSE");
+            //更新外办审核人
+            draftRequestCarTicketService.updateExamineUser(businessId, SecurityUtil.getCurrentUser().getId(), null, null);
+        }
+    }
 }

+package com.lframework.xingyun.sc.impl.shipments.car;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
+import com.lframework.xingyun.sc.mappers.DraftRequestCarTicketMapper;
+import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
+import com.lframework.xingyun.sc.vo.shipments.car.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+@Service
+public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftRequestCarTicketMapper, DraftRequestCarTicket> implements DraftRequestCarTicketService {
+    private static final String BPM_FLAG = "DRAFT_REQUEST_CAR";
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
+
+    @Override
+    public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<DraftRequestCarTicket> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<DraftRequestCarTicket> query(QueryDraftRequestCarTicketVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public DraftRequestCarTicket findById(String id) {
+
+        return getBaseMapper().findById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增草稿要车单表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateDraftRequestCarTicketVo vo) {
+
+        DraftRequestCarTicket data = new DraftRequestCarTicket();
+        data.setId(IdUtil.getId());
+        if (!StringUtil.isBlank(vo.getPurchaseOrderId())) {
+            data.setPurchaseOrderId(vo.getPurchaseOrderId());
+        }
+        if (vo.getRequestCarData() != null) {
+            data.setRequestCarData(vo.getRequestCarData());
+        }
+        if (!StringUtil.isBlank(vo.getDeptId())) {
+            data.setDeptId(vo.getDeptId());
+        }
+        if (vo.getDeliveryDate() != null) {
+            data.setDeliveryDate(vo.getDeliveryDate());
+        }
+        if (!StringUtil.isBlank(vo.getWorkshopId())) {
+            data.setWorkshopId(vo.getWorkshopId());
+        }
+        if (!StringUtil.isBlank(vo.getOrderNo())) {
+            data.setOrderNo(vo.getOrderNo());
+        }
+        if (!StringUtil.isBlank(vo.getCustomerShortName())) {
+            data.setCustomerShortName(vo.getCustomerShortName());
+        }
+        if (!StringUtil.isBlank(vo.getDestination())) {
+            data.setDestination(vo.getDestination());
+        }
+        if (vo.getQuantity() != null) {
+            data.setQuantity(vo.getQuantity());
+        }
+        if (!StringUtil.isBlank(vo.getConsignee())) {
+            data.setConsignee(vo.getConsignee());
+        }
+        if (!StringUtil.isBlank(vo.getPhone())) {
+            data.setPhone(vo.getPhone());
+        }
+        if (!StringUtil.isBlank(vo.getReturnPlanArrangement())) {
+            data.setReturnPlanArrangement(vo.getReturnPlanArrangement());
+        }
+        if (!StringUtil.isBlank(vo.getOther())) {
+            data.setOther(vo.getOther());
+        }
+        if (!StringUtil.isBlank(vo.getExternalAuditor())) {
+            data.setExternalAuditor(vo.getExternalAuditor());
+        }
+        if (!StringUtil.isBlank(vo.getLoadingTime())) {
+            data.setLoadingTime(vo.getLoadingTime());
+        }
+        if (!StringUtil.isBlank(vo.getSpecialLoadingRequirement())) {
+            data.setSpecialLoadingRequirement(vo.getSpecialLoadingRequirement());
+        }
+        if (!StringUtil.isBlank(vo.getBusinessOfficeAuditor())) {
+            data.setBusinessOfficeAuditor(vo.getBusinessOfficeAuditor());
+        }
+        if (!StringUtil.isBlank(vo.getOperationsDepartmentAuditor())) {
+            data.setOperationsDepartmentAuditor(vo.getOperationsDepartmentAuditor());
+        }
+        if (!StringUtil.isBlank(vo.getStatus())) {
+            data.setStatus(vo.getStatus());
+        }
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+        //开启审核
+        data.setUpdateById(SecurityUtil.getCurrentUser().getId());
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改草稿要车单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateDraftRequestCarTicketVo vo) {
+
+        DraftRequestCarTicket data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("草稿要车单不存在！");
+        }
+
+        LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class)
+                .set(DraftRequestCarTicket::getPurchaseOrderId, StringUtil.isBlank(vo.getPurchaseOrderId()) ? null : vo.getPurchaseOrderId())
+                .set(DraftRequestCarTicket::getRequestCarData, vo.getRequestCarData() == null ? null : vo.getRequestCarData())
+                .set(DraftRequestCarTicket::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
+                .set(DraftRequestCarTicket::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
+                .set(DraftRequestCarTicket::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
+                .set(DraftRequestCarTicket::getOrderNo, StringUtil.isBlank(vo.getOrderNo()) ? null : vo.getOrderNo())
+                .set(DraftRequestCarTicket::getCustomerShortName, StringUtil.isBlank(vo.getCustomerShortName()) ? null : vo.getCustomerShortName())
+                .set(DraftRequestCarTicket::getDestination, StringUtil.isBlank(vo.getDestination()) ? null : vo.getDestination())
+                .set(DraftRequestCarTicket::getQuantity, vo.getQuantity() == null ? null : vo.getQuantity())
+                .set(DraftRequestCarTicket::getConsignee, StringUtil.isBlank(vo.getConsignee()) ? null : vo.getConsignee())
+                .set(DraftRequestCarTicket::getPhone, StringUtil.isBlank(vo.getPhone()) ? null : vo.getPhone())
+                .set(DraftRequestCarTicket::getReturnPlanArrangement, StringUtil.isBlank(vo.getReturnPlanArrangement()) ? null : vo.getReturnPlanArrangement())
+                .set(DraftRequestCarTicket::getOther, StringUtil.isBlank(vo.getOther()) ? null : vo.getOther())
+                .set(DraftRequestCarTicket::getExternalAuditor, StringUtil.isBlank(vo.getExternalAuditor()) ? null : vo.getExternalAuditor())
+                .set(DraftRequestCarTicket::getLoadingTime, StringUtil.isBlank(vo.getLoadingTime()) ? null : vo.getLoadingTime())
+                .set(DraftRequestCarTicket::getSpecialLoadingRequirement, StringUtil.isBlank(vo.getSpecialLoadingRequirement()) ? null : vo.getSpecialLoadingRequirement())
+                .set(DraftRequestCarTicket::getBusinessOfficeAuditor, StringUtil.isBlank(vo.getBusinessOfficeAuditor()) ? null : vo.getBusinessOfficeAuditor())
+                .set(DraftRequestCarTicket::getOperationsDepartmentAuditor, StringUtil.isBlank(vo.getOperationsDepartmentAuditor()) ? null : vo.getOperationsDepartmentAuditor())
+                .set(DraftRequestCarTicket::getStatus, StringUtil.isBlank(vo.getStatus()) ? null : vo.getStatus())
+                .eq(DraftRequestCarTicket::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+        //开启审核
+        DraftRequestCarTicket draftRequestCarTicket = getBaseMapper().selectById(vo.getId());
+        flowInstanceWrapperService.startInstance(BPM_FLAG, draftRequestCarTicket.getId(), BPM_FLAG, draftRequestCarTicket);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改草稿要车单状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+        DraftRequestCarTicket data = getBaseMapper().findById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("草稿要车单不存在！");
+        }
+        LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class)
+                .set(DraftRequestCarTicket::getStatus, status)
+                .eq(DraftRequestCarTicket::getId, id);
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "更新草稿要车单审核人，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateExamineUser(String id, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+        DraftRequestCarTicket data = getBaseMapper().findById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("草稿要车单不存在！");
+        }
+        LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class)
+                .eq(DraftRequestCarTicket::getId, id);
+        if (externalAuditor != null) {
+            updateWrapper.set(DraftRequestCarTicket::getExternalAuditor, externalAuditor);
+        }
+        if (businessOfficeAuditor != null) {
+            updateWrapper.set(DraftRequestCarTicket::getBusinessOfficeAuditor, businessOfficeAuditor);
+        }
+        if (operationsDepartmentAuditor != null) {
+            updateWrapper.set(DraftRequestCarTicket::getOperationsDepartmentAuditor, operationsDepartmentAuditor);
+        }
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "删除草稿要车单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteById(String id) {
+
+        getBaseMapper().deleteById(id);
+    }
+
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.impl.shipments.car;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+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;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -26,10 +28,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @Service
 public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTicketMapper, RequestCarTicket> implements RequestCarTicketService {
+    private static final String BPM_FLAG = "REQUEST_CAR_TICKET";
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
     @Override
     public PageResult<RequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryRequestCarTicketVo vo) {
@@ -62,6 +68,12 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
 
         RequestCarTicket data = new RequestCarTicket();
         data.setId(IdUtil.getId());
+        if (!StringUtil.isBlank(vo.getDraftId())) {
+            data.setDraftId(vo.getDraftId());
+        }
+        if (!StringUtil.isBlank(vo.getPurchaseOrderId())) {
+            data.setPurchaseOrderId(vo.getPurchaseOrderId());
+        }
         if (vo.getRequestCarData() != null) {
             data.setRequestCarData(vo.getRequestCarData());
         }
@@ -121,6 +133,9 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+        //开启审核
+//        data.setUpdateById(SecurityUtil.getCurrentUser().getId());
+//        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
         return data.getId();
     }
@@ -136,6 +151,8 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         }
 
         LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
+                .set(RequestCarTicket::getDraftId, StringUtil.isBlank(vo.getDraftId()) ? null : vo.getDraftId())
+                .set(RequestCarTicket::getPurchaseOrderId, StringUtil.isBlank(vo.getPurchaseOrderId()) ? null : vo.getPurchaseOrderId())
                 .set(RequestCarTicket::getRequestCarData, vo.getRequestCarData() == null ? null : vo.getRequestCarData())
                 .set(RequestCarTicket::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
                 .set(RequestCarTicket::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
@@ -160,9 +177,12 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+        //开启审核
+//        RequestCarTicket requestCarTicket = getBaseMapper().selectById(vo.getId());
+//        flowInstanceWrapperService.startInstance(BPM_FLAG, requestCarTicket.getId(), BPM_FLAG, requestCarTicket);
     }
 
-    @OpLog(type = OtherOpLogType.class, name = "修改草稿要车单状态，ID：{}", params = {"#id"})
+    @OpLog(type = OtherOpLogType.class, name = "修改要车单状态，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateStatus(String id, String status) {
@@ -171,7 +191,7 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         }
         RequestCarTicket data = getBaseMapper().findById(id);
         if (ObjectUtil.isNull(data)) {
-            throw new DefaultClientException("草稿要车单不存在！");
+            throw new DefaultClientException("要车单不存在！");
         }
         LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
                 .set(RequestCarTicket::getStatus, status)
@@ -183,6 +203,35 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         OpLogUtil.setExtra(id);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "更新要车单审核人，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateExamineUser(String id, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+        RequestCarTicket data = getBaseMapper().findById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("要车单不存在！");
+        }
+        LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
+                .eq(RequestCarTicket::getId, id);
+        if (externalAuditor != null) {
+            updateWrapper.set(RequestCarTicket::getExternalAuditor, externalAuditor);
+        }
+        if (businessOfficeAuditor != null) {
+            updateWrapper.set(RequestCarTicket::getBusinessOfficeAuditor, businessOfficeAuditor);
+        }
+        if (operationsDepartmentAuditor != null) {
+            updateWrapper.set(RequestCarTicket::getOperationsDepartmentAuditor, operationsDepartmentAuditor);
+        }
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除要车单表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
+import com.lframework.xingyun.sc.vo.shipments.car.QueryDraftRequestCarTicketVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 草稿要车单表 Mapper 接口
+ * </p>
+ *
+ */
+public interface DraftRequestCarTicketMapper extends BaseMapper<DraftRequestCarTicket> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<DraftRequestCarTicket> query(@Param("vo") QueryDraftRequestCarTicketVo vo);
+
+
+    /**
+     * 草稿要车单
+     *
+     * @param id 主键
+     * @return DraftRequestCarTicket
+     */
+    DraftRequestCarTicket findById(@Param("id") String id);
+}

@@ -24,7 +24,7 @@ public interface RequestCarTicketMapper extends BaseMapper<RequestCarTicket> {
 
 
     /**
-     * 草稿要车单
+     * 要车单
      *
      * @param id 主键
      * @return RequestCarTicket

+package com.lframework.xingyun.sc.service.shipments.car;
+
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
+import com.lframework.xingyun.sc.vo.shipments.car.*;
+
+import java.util.List;
+
+/**
+ * 草稿要车单表 Service
+ */
+public interface DraftRequestCarTicketService extends BaseMpService<DraftRequestCarTicket> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<DraftRequestCarTicket> query(QueryDraftRequestCarTicketVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    DraftRequestCarTicket findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateDraftRequestCarTicketVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateDraftRequestCarTicketVo vo);
+
+    /**
+     * 修改状态
+     *
+     * @param id     主键
+     * @param status 状态
+     */
+    void updateStatus(String id, String status);
+
+    /**
+     * 更新审核人
+     *
+     * @param id     主键
+     * @param externalAuditor 外办审核人
+     * @param businessOfficeAuditor 经营办审核人
+     * @param operationsDepartmentAuditor 运作科审核人
+     */
+    void updateExamineUser(String id, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

@@ -55,6 +55,16 @@ public interface RequestCarTicketService extends BaseMpService<RequestCarTicket>
     void updateStatus(String id, String status);
 
     /**
+     * 更新审核人
+     *
+     * @param id     主键
+     * @param externalAuditor 外办审核人
+     * @param businessOfficeAuditor 经营办审核人
+     * @param operationsDepartmentAuditor 运作科审核人
+     */
+    void updateExamineUser(String id, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor);
+
+    /**
      * 根据ID删除
      * @param id
      * @return

+package com.lframework.xingyun.sc.vo.shipments.car;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class CreateDraftRequestCarTicketVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
+     * 要车日期
+     */
+    @ApiModelProperty("要车日期")
+    @TypeMismatch(message = "要车日期格式有误！")
+    private LocalDate requestCarData;
+
+    /**
+     * 要车办事处
+     */
+    @ApiModelProperty("要车办事处")
+    @Length(message = "要车办事处最多允许32个字符！")
+    private String deptId;
+
+    /**
+     * 计划装货日期
+     */
+    @ApiModelProperty("计划装货日期")
+    @TypeMismatch(message = "计划装货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 装货厂别
+     */
+    @ApiModelProperty("装货厂别")
+    @Length(message = "装货厂别最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    @Length(message = "订单编号最多允许50个字符！")
+    private String orderNo;
+
+    /**
+     * 客户名称【简称】
+     */
+    @ApiModelProperty("客户名称【简称】")
+    @Length(message = "客户名称【简称】最多允许100个字符！")
+    private String customerShortName;
+
+    /**
+     * 卸货地点
+     */
+    @ApiModelProperty("卸货地点")
+    @Length(message = "卸货地点最多允许200个字符！")
+    private String destination;
+
+    /**
+     * 计划吨位
+     */
+    @ApiModelProperty("计划吨位")
+    @TypeMismatch(message = "计划吨位格式有误！")
+    @IsNumberPrecision(message = "计划吨位最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 接货人联络人
+     */
+    @ApiModelProperty("接货人联络人")
+    @Length(message = "接货人联络人最多允许50个字符！")
+    private String consignee;
+
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty("联系电话")
+    @Length(message = "联系电话最多允许50个字符！")
+    private String phone;
+
+    /**
+     * 回货计划安排（退料/角料）
+     */
+    @ApiModelProperty("回货计划安排（退料/角料）")
+    @Length(message = "回货计划安排（退料/角料）最多允许500个字符！")
+    private String returnPlanArrangement;
+
+    /**
+     * 特殊需求、其他等
+     */
+    @ApiModelProperty("特殊需求、其他等")
+    @Length(message = "特殊需求、其他等最多允许500个字符！")
+    private String other;
+
+    /**
+     * 外办审核人
+     */
+    @ApiModelProperty("外办审核人")
+    @Length(message = "外办审核人最多允许50个字符！")
+    private String externalAuditor;
+
+    /**
+     * 装货时间
+     */
+    @ApiModelProperty("装货时间")
+    @Length(message = "装货时间最多允许20个字符！")
+    private String loadingTime;
+
+    /**
+     * 装货特别要求/需求
+     */
+    @ApiModelProperty("装货特别要求/需求")
+    @Length(message = "装货特别要求/需求最多允许500个字符！")
+    private String specialLoadingRequirement;
+
+    /**
+     * 经营办审核人
+     */
+    @ApiModelProperty("经营办审核人")
+    @Length(message = "经营办审核人最多允许50个字符！")
+    private String businessOfficeAuditor;
+
+    /**
+     * 运作科审核人
+     */
+    @ApiModelProperty("运作科审核人")
+    @Length(message = "运作科审核人最多允许50个字符！")
+    private String operationsDepartmentAuditor;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+}

@@ -16,6 +16,18 @@ public class CreateRequestCarTicketVo implements BaseVo, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 草稿要车单ID
+     */
+    @ApiModelProperty("草稿要车单ID")
+    private String draftId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
      * 要车日期
      */
     @ApiModelProperty("要车日期")

+package com.lframework.xingyun.sc.vo.shipments.car;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class QueryDraftRequestCarTicketVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 要车办事处名称
+     */
+    @ApiModelProperty("要车办事处名称")
+    private String deptName;
+
+    /**
+     * 要车日期开始
+     */
+    @ApiModelProperty("要车日期开始")
+    private String requestCarDataStart;
+
+    /**
+     * 要车日期结束
+     */
+    @ApiModelProperty("要车日期结束")
+    private String requestCarDataEnd;
+
+    /**
+     * 装货厂别
+     */
+    @ApiModelProperty("装货厂别")
+    private String workshopId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 客户名称【简称】
+     */
+    @ApiModelProperty("客户名称【简称】")
+    private String customerShortName;
+
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+}

+package com.lframework.xingyun.sc.vo.shipments.car;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class UpdateDraftRequestCarTicketVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
+     * 要车日期
+     */
+    @ApiModelProperty("要车日期")
+    @TypeMismatch(message = "要车日期格式有误！")
+    private LocalDate requestCarData;
+
+    /**
+     * 要车办事处
+     */
+    @ApiModelProperty("要车办事处")
+    @Length(message = "要车办事处最多允许32个字符！")
+    private String deptId;
+
+    /**
+     * 计划装货日期
+     */
+    @ApiModelProperty("计划装货日期")
+    @TypeMismatch(message = "计划装货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 装货厂别
+     */
+    @ApiModelProperty("装货厂别")
+    @Length(message = "装货厂别最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    @Length(message = "订单编号最多允许50个字符！")
+    private String orderNo;
+
+    /**
+     * 客户名称【简称】
+     */
+    @ApiModelProperty("客户名称【简称】")
+    @Length(message = "客户名称【简称】最多允许100个字符！")
+    private String customerShortName;
+
+    /**
+     * 卸货地点
+     */
+    @ApiModelProperty("卸货地点")
+    @Length(message = "卸货地点最多允许200个字符！")
+    private String destination;
+
+    /**
+     * 计划吨位
+     */
+    @ApiModelProperty("计划吨位")
+    @TypeMismatch(message = "计划吨位格式有误！")
+    @IsNumberPrecision(message = "计划吨位最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 接货人联络人
+     */
+    @ApiModelProperty("接货人联络人")
+    @Length(message = "接货人联络人最多允许50个字符！")
+    private String consignee;
+
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty("联系电话")
+    @Length(message = "联系电话最多允许50个字符！")
+    private String phone;
+
+    /**
+     * 回货计划安排（退料/角料）
+     */
+    @ApiModelProperty("回货计划安排（退料/角料）")
+    @Length(message = "回货计划安排（退料/角料）最多允许500个字符！")
+    private String returnPlanArrangement;
+
+    /**
+     * 特殊需求、其他等
+     */
+    @ApiModelProperty("特殊需求、其他等")
+    @Length(message = "特殊需求、其他等最多允许500个字符！")
+    private String other;
+
+    /**
+     * 外办审核人
+     */
+    @ApiModelProperty("外办审核人")
+    @Length(message = "外办审核人最多允许50个字符！")
+    private String externalAuditor;
+
+    /**
+     * 装货时间
+     */
+    @ApiModelProperty("装货时间")
+    @Length(message = "装货时间最多允许20个字符！")
+    private String loadingTime;
+
+    /**
+     * 装货特别要求/需求
+     */
+    @ApiModelProperty("装货特别要求/需求")
+    @Length(message = "装货特别要求/需求最多允许500个字符！")
+    private String specialLoadingRequirement;
+
+    /**
+     * 经营办审核人
+     */
+    @ApiModelProperty("经营办审核人")
+    @Length(message = "经营办审核人最多允许50个字符！")
+    private String businessOfficeAuditor;
+
+    /**
+     * 运作科审核人
+     */
+    @ApiModelProperty("运作科审核人")
+    @Length(message = "运作科审核人最多允许50个字符！")
+    private String operationsDepartmentAuditor;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+}

@@ -24,6 +24,18 @@ public class UpdateRequestCarTicketVo implements BaseVo, Serializable {
     private String id;
 
     /**
+     * 草稿要车单ID
+     */
+    @ApiModelProperty("草稿要车单ID")
+    private String draftId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
      * 要车日期
      */
     @ApiModelProperty("要车日期")

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.sc.mappers.DraftRequestCarTicketMapper">
+
+    <resultMap id="DraftRequestCarTicket" type="com.lframework.xingyun.sc.entity.DraftRequestCarTicket">
+        <id column="id" property="id"/>
+        <result column="purchase_order_id" property="purchaseOrderId"/>
+        <result column="request_car_data" property="requestCarData"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="delivery_date" property="deliveryDate"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="customer_short_name" property="customerShortName"/>
+        <result column="destination" property="destination"/>
+        <result column="quantity" property="quantity"/>
+        <result column="consignee" property="consignee"/>
+        <result column="phone" property="phone"/>
+        <result column="return_plan_arrangement" property="returnPlanArrangement"/>
+        <result column="other" property="other"/>
+        <result column="external_auditor" property="externalAuditor"/>
+        <result column="external_auditor_name" property="externalAuditorName"/>
+        <result column="loading_time" property="loadingTime"/>
+        <result column="special_loading_requirement" property="specialLoadingRequirement"/>
+        <result column="business_office_auditor" property="businessOfficeAuditor"/>
+        <result column="business_office_auditor_name" property="businessOfficeAuditorName"/>
+        <result column="operations_department_auditor" property="operationsDepartmentAuditor"/>
+        <result column="operations_department_auditor_name" property="operationsDepartmentAuditorName"/>
+        <result column="status" property="status"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="DraftRequestCarTicket_sql">
+        SELECT
+            tb.id,
+            tb.purchase_order_id,
+            tb.request_car_data,
+            tb.dept_id,
+            sd.name AS dept_name,
+            tb.delivery_date,
+            tb.workshop_id,
+            ws.name AS workshop_name,
+            tb.order_no,
+            tb.customer_short_name,
+            tb.destination,
+            tb.quantity,
+            tb.consignee,
+            tb.phone,
+            tb.return_plan_arrangement,
+            tb.other,
+            tb.external_auditor,
+            su.name AS external_auditor_name,
+            tb.loading_time,
+            tb.special_loading_requirement,
+            tb.business_office_auditor,
+            su1.name AS business_office_auditor_name,
+            tb.operations_department_auditor,
+            su2.name AS operations_department_auditor_name,
+            tb.status,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM draft_request_car_ticket AS tb
+        left join sys_dept as sd on sd.id = tb.dept_id
+        left join base_data_workshop as ws on ws.id = tb.workshop_id
+        left join sys_user as su on su.id = tb.external_auditor
+        left join sys_user as su1 on su1.id = tb.business_office_auditor
+        left join sys_user as su2 on su2.id = tb.operations_department_auditor
+    </sql>
+
+    <select id="query" resultMap="DraftRequestCarTicket">
+        <include refid="DraftRequestCarTicket_sql"/>
+        <where>
+            <if test="vo.requestCarDataStart != null">
+                AND tb.request_car_data >= #{vo.requestCarDataStart}
+            </if>
+            <if test="vo.requestCarDataEnd != null">
+                <![CDATA[
+               AND tb.request_car_data <= #{vo.requestCarDataEnd}
+                ]]>
+            </if>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+                AND tb.workshop_id = #{vo.workshopId}
+            </if>
+            <if test="vo.orderNo != null and vo.orderNo != ''">
+                AND tb.order_no LIKE CONCAT('%', #{vo.orderNo},'%')
+            </if>
+            <if test="vo.customerShortName != null and vo.customerShortName != ''">
+                AND tb.customer_short_name LIKE CONCAT('%', #{vo.customerShortName},'%')
+            </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                AND sd.name LIKE CONCAT('%', #{vo.deptName},'%')
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
+        </where>
+        ORDER BY tb.update_time DESC
+    </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.DraftRequestCarTicket">
+        <include refid="DraftRequestCarTicket_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
+</mapper>

@@ -4,6 +4,8 @@
 
     <resultMap id="RequestCarTicket" type="com.lframework.xingyun.sc.entity.RequestCarTicket">
         <id column="id" property="id"/>
+        <result column="draft_id" property="draftId"/>
+        <result column="purchase_order_id" property="purchaseOrderId"/>
         <result column="request_car_data" property="requestCarData"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
@@ -38,6 +40,8 @@
     <sql id="RequestCarTicket_sql">
         SELECT
             tb.id,
+            tb.draft_id,
+            tb.purchase_order_id,
             tb.request_car_data,
             tb.dept_id,
             sd.name AS dept_name,