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 java.time.LocalDate;
+import java.util.List;
+
+import com.lframework.xingyun.sc.entity.CarRequestPlan;
+import com.lframework.xingyun.sc.entity.RequestCarTicket;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 要车计划表 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetCarRequestPlanBo extends BaseBo<CarRequestPlan> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 要车日期
+     */
+    @ApiModelProperty("要车日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate requestCarData;
+
+    /**
+     * 装货厂别ID
+     */
+    @ApiModelProperty("装货厂别ID")
+    private String workshopId;
+
+    /**
+     * 装货厂别
+     */
+    @ApiModelProperty("装货厂别")
+    private String workshopName;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /**
+     * 要车单
+     */
+    @ApiModelProperty("要车单")
+    private List<RequestCarTicket> requestCarTicketList;
+
+    public GetCarRequestPlanBo() {
+
+    }
+
+    public GetCarRequestPlanBo(CarRequestPlan dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<CarRequestPlan> convert(CarRequestPlan dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(CarRequestPlan dto) {
+
+    }
+}

@@ -26,6 +26,12 @@ public class GetRequestCarTicketBo extends BaseBo<RequestCarTicket> {
     private String id;
 
     /**
+     * 要车计划ID
+     */
+    @ApiModelProperty("要车计划ID")
+    private String planId;
+
+    /**
      * 草稿要车单ID
      */
     @ApiModelProperty("草稿要车单ID")

@@ -60,7 +60,6 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"customerCreditHistory:customercredithistory:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<GetCustomerCreditHistoryBo>> query(@Valid QueryCustomerCreditHistoryVo vo) {
 
@@ -80,7 +79,6 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"customerCreditHistory:customercredithistory:query"})
     @GetMapping("/customerCreditHistoryList")
     public InvokeResult<List<GetCustomerCreditHistoryBo>> customerCreditHistoryList(@Valid QueryCustomerCreditHistoryVo vo) {
         vo.setType("PART");
@@ -126,7 +124,6 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"customerCreditHistory:customercredithistory:query"})
     @GetMapping("/examineCustomerCreditHistoryList")
     public InvokeResult<List<GetCustomerCreditHistoryBo>> examineCustomerCreditHistoryList(@Valid QueryCustomerCreditHistoryVo vo) {
         vo.setType("PART");
@@ -156,7 +153,6 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询变更记录")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"customerCreditHistory:customercredithistory:query"})
     @GetMapping("/getById")
     public InvokeResult<ChangeData> get(@NotBlank(message = "id不能为空！") String id) {
 
@@ -204,7 +200,6 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"customerCreditHistory:customercredithistory:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid CreateCustomerCreditHistoryVo vo) {
 
@@ -218,7 +213,6 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"customerCreditHistory:customercredithistory:delete"})
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

+package com.lframework.xingyun.sc.controller.shipments.car;
+
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+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.InvokeResult;
+import javax.validation.constraints.NotBlank;
+import com.lframework.xingyun.sc.bo.shipments.car.GetCarRequestPlanBo;
+import com.lframework.xingyun.sc.entity.CarRequestPlan;
+import com.lframework.xingyun.sc.entity.RequestCarTicket;
+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.QueryCarRequestPlanVo;
+import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
+import com.lframework.xingyun.sc.vo.shipments.car.UpdateCarRequestPlanVo;
+import io.swagger.annotations.ApiImplicitParam;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 要车计划表 Controller
+ *
+ */
+@Api(tags = "要车计划表")
+@Validated
+@RestController
+@RequestMapping("/carRequestPlan")
+public class CarRequestPlanController extends DefaultBaseController {
+
+    @Autowired
+    private CarRequestPlanService carRequestPlanService;
+    @Autowired
+    private RequestCarTicketService requestCarTicketService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"carRequestPlan:carrequestplan:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<GetCarRequestPlanBo>> query(@Valid QueryCarRequestPlanVo vo) {
+
+        PageResult<CarRequestPlan> pageResult = carRequestPlanService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<CarRequestPlan> datas = pageResult.getDatas();
+        List<GetCarRequestPlanBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetCarRequestPlanBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"carRequestPlan:carrequestplan:query"})
+    @GetMapping
+    public InvokeResult<GetCarRequestPlanBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        CarRequestPlan data = carRequestPlanService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("要车计划不存在！");
+        }
+
+        GetCarRequestPlanBo result = new GetCarRequestPlanBo(data);
+        QueryRequestCarTicketVo vo = new QueryRequestCarTicketVo();
+        vo.setPlanId(id);
+        List<RequestCarTicket> requestCarTicketList = requestCarTicketService.query(vo);
+        result.setRequestCarTicketList(requestCarTicketList);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"carRequestPlan:carrequestplan:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateCarRequestPlanVo vo) {
+
+        carRequestPlanService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"carRequestPlan:carrequestplan:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateCarRequestPlanVo vo) {
+
+        carRequestPlanService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"carRequestPlan:carrequestplan:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        carRequestPlanService.deleteById(id);
+
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+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;
+
+/**
+ * <p>
+ * 要车计划表
+ * </p>
+ *
+ */
+@Data
+@TableName("car_request_plan")
+public class CarRequestPlan extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "CarRequestPlan";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 要车日期
+     */
+    private LocalDate requestCarData;
+
+    /**
+     * 装货厂别ID
+     */
+    private String workshopId;
+
+    /**
+     * 装货厂别
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 要车单
+     */
+    @TableField(exist = false)
+    private List<RequestCarTicket> requestCarTicketList;
+
+    /**
+     * 创建人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;
+
+}

@@ -31,6 +31,11 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     private String id;
 
     /**
+     * 要车计划ID
+     */
+    private String planId;
+
+    /**
      * 草稿要车单ID
      */
     private String draftId;

