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

+package com.lframework.xingyun.sc.bo.shipments.delay;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import java.time.LocalDate;
+import java.util.List;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.DelayedShipment;
+import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 延期发货表 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetDelayedShipmentBo extends BaseBo<DelayedShipment> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 所属办ID
+     */
+    @ApiModelProperty("所属办ID")
+    private String deptId;
+
+    /**
+     * 所属办名称
+     */
+    @ApiModelProperty("所属办名称")
+    private String deptName;
+
+    /**
+     * 申请日期
+     */
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate applyDate;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+    /**
+     * 延期发货详情
+     */
+    @ApiModelProperty("延期发货详情")
+    private List<DelayedShipmentDetail> delayedShipmentDetailList;
+
+    public GetDelayedShipmentBo() {
+
+    }
+
+    public GetDelayedShipmentBo(DelayedShipment dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<DelayedShipment> convert(DelayedShipment dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(DelayedShipment dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.shipments.delay;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 延期发货详情表 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetDelayedShipmentDetailBo extends BaseBo<DelayedShipmentDetail> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 延期发货ID
+     */
+    @ApiModelProperty("延期发货ID")
+    private String delayedShipmentId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String orderId;
+
+    /**
+     * 订货单编码
+     */
+    @ApiModelProperty("订货单编码")
+    private String orderNo;
+
+    /**
+     * 订货单类型
+     */
+    @ApiModelProperty("订货单类型")
+    private String orderType;
+
+    /**
+     * 所属分厂ID
+     */
+    @ApiModelProperty("所属分厂ID")
+    private String workshopId;
+
+    /**
+     * 所属分厂
+     */
+    @ApiModelProperty("所属分厂")
+    private String workshopName;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 发货计划明细ID
+     */
+    @ApiModelProperty("发货计划明细ID")
+    private String shipmentsPlanDetailId;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty("订货单物料行ID")
+    private String orderSpecId;
+
+    /**
+     * 原订单计划发货日期
+     */
+    @ApiModelProperty("原订单计划发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate deliveryDate;
+
+    /**
+     * 现申请发货日期
+     */
+    @ApiModelProperty("现申请发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate applyShipmentDate;
+
+    /**
+     * 申请次数
+     */
+    @ApiModelProperty("申请次数")
+    private Integer applyCount;
+
+    /**
+     * 发货数量
+     */
+    @ApiModelProperty("发货数量")
+    private BigDecimal quantity;
+
+    /**
+     * 延迟原因
+     */
+    @ApiModelProperty("延迟原因")
+    private String delayReason;
+
+    public GetDelayedShipmentDetailBo() {
+
+    }
+
+    public GetDelayedShipmentDetailBo(DelayedShipmentDetail dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<DelayedShipmentDetail> convert(DelayedShipmentDetail dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(DelayedShipmentDetail dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.shipments.delay;
+
+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.delay.GetDelayedShipmentBo;
+import com.lframework.xingyun.sc.entity.DelayedShipment;
+import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
+import com.lframework.xingyun.sc.vo.shipments.delay.CreateDelayedShipmentVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.UpdateDelayedShipmentVo;
+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("/delayedShipment/delayedshipment")
+public class DelayedShipmentController extends DefaultBaseController {
+
+    @Autowired
+    private DelayedShipmentService delayedShipmentService;
+    @Autowired
+    private DelayedShipmentDetailService delayedShipmentDetailService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"delayedShipment:delayedshipment:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<GetDelayedShipmentBo>> query(@Valid QueryDelayedShipmentVo vo) {
+
+        PageResult<DelayedShipment> pageResult = delayedShipmentService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<DelayedShipment> datas = pageResult.getDatas();
+        List<GetDelayedShipmentBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetDelayedShipmentBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"delayedShipment:delayedshipment:query"})
+    @GetMapping
+    public InvokeResult<GetDelayedShipmentBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        DelayedShipment data = delayedShipmentService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("延期发货表不存在！");
+        }
+
+        GetDelayedShipmentBo result = new GetDelayedShipmentBo(data);
+        QueryDelayedShipmentDetailVo vo = new QueryDelayedShipmentDetailVo();
+        vo.setDelayedShipmentId(id);
+        List<DelayedShipmentDetail> delayedShipmentDetailList = delayedShipmentDetailService.query(vo);
+        result.setDelayedShipmentDetailList(delayedShipmentDetailList);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"delayedShipment:delayedshipment:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateDelayedShipmentVo vo) {
+
+        delayedShipmentService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"delayedShipment:delayedshipment:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateDelayedShipmentVo vo) {
+
+        delayedShipmentService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"delayedShipment:delayedshipment:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        delayedShipmentService.deleteById(id);
+
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.controller.shipments.delay;
+
+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.delay.GetDelayedShipmentDetailBo;
+import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
+import com.lframework.xingyun.sc.vo.shipments.delay.CreateDelayedShipmentDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.UpdateDelayedShipmentDetailVo;
+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("/delayedShipmentDetail/delayedshipmentdetail")
+public class DelayedShipmentDetailController extends DefaultBaseController {
+
+    @Autowired
+    private DelayedShipmentDetailService delayedShipmentDetailService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"delayedShipmentDetail:delayedshipmentdetail:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<GetDelayedShipmentDetailBo>> query(@Valid QueryDelayedShipmentDetailVo vo) {
+
+        PageResult<DelayedShipmentDetail> pageResult = delayedShipmentDetailService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<DelayedShipmentDetail> datas = pageResult.getDatas();
+        List<GetDelayedShipmentDetailBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetDelayedShipmentDetailBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"delayedShipmentDetail:delayedshipmentdetail:query"})
+    @GetMapping
+    public InvokeResult<GetDelayedShipmentDetailBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        DelayedShipmentDetail data = delayedShipmentDetailService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("延期发货详情表不存在！");
+        }
+
+        GetDelayedShipmentDetailBo result = new GetDelayedShipmentDetailBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"delayedShipmentDetail:delayedshipmentdetail:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateDelayedShipmentDetailVo vo) {
+
+        delayedShipmentDetailService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"delayedShipmentDetail:delayedshipmentdetail:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateDelayedShipmentDetailVo vo) {
+
+        delayedShipmentDetailService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"delayedShipmentDetail:delayedshipmentdetail:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        delayedShipmentDetailService.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 lombok.Data;
+
+/**
+ * <p>
+ * 延期发货表
+ * </p>
+ *
+ */
+@Data
+@TableName("delayed_shipment")
+public class DelayedShipment extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "DelayedShipment";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 申请日期
+     */
+    private LocalDate applyDate;
+
+    /**
+     * 所属办ID
+     */
+    private String deptId;
+
+    /**
+     * 所属办ID
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 审核状态
+     */
+    private String status;
+
+    /**
+     * 延期发货详情
+     */
+    @TableField(exist = false)
+    private List<DelayedShipmentDetail> delayedShipmentDetailList;
+
+    /**
+     * 创建人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;
+
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import com.lframework.starter.web.core.dto.BaseDto;
+import java.time.LocalDate;
+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 lombok.Data;
+
+/**
+ * <p>
+ * 延期发货详情表
+ * </p>
+ *
+ */
+@Data
+@TableName("delayed_shipment_detail")
+public class DelayedShipmentDetail extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "DelayedShipmentDetail";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 延期发货ID
+     */
+    private String delayedShipmentId;
+
+    /**
+     * 订货单ID
+     */
+    private String orderId;
+
+    /**
+     * 订货单编码
+     */
+    @TableField(exist = false)
+    private String orderNo;
+
+    /**
+     * 订货单类型
+     */
+    @TableField(exist = false)
+    private String orderType;
+
+    /**
+     * 所属分厂ID
+     */
+    @TableField(exist = false)
+    private String workshopId;
+
+    /**
+     * 所属分厂
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
+     * 客户ID
+     */
+    @TableField(exist = false)
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    @TableField(exist = false)
+    private String customerName;
+
+    /**
+     * 发货计划明细ID
+     */
+    private String shipmentsPlanDetailId;
+
+    /**
+     * 订货单物料行ID
+     */
+    private String orderSpecId;
+
+    /**
+     * 原订单计划发货日期
+     */
+    private LocalDate deliveryDate;
+
+    /**
+     * 现申请发货日期
+     */
+    private LocalDate applyShipmentDate;
+
+    /**
+     * 申请次数
+     */
+    private Integer applyCount;
+
+    /**
+     * 发货数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 延迟原因
+     */
+    private String delayReason;
+
+    /**
+     * 创建人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;
+
+}

+package com.lframework.xingyun.sc.impl.shipments.delay;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import java.io.Serializable;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import com.lframework.xingyun.sc.mappers.DelayedShipmentDetailMapper;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
+import com.lframework.xingyun.sc.vo.shipments.delay.CreateDelayedShipmentDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.UpdateDelayedShipmentDetailVo;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+@Service
+public class DelayedShipmentDetailServiceImpl extends BaseMpServiceImpl<DelayedShipmentDetailMapper, DelayedShipmentDetail> implements DelayedShipmentDetailService {
+
+    @Override
+    public PageResult<DelayedShipmentDetail> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentDetailVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<DelayedShipmentDetail> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<DelayedShipmentDetail> query(QueryDelayedShipmentDetailVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public DelayedShipmentDetail findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增延期发货详情表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateDelayedShipmentDetailVo vo) {
+
+        DelayedShipmentDetail data = new DelayedShipmentDetail();
+        data.setId(IdUtil.getId());
+        data.setDelayedShipmentId(vo.getDelayedShipmentId());
+        data.setOrderId(vo.getOrderId());
+        data.setShipmentsPlanDetailId(vo.getShipmentsPlanDetailId());
+        data.setOrderSpecId(vo.getOrderSpecId());
+        data.setDeliveryDate(vo.getDeliveryDate());
+        data.setApplyShipmentDate(vo.getApplyShipmentDate());
+        data.setApplyCount(vo.getApplyCount());
+        data.setQuantity(vo.getQuantity());
+        data.setDelayReason(vo.getDelayReason());
+
+        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(UpdateDelayedShipmentDetailVo vo) {
+
+        DelayedShipmentDetail data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("延期发货详情表不存在！");
+        }
+
+        LambdaUpdateWrapper<DelayedShipmentDetail> updateWrapper = Wrappers.lambdaUpdate(DelayedShipmentDetail.class)
+                .set(DelayedShipmentDetail::getDelayedShipmentId, vo.getDelayedShipmentId())
+                .set(DelayedShipmentDetail::getOrderId, vo.getOrderId())
+                .set(DelayedShipmentDetail::getShipmentsPlanDetailId, vo.getShipmentsPlanDetailId())
+                .set(DelayedShipmentDetail::getOrderSpecId, vo.getOrderSpecId())
+                .set(DelayedShipmentDetail::getDeliveryDate, vo.getDeliveryDate())
+                .set(DelayedShipmentDetail::getApplyShipmentDate, vo.getApplyShipmentDate())
+                .set(DelayedShipmentDetail::getApplyCount, vo.getApplyCount())
+                .set(DelayedShipmentDetail::getQuantity, vo.getQuantity())
+                .set(DelayedShipmentDetail::getDelayReason, vo.getDelayReason())
+                .eq(DelayedShipmentDetail::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) {
+
+    }
+}

+package com.lframework.xingyun.sc.impl.shipments.delay;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+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.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.DelayedShipment;
+import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
+import com.lframework.xingyun.sc.vo.shipments.delay.CreateDelayedShipmentVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.UpdateDelayedShipmentVo;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmentMapper, DelayedShipment> implements DelayedShipmentService {
+
+    @Override
+    public PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<DelayedShipment> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<DelayedShipment> query(QueryDelayedShipmentVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public DelayedShipment findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增延期发货表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateDelayedShipmentVo vo) {
+
+        DelayedShipment data = new DelayedShipment();
+        data.setId(IdUtil.getId());
+        data.setDeptId(vo.getDeptId());
+        data.setApplyDate(vo.getApplyDate());
+        data.setStatus(vo.getStatus());
+
+        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(UpdateDelayedShipmentVo vo) {
+
+        DelayedShipment data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("延期发货表不存在！");
+        }
+
+        LambdaUpdateWrapper<DelayedShipment> updateWrapper = Wrappers.lambdaUpdate(DelayedShipment.class)
+                .set(DelayedShipment::getDeptId, vo.getDeptId())
+                .set(DelayedShipment::getApplyDate, vo.getApplyDate())
+                .set(DelayedShipment::getStatus, vo.getStatus())
+                .eq(DelayedShipment::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) {
+
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 延期发货详情表 Mapper 接口
+ * </p>
+ *
+ */
+public interface DelayedShipmentDetailMapper extends BaseMapper<DelayedShipmentDetail> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<DelayedShipmentDetail> query(@Param("vo") QueryDelayedShipmentDetailVo vo);
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.DelayedShipment;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 延期发货表 Mapper 接口
+ * </p>
+ *
+ */
+public interface DelayedShipmentMapper extends BaseMapper<DelayedShipment> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<DelayedShipment> query(@Param("vo") QueryDelayedShipmentVo vo);
+}

+package com.lframework.xingyun.sc.service.shipments.delay;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import com.lframework.xingyun.sc.vo.shipments.delay.CreateDelayedShipmentDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.UpdateDelayedShipmentDetailVo;
+import java.util.List;
+
+/**
+ * 延期发货详情表 Service
+ */
+public interface DelayedShipmentDetailService extends BaseMpService<DelayedShipmentDetail> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<DelayedShipmentDetail> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentDetailVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<DelayedShipmentDetail> query(QueryDelayedShipmentDetailVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    DelayedShipmentDetail findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateDelayedShipmentDetailVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateDelayedShipmentDetailVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.sc.service.shipments.delay;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.DelayedShipment;
+import com.lframework.xingyun.sc.vo.shipments.delay.CreateDelayedShipmentVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.UpdateDelayedShipmentVo;
+import java.util.List;
+
+/**
+ * 延期发货表 Service
+ */
+public interface DelayedShipmentService extends BaseMpService<DelayedShipment> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<DelayedShipment> query(QueryDelayedShipmentVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    DelayedShipment findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateDelayedShipmentVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateDelayedShipmentVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.sc.vo.shipments.delay;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+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 CreateDelayedShipmentDetailVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 延期发货ID
+     */
+    @ApiModelProperty(value = "延期发货ID", required = true)
+    @NotBlank(message = "请输入延期发货ID！")
+    @Length(message = "延期发货ID最多允许32个字符！")
+    private String delayedShipmentId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty(value = "订货单ID", required = true)
+    @NotBlank(message = "请输入订货单ID！")
+    @Length(message = "订货单ID最多允许32个字符！")
+    private String orderId;
+
+    /**
+     * 发货计划明细ID
+     */
+    @ApiModelProperty(value = "发货计划明细ID", required = true)
+    @NotBlank(message = "请输入发货计划明细ID！")
+    @Length(message = "发货计划明细ID最多允许32个字符！")
+    private String shipmentsPlanDetailId;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty(value = "订货单物料行ID", required = true)
+    @NotBlank(message = "请输入订货单物料行ID！")
+    @Length(message = "订货单物料行ID最多允许32个字符！")
+    private String orderSpecId;
+
+    /**
+     * 原订单计划发货日期
+     */
+    @ApiModelProperty(value = "原订单计划发货日期", required = true)
+    @NotNull(message = "请输入原订单计划发货日期！")
+    @TypeMismatch(message = "原订单计划发货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 现申请发货日期
+     */
+    @ApiModelProperty(value = "现申请发货日期", required = true)
+    @NotNull(message = "请输入现申请发货日期！")
+    @TypeMismatch(message = "现申请发货日期格式有误！")
+    private LocalDate applyShipmentDate;
+
+    /**
+     * 申请次数
+     */
+    @ApiModelProperty(value = "申请次数", required = true)
+    @NotNull(message = "请输入申请次数！")
+    @TypeMismatch(message = "申请次数格式有误！")
+    private Integer applyCount;
+
+    /**
+     * 发货数量
+     */
+    @ApiModelProperty(value = "发货数量", required = true)
+    @NotNull(message = "请输入发货数量！")
+    @TypeMismatch(message = "发货数量格式有误！")
+    @IsNumberPrecision(message = "发货数量最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 延迟原因
+     */
+    @ApiModelProperty(value = "延迟原因", required = true)
+    @NotBlank(message = "请输入延迟原因！")
+    @Length(message = "延迟原因最多允许500个字符！")
+    private String delayReason;
+
+}

+package com.lframework.xingyun.sc.vo.shipments.delay;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+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 CreateDelayedShipmentVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所属办ID
+     */
+    @ApiModelProperty(value = "所属办ID", required = true)
+    @NotBlank(message = "请输入所属办ID！")
+    @Length(message = "所属办ID最多允许32个字符！")
+    private String deptId;
+
+    /**
+     * 申请日期
+     */
+    @ApiModelProperty(value = "申请日期", required = true)
+    @NotNull(message = "请输入申请日期！")
+    @TypeMismatch(message = "申请日期格式有误！")
+    private LocalDate applyDate;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty(value = "审核状态", required = true)
+    @NotBlank(message = "请输入审核状态！")
+    @Length(message = "审核状态最多允许20个字符！")
+    private String status;
+
+}

+package com.lframework.xingyun.sc.vo.shipments.delay;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QueryDelayedShipmentDetailVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 延期发货ID
+     */
+    @ApiModelProperty("延期发货ID")
+    private String delayedShipmentId;
+
+}

+package com.lframework.xingyun.sc.vo.shipments.delay;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QueryDelayedShipmentVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所属办名称
+     */
+    @ApiModelProperty("所属办名称")
+    private String deptName;
+
+    /**
+     * 申请日期开始
+     */
+    @ApiModelProperty("申请日期开始")
+    private String applyDateStart;
+
+    /**
+     * 申请日期结束
+     */
+    @ApiModelProperty("申请日期结束")
+    private String applyDateEnd;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+}

+package com.lframework.xingyun.sc.vo.shipments.delay;
+
+import lombok.Data;
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+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 UpdateDelayedShipmentDetailVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 延期发货ID
+     */
+    @ApiModelProperty(value = "延期发货ID", required = true)
+    @NotBlank(message = "请输入延期发货ID！")
+    @Length(message = "延期发货ID最多允许32个字符！")
+    private String delayedShipmentId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty(value = "订货单ID", required = true)
+    @NotBlank(message = "请输入订货单ID！")
+    @Length(message = "订货单ID最多允许32个字符！")
+    private String orderId;
+
+    /**
+     * 发货计划明细ID
+     */
+    @ApiModelProperty(value = "发货计划明细ID", required = true)
+    @NotBlank(message = "请输入发货计划明细ID！")
+    @Length(message = "发货计划明细ID最多允许32个字符！")
+    private String shipmentsPlanDetailId;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty(value = "订货单物料行ID", required = true)
+    @NotBlank(message = "请输入订货单物料行ID！")
+    @Length(message = "订货单物料行ID最多允许32个字符！")
+    private String orderSpecId;
+
+    /**
+     * 原订单计划发货日期
+     */
+    @ApiModelProperty(value = "原订单计划发货日期", required = true)
+    @TypeMismatch(message = "原订单计划发货日期格式有误！")
+    @NotNull(message = "请输入原订单计划发货日期！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 现申请发货日期
+     */
+    @ApiModelProperty(value = "现申请发货日期", required = true)
+    @TypeMismatch(message = "现申请发货日期格式有误！")
+    @NotNull(message = "请输入现申请发货日期！")
+    private LocalDate applyShipmentDate;
+
+    /**
+     * 申请次数
+     */
+    @ApiModelProperty(value = "申请次数", required = true)
+    @TypeMismatch(message = "申请次数格式有误！")
+    @NotNull(message = "请输入申请次数！")
+    private Integer applyCount;
+
+    /**
+     * 发货数量
+     */
+    @ApiModelProperty(value = "发货数量", required = true)
+    @TypeMismatch(message = "发货数量格式有误！")
+    @NotNull(message = "请输入发货数量！")
+    @IsNumberPrecision(message = "发货数量最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 延迟原因
+     */
+    @ApiModelProperty(value = "延迟原因", required = true)
+    @NotBlank(message = "请输入延迟原因！")
+    @Length(message = "延迟原因最多允许500个字符！")
+    private String delayReason;
+
+}

+package com.lframework.xingyun.sc.vo.shipments.delay;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+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 UpdateDelayedShipmentVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 所属办ID
+     */
+    @ApiModelProperty(value = "所属办ID", required = true)
+    @NotBlank(message = "请输入所属办ID！")
+    @Length(message = "所属办ID最多允许32个字符！")
+    private String deptId;
+
+    /**
+     * 申请日期
+     */
+    @ApiModelProperty(value = "申请日期", required = true)
+    @TypeMismatch(message = "申请日期格式有误！")
+    @NotNull(message = "请输入申请日期！")
+    private LocalDate applyDate;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty(value = "审核状态", required = true)
+    @NotBlank(message = "请输入审核状态！")
+    @Length(message = "审核状态最多允许20个字符！")
+    private String status;
+
+}

+<?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.DelayedShipmentDetailMapper">
+
+    <resultMap id="DelayedShipmentDetail" type="com.lframework.xingyun.sc.entity.DelayedShipmentDetail">
+        <id column="id" property="id"/>
+        <result column="delayed_shipment_id" property="delayedShipmentId"/>
+        <result column="order_id" property="orderId"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="order_type" property="orderType"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="customer_name" property="customerName"/>
+        <result column="shipments_plan_detail_id" property="shipmentsPlanDetailId"/>
+        <result column="order_spec_id" property="orderSpecId"/>
+        <result column="delivery_date" property="deliveryDate"/>
+        <result column="apply_shipment_date" property="applyShipmentDate"/>
+        <result column="apply_count" property="applyCount"/>
+        <result column="quantity" property="quantity"/>
+        <result column="delay_reason" property="delayReason"/>
+        <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="DelayedShipmentDetail_sql">
+        SELECT
+            tb.id,
+            tb.delayed_shipment_id,
+            tb.order_id,
+            o.order_no,
+            s.type AS order_type,
+            o.workshop_id,
+            ws.name AS workshop_name,
+            o.ordering_unit AS customer_id,
+            c.name AS customer_name,
+            tb.shipments_plan_detail_id,
+            tb.order_spec_id,
+            tb.delivery_date,
+            tb.apply_shipment_date,
+            tb.apply_count,
+            tb.quantity,
+            tb.delay_reason,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM delayed_shipment_detail AS tb
+        LEFT JOIN purchase_order_info o ON tb.order_id = o.id
+        LEFT JOIN base_data_customer c ON o.ordering_unit = c.id
+        LEFT JOIN base_data_workshop ws on ws.id = o.workshop_id
+        LEFT JOIN tbl_contract_distributor_standard s on s.id = o.contract_id
+    </sql>
+
+    <select id="query" resultMap="DelayedShipmentDetail">
+        <include refid="DelayedShipmentDetail_sql"/>
+        <where>
+            <if test="vo.delayedShipmentId != null and vo.delayedShipmentId != ''">
+                AND tb.delayed_shipment_id = #{vo.delayedShipmentId}
+            </if>
+        </where>
+        ORDER BY tb.create_time DESC
+    </select>
+</mapper>

+<?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.DelayedShipmentMapper">
+
+    <resultMap id="DelayedShipment" type="com.lframework.xingyun.sc.entity.DelayedShipment">
+        <id column="id" property="id"/>
+        <result column="apply_date" property="applyDate"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <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="DelayedShipment_sql">
+        SELECT
+            tb.id,
+            tb.apply_date,
+            tb.dept_id,
+            sd.name AS dept_name,
+            tb.status,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM delayed_shipment AS tb
+        left join sys_dept as sd on sd.id = tb.dept_id
+    </sql>
+
+    <select id="query" resultMap="DelayedShipment">
+        <include refid="DelayedShipment_sql"/>
+        <where>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                AND sd.name LIKE CONCAT('%', #{vo.deptName},'%')
+            </if>
+            <if test="vo.applyDateStart != null">
+                AND tb.apply_date >= #{vo.applyDateStart}
+            </if>
+            <if test="vo.applyDateEnd != null">
+                <![CDATA[
+               AND tb.apply_date <= #{vo.applyDateEnd}
+                ]]>
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
+        </where>
+        ORDER BY tb.create_time DESC
+    </select>
+</mapper>