@@ -1223,6 +1223,9 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
 
         Map<String, List<String>> userIdMap = sysUserDeptService.mapAllUserByUserId(userIdList, true);
         List<String> userIds = userIdMap.get(currentUserId);
+        if (CollectionUtils.isEmpty(userIds)) {
+            return new ArrayList<>();
+        }
 
         return sysUserService.listByUserId(userIds);
     }

+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.common.utils.CollectionUtil;
+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;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import java.io.Serializable;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.CarRequestPlan;
+import com.lframework.xingyun.sc.mappers.CarRequestPlanMapper;
+import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
+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.UpdateCarRequestPlanVo;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanMapper, CarRequestPlan> implements CarRequestPlanService {
+
+    @Override
+    public PageResult<CarRequestPlan> query(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<CarRequestPlan> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<CarRequestPlan> query(QueryCarRequestPlanVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public CarRequestPlan findById(String id) {
+
+        return getBaseMapper().findById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增要车计划，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateCarRequestPlanVo vo) {
+        //新增要车计划时先判断当前日期+装货厂别是否已经存在要车计划，不再存在再新增
+        QueryCarRequestPlanVo vo1 = new QueryCarRequestPlanVo();
+        vo1.setWorkshopId(vo.getWorkshopId());
+        LocalDate date = vo.getRequestCarData();
+        if (date != null) {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            String dateString = formatter.format(date);
+            vo1.setRequestCarDataStart(dateString);
+            vo1.setRequestCarDataEnd(dateString);
+        }
+        List<CarRequestPlan> carRequestPlanList = this.query(vo1);
+        if (CollectionUtil.isNotEmpty(carRequestPlanList)) {
+            CarRequestPlan carRequestPlan = carRequestPlanList.get(0);
+            return carRequestPlan.getId();
+        }
+
+        CarRequestPlan data = new CarRequestPlan();
+        data.setId(IdUtil.getId());
+        if (vo.getRequestCarData() != null) {
+            data.setRequestCarData(vo.getRequestCarData());
+        }
+        if (!StringUtil.isBlank(vo.getWorkshopId())) {
+            data.setWorkshopId(vo.getWorkshopId());
+        }
+        if (!StringUtil.isBlank(vo.getRemarks())) {
+            data.setRemarks(vo.getRemarks());
+        }
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改要车计划，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateCarRequestPlanVo vo) {
+
+        CarRequestPlan data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("要车计划不存在！");
+        }
+
+        LambdaUpdateWrapper<CarRequestPlan> updateWrapper = Wrappers.lambdaUpdate(CarRequestPlan.class)
+                .set(CarRequestPlan::getRequestCarData, vo.getRequestCarData() == null ? null : vo.getRequestCarData())
+                .set(CarRequestPlan::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
+                .set(CarRequestPlan::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
+                .eq(CarRequestPlan::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @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) {
+
+    }
+}

@@ -86,6 +86,14 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
     @Override
     public String create(CreateDraftRequestCarTicketVo vo) {
 
+        //草稿要车单一个订货单只生成一次
+        QueryDraftRequestCarTicketVo vo1 = new QueryDraftRequestCarTicketVo();
+        vo1.setPurchaseOrderId(vo.getPurchaseOrderId());
+        List<DraftRequestCarTicket> query = query(vo1);
+        if (CollectionUtils.isNotEmpty(query)) {
+            return query.get(0).getId();
+        }
+
         DraftRequestCarTicket data = new DraftRequestCarTicket();
         data.setId(IdUtil.getId());
         if (!StringUtil.isBlank(vo.getPurchaseOrderId())) {

@@ -4,7 +4,6 @@ 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;
@@ -71,6 +70,9 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         if (!StringUtil.isBlank(vo.getDraftId())) {
             data.setDraftId(vo.getDraftId());
         }
+        if (!StringUtil.isBlank(vo.getPlanId())) {
+            data.setPlanId(vo.getPlanId());
+        }
         if (!StringUtil.isBlank(vo.getPurchaseOrderId())) {
             data.setPurchaseOrderId(vo.getPurchaseOrderId());
         }
@@ -152,6 +154,7 @@ 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::getPlanId, StringUtil.isBlank(vo.getPlanId()) ? null : vo.getPlanId())
                 .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())

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

+package com.lframework.xingyun.sc.service.shipments.car;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.CarRequestPlan;
+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.UpdateCarRequestPlanVo;
+import java.util.List;
+
+/**
+ * 要车计划表 Service
+ */
+public interface CarRequestPlanService extends BaseMpService<CarRequestPlan> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<CarRequestPlan> query(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<CarRequestPlan> query(QueryCarRequestPlanVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    CarRequestPlan findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateCarRequestPlanVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateCarRequestPlanVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.sc.vo.shipments.car;
+
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreateCarRequestPlanVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 要车日期
+     */
+    @ApiModelProperty("要车日期")
+    @TypeMismatch(message = "要车日期格式有误！")
+    private LocalDate requestCarData;
+
+    /**
+     * 装货厂别
+     */
+    @ApiModelProperty("装货厂别")
+    @Length(message = "装货厂别最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(message = "备注最多允许500个字符！")
+    private String remarks;
+
+}

@@ -22,6 +22,12 @@ public class CreateRequestCarTicketVo implements BaseVo, Serializable {
     private String draftId;
 
     /**
+     * 要车计划ID
+     */
+    @ApiModelProperty("要车计划ID")
+    private String planId;
+
+    /**
      * 订货单ID
      */
     @ApiModelProperty("订货单ID")

+package com.lframework.xingyun.sc.vo.shipments.car;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QueryCarRequestPlanVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 要车日期开始
+     */
+    @ApiModelProperty("要车日期开始")
+    private String requestCarDataStart;
+
+    /**
+     * 要车日期结束
+     */
+    @ApiModelProperty("要车日期结束")
+    private String requestCarDataEnd;
+
+    /**
+     * 装货厂别
+     */
+    @ApiModelProperty("装货厂别")
+    private String workshopId;
+
+
+}

@@ -55,4 +55,10 @@ public class QueryDraftRequestCarTicketVo extends PageVo implements BaseVo, Seri
     @ApiModelProperty("状态")
     private String status;
 
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
 }

@@ -54,4 +54,10 @@ public class QueryRequestCarTicketVo extends PageVo implements BaseVo, Serializa
     @ApiModelProperty("状态")
     private String status;
 
+    /**
+     * 要车计划ID
+     */
+    @ApiModelProperty("要车计划ID")
+    private String planId;
+
 }

+package com.lframework.xingyun.sc.vo.shipments.car;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdateCarRequestPlanVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 要车日期
+     */
+    @ApiModelProperty("要车日期")
+    @TypeMismatch(message = "要车日期格式有误！")
+    private LocalDate requestCarData;
+
+    /**
+     * 装货厂别
+     */
+    @ApiModelProperty("装货厂别")
+    @Length(message = "装货厂别最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(message = "备注最多允许500个字符！")
+    private String remarks;
+
+}

@@ -24,6 +24,12 @@ public class UpdateRequestCarTicketVo implements BaseVo, Serializable {
     private String id;
 
     /**
+     * 要车计划ID
+     */
+    @ApiModelProperty("要车计划ID")
+    private String planId;
+
+    /**
      * 草稿要车单ID
      */
     @ApiModelProperty("草稿要车单ID")

+<?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.CarRequestPlanMapper">
+
+    <resultMap id="CarRequestPlan" type="com.lframework.xingyun.sc.entity.CarRequestPlan">
+        <id column="id" property="id"/>
+        <result column="request_car_data" property="requestCarData"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
+        <result column="remarks" property="remarks"/>
+        <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="CarRequestPlan_sql">
+        SELECT
+            tb.id,
+            tb.request_car_data,
+            tb.workshop_id,
+            ws.name AS workshop_name,
+            tb.remarks,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM car_request_plan AS tb
+        left join base_data_workshop as ws on ws.id = tb.workshop_id
+    </sql>
+
+    <select id="query" resultMap="CarRequestPlan">
+        <include refid="CarRequestPlan_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>
+        </where>
+        ORDER BY tb.request_car_data DESC
+    </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.CarRequestPlan">
+        <include refid="CarRequestPlan_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
+</mapper>

@@ -103,6 +103,9 @@
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </if>
+            <if test="vo.purchaseOrderId != null and vo.purchaseOrderId != ''">
+                AND tb.purchase_order_id = #{vo.purchaseOrderId}
+            </if>
         </where>
         ORDER BY tb.update_time DESC
     </select>

@@ -5,6 +5,7 @@
     <resultMap id="RequestCarTicket" type="com.lframework.xingyun.sc.entity.RequestCarTicket">
         <id column="id" property="id"/>
         <result column="draft_id" property="draftId"/>
+        <result column="plan_id" property="planId"/>
         <result column="purchase_order_id" property="purchaseOrderId"/>
         <result column="request_car_data" property="requestCarData"/>
         <result column="dept_id" property="deptId"/>
@@ -41,6 +42,7 @@
         SELECT
             tb.id,
             tb.draft_id,
+            tb.plan_id,
             tb.purchase_order_id,
             tb.request_car_data,
             tb.dept_id,
@@ -105,6 +107,9 @@
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </if>
+            <if test="vo.planId != null and vo.planId != ''">
+                AND tb.plan_id = #{planId}
+            </if>
         </where>
         ORDER BY tb.update_time DESC
     </select>