楚江ERP-发货计划基础接口开发

+package com.lframework.xingyun.sc.bo.shipments.plan;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 发货计划明细 GetBo
+ * </p>
+ *
+ */
+@Data
+public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 发货计划ID
+     */
+    @ApiModelProperty("发货计划ID")
+    private String planId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String orderId;
+
+    /**
+     * 父类ID
+     */
+    @ApiModelProperty("父类ID")
+    private String parentId;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate shipmentsDate;
+
+    /**
+     * 发货时间点
+     */
+    @ApiModelProperty("发货时间点")
+    @JsonFormat(pattern = StringPool.TIME_PATTERN)
+    private LocalTime shipmentsTime;
+
+    /**
+     * 是否可以发货
+     */
+    @ApiModelProperty("是否可以发货")
+    private Boolean canShipments;
+
+    /**
+     * 创建人ID
+     */
+    @ApiModelProperty("创建人ID")
+    private String createById;
+
+    /**
+     * 更新人ID
+     */
+    @ApiModelProperty("更新人ID")
+    private String updateById;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime updateTime;
+
+    public ShipmentsPlanDetailBo() {
+
+    }
+
+    public ShipmentsPlanDetailBo(ShipmentsPlanDetail dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ShipmentsPlanDetail> convert(ShipmentsPlanDetail dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ShipmentsPlanDetail dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.shipments;
+
+import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanDetailBo;
+import com.lframework.xingyun.sc.entity.ShipmentsPlan;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
+import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.vo.shipments.plan.CreateShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+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 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 com.lframework.starter.web.core.controller.DefaultBaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+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("/shipments/plan/detail")
+public class ShipmentsPlanDetailController extends DefaultBaseController {
+
+    @Autowired
+    private ShipmentsPlanDetailService shipmentsPlanDetailService;
+    @Autowired
+    private ShipmentsPlanService shipmentsPlanService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"shipments:plan:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<ShipmentsPlanDetailBo>> query(@Valid QueryShipmentsPlanDetailVo vo) {
+        PageResult<ShipmentsPlanDetail> pageResult = shipmentsPlanDetailService.query(getPageIndex(vo), getPageSize(vo), vo);
+        List<ShipmentsPlanDetail> dataList = pageResult.getDatas();
+        List<ShipmentsPlanDetailBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = dataList.stream().map(ShipmentsPlanDetailBo::new).collect(Collectors.toList());
+        }
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"shipments:plan:query"})
+    @GetMapping
+    public InvokeResult<ShipmentsPlanDetailBo> get(@NotBlank(message = "id不能为空！") String id) {
+        ShipmentsPlanDetail data = shipmentsPlanDetailService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("发货计划明细不存在！");
+        }
+        ShipmentsPlanDetailBo result = new ShipmentsPlanDetailBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"shipments:plan:add"})
+    @PostMapping
+    public InvokeResult<Void> batchAdd(@Valid @RequestBody CreateShipmentsPlanDetailVo vo) {
+        shipmentsPlanDetailService.create(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"shipments:plan:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateShipmentsPlanDetailVo vo) {
+        shipmentsPlanDetailService.update(vo);
+        return InvokeResultBuilder.success();
+    }
+}

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.dto.BaseDto;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -32,6 +34,8 @@ public class ShipmentsPlan extends BaseEntity implements BaseDto {
      * 生产厂ID
      * 生产厂ID
      */
      */
     private String workshopId;
     private String workshopId;
+    @TableField(exist = false)
+    private String workshopName;
 
 
     /**
     /**
      * 状态
      * 状态
@@ -72,4 +76,17 @@ public class ShipmentsPlan extends BaseEntity implements BaseDto {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
     private LocalDateTime updateTime;
 
 
+    /**
+     * 明天发货计划明细
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    List<ShipmentsPlanDetail> tomoPlanList;
+
+    /**
+     * 后天发货计划明细
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    List<ShipmentsPlanDetail> afTomoPlanList;
 }
 }

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalTime;
+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("shipments_plan_detail")
+public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ShipmentsPlanDetail";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 发货计划ID
+     */
+    private String planId;
+
+    /**
+     * 订货单ID
+     */
+    private String orderId;
+
+    /**
+     * 订单编号
+     */
+    @TableField(exist = false)
+    private String orderNo;
+
+    /**
+     * 客户名称
+     */
+    @TableField(exist = false)
+    private String customerName;
+
+    /**
+     * 厚度
+     */
+    @TableField(exist = false)
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @TableField(exist = false)
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @TableField(exist = false)
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @TableField(exist = false)
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @TableField(exist = false)
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @TableField(exist = false)
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @TableField(exist = false)
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @TableField(exist = false)
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @TableField(exist = false)
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 计划吨位
+     */
+    @TableField(exist = false)
+    private BigDecimal quantity;
+
+    /**
+     * 父类ID
+     */
+    private String parentId;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 发货日期
+     */
+    private LocalDate shipmentsDate;
+
+    /**
+     * 发货时间点
+     */
+    private LocalTime shipmentsTime;
+
+    /**
+     * 是否可以发货
+     */
+    private Boolean canShipments;
+
+    /**
+     * 是否删除
+     */
+    private Boolean delFlag;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

+package com.lframework.xingyun.sc.impl.shipments;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+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 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.mappers.ShipmentsPlanDetailMapper;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.vo.shipments.plan.CreateShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.data.redis.core.RedisHash;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsPlanDetailMapper, ShipmentsPlanDetail> implements ShipmentsPlanDetailService {
+
+
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+
+    @Override
+    public PageResult<ShipmentsPlanDetail> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ShipmentsPlanDetail> dataList = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
+    public List<ShipmentsPlanDetail> query(QueryShipmentsPlanDetailVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public ShipmentsPlanDetail findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增发货计划明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void create(CreateShipmentsPlanDetailVo vo) {
+        List<String> orderIds = vo.getOrderIds();
+        if (CollectionUtils.isEmpty(orderIds)) {
+            throw new DefaultClientException("订货单ID不能为空！");
+        }
+        List<ShipmentsPlanDetail> detailList = new ArrayList<>();
+        for (String orderId : orderIds) {
+            ShipmentsPlanDetail data = new ShipmentsPlanDetail();
+            data.setId(IdUtil.getId());
+            data.setPlanId(vo.getPlanId());
+            data.setOrderId(orderId);
+            data.setShipmentsDate(vo.getShipmentDate());
+
+            detailList.add(data);
+        }
+
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改发货计划明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateShipmentsPlanDetailVo vo) {
+
+        ShipmentsPlanDetail data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("发货计划明细不存在！");
+        }
+
+        LambdaUpdateWrapper<ShipmentsPlanDetail> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlanDetail.class)
+                .set(ShipmentsPlanDetail::getShipmentsTime, vo.getShipmentsTime())
+                .set(ShipmentsPlanDetail::getCanShipments, vo.getCanShipments())
+                .eq(ShipmentsPlanDetail::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+}

@@ -15,6 +15,10 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanMapper;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanMapper;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
@@ -23,12 +27,18 @@ import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanVo;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 @Service
 @Service
 public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMapper, ShipmentsPlan> implements ShipmentsPlanService {
 public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMapper, ShipmentsPlan> implements ShipmentsPlanService {
 
 
 
 
+    @Resource
+    private ShipmentsPlanDetailService shipmentsPlanDetailService;;
+
 
 
     @Override
     @Override
     public PageResult<ShipmentsPlan> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanVo vo) {
     public PageResult<ShipmentsPlan> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanVo vo) {
@@ -48,7 +58,38 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap
 
 
     @Override
     @Override
     public ShipmentsPlan findById(String id) {
     public ShipmentsPlan findById(String id) {
-        return getBaseMapper().selectById(id);
+        ShipmentsPlan plan = getBaseMapper().getById(id);
+        if (plan == null) {
+            throw new DefaultClientException("发货计划不存在！");
+        }
+        // 获取计划明细
+        QueryShipmentsPlanDetailVo detailVo = new QueryShipmentsPlanDetailVo();
+        detailVo.setPlanId(plan.getId());
+        // 发货日期
+        List<LocalDate> dateList = new ArrayList<>();
+        dateList.add(plan.getTomoPreShipDate());
+        dateList.add(plan.getAfTomoPreShipDate());
+        detailVo.setShipmentsDateList(dateList);
+
+        List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.query(detailVo);
+        if (CollectionUtils.isEmpty(detailList)) {
+            return plan;
+        }
+        // 根据日期分组
+        List<ShipmentsPlanDetail> tomorrowPlans = new ArrayList<>();
+        List<ShipmentsPlanDetail> afterTomorrowPlans = new ArrayList<>();
+        for (ShipmentsPlanDetail detail : detailList) {
+            LocalDate shipmentsDate = detail.getShipmentsDate();
+            if (shipmentsDate.equals(plan.getTomoPreShipDate())) {
+                tomorrowPlans.add(detail);
+            } else if (shipmentsDate.equals(plan.getAfTomoPreShipDate())) {
+                afterTomorrowPlans.add(detail);
+            }
+        }
+        plan.setTomoPlanList(tomorrowPlans);
+        plan.setAfTomoPlanList(afterTomorrowPlans);
+
+        return plan;
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "新增发货计划，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "新增发货计划，ID：{}", params = {"#id"})

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 发货计划明细 Mapper 接口
+ * </p>
+ *
+ */
+public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetail> {
+
+	/**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      List<ShipmentsPlanDetail>
+     */
+    List<ShipmentsPlanDetail> query(@Param("vo") QueryShipmentsPlanDetailVo vo);
+}

 package com.lframework.xingyun.sc.mappers;
 package com.lframework.xingyun.sc.mappers;
 
 
 import com.lframework.xingyun.sc.entity.ShipmentsPlan;
 import com.lframework.xingyun.sc.entity.ShipmentsPlan;
-import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.starter.web.core.mapper.BaseMapper;
-import com.lframework.starter.web.core.vo.BaseVo;
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
-import io.swagger.annotations.ApiModelProperty;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -21,8 +17,17 @@ public interface ShipmentsPlanMapper extends BaseMapper<ShipmentsPlan> {
 
 
 	/**
 	/**
      * 查询列表
      * 查询列表
-     * @param vo
-     * @return
+     *
+     * @param vo    查询条件
+     * @return      List<ShipmentsPlan>
      */
      */
     List<ShipmentsPlan> query(@Param("vo") QueryShipmentsPlanVo vo);
     List<ShipmentsPlan> query(@Param("vo") QueryShipmentsPlanVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param id    查询条件
+     * @return      ShipmentsPlan
+     */
+    ShipmentsPlan getById(@Param("id") String id);
 }
 }

+package com.lframework.xingyun.sc.service.shipments;
+
+import com.lframework.xingyun.sc.vo.shipments.plan.CreateShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.utils.EnumUtil;
+import com.lframework.starter.web.core.utils.IdUtil;
+import java.time.LocalTime;
+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 io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 发货计划明细 Service
+ */
+public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanDetail> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      PageResult<ShipmentsPlanDetail>
+     */
+    PageResult<ShipmentsPlanDetail> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      List<ShipmentsPlanDetail>
+     */
+    List<ShipmentsPlanDetail> query(QueryShipmentsPlanDetailVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id    主键ID
+     * @return      ShipmentsPlanDetail
+     */
+    ShipmentsPlanDetail findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo    数据实体
+     */
+    void create(CreateShipmentsPlanDetailVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo    数据实体
+     */
+    void update(UpdateShipmentsPlanDetailVo vo);
+
+}

+package com.lframework.xingyun.sc.vo.shipments.plan;
+
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+
+import javax.validation.constraints.NotEmpty;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class CreateShipmentsPlanDetailVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发货计划ID
+     */
+    @ApiModelProperty(value = "发货计划ID", required = true)
+    @NotBlank(message = "请输入发货计划ID！")
+    @Length(message = "发货计划ID最多允许32个字符！")
+    private String planId;
+
+    /**
+     * 订货单ID集合
+     */
+    @ApiModelProperty(value = "订货单ID", required = true)
+    @NotEmpty(message = "请输入订货单ID！")
+    private List<String> orderIds;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty(value = "发货日期")
+    private LocalDate shipmentDate;
+}

+package com.lframework.xingyun.sc.vo.shipments.plan;
+
+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;
+import java.util.List;
+
+@Data
+public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发货计划ID
+     */
+    @ApiModelProperty("发货计划ID")
+    private String planId;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate shipmentsDate;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private List<LocalDate> shipmentsDateList;
+}

+package com.lframework.xingyun.sc.vo.shipments.plan;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalTime;
+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 java.io.Serializable;
+
+@Data
+public class UpdateShipmentsPlanDetailVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 发货时间点
+     */
+    @ApiModelProperty(value = "发货时间点", required = true)
+    @TypeMismatch(message = "发货时间点格式有误！")
+    @NotNull(message = "请输入发货时间点！")
+    private LocalTime shipmentsTime;
+
+    /**
+     * 是否可以发货
+     */
+    @ApiModelProperty(value = "是否可以发货", required = true)
+    @TypeMismatch(message = "是否可以发货格式有误！")
+    @NotNull(message = "请输入是否可以发货！")
+    private Boolean canShipments;
+
+}

+<?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.ShipmentsPlanDetailMapper">
+
+    <resultMap id="ShipmentsPlanDetail" type="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail">
+        <id column="id" property="id"/>
+        <result column="plan_id" property="planId"/>
+        <result column="order_id" property="orderId"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="customer_name" property="customerName"/>
+        <result column="thickness" property="thickness"/>
+        <result column="thickness_tol_pos" property="thicknessTolPos"/>
+        <result column="thickness_tol_neg" property="thicknessTolNeg"/>
+        <result column="width" property="width"/>
+        <result column="width_tol_pos" property="widthTolPos"/>
+        <result column="width_tol_neg" property="widthTolNeg"/>
+        <result column="length" property="length"/>
+        <result column="length_tol_pos" property="lengthTolPos"/>
+        <result column="length_tol_neg" property="lengthTolNeg"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="status" property="status"/>
+        <result column="shipments_date" property="shipmentsDate"/>
+        <result column="shipments_time" property="shipmentsTime"/>
+        <result column="can_shipments" property="canShipments"/>
+        <result column="del_flag" property="delFlag"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="ShipmentsPlanDetail_sql">
+        SELECT
+            tb.id,
+            tb.plan_id,
+            tb.order_id,
+            o.order_no,
+            c.name AS customer_name,
+            ol.thickness,
+            ol.thickness_tol_pos,
+            ol.thickness_tol_neg,
+            ol.width,
+            ol.width_tol_pos,
+            ol.width_tol_neg,
+            ol.length,
+            ol.length_tol_pos,
+            ol.length_tol_neg,
+            ol.quantity,
+            tb.parent_id,
+            tb.status,
+            tb.shipments_date,
+            tb.shipments_time,
+            tb.can_shipments,
+            tb.del_flag,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time
+        FROM shipments_plan_detail AS tb
+        INNER JOIN shipments_plan p ON tb.plan_id = p.id
+        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 tbl_purchase_order_line ol ON tb.order_id = ol.purchase_order_id
+    </sql>
+
+    <select id="query" resultMap="ShipmentsPlanDetail">
+        <include refid="ShipmentsPlanDetail_sql"/>
+        <where>
+            <if test="vo.planId != null and vo.planId != ''">
+                AND tb.plan_id = #{vo.planId}
+            </if>
+            <if test="vo.shipmentsDate != null">
+                AND tb.shipments_date = #{vo.shipmentsDate}
+            </if>
+        </where>
+    </select>
+</mapper>

@@ -5,6 +5,7 @@
     <resultMap id="ShipmentsPlan" type="com.lframework.xingyun.sc.entity.ShipmentsPlan">
     <resultMap id="ShipmentsPlan" type="com.lframework.xingyun.sc.entity.ShipmentsPlan">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
         <result column="tomo_pre_ship_date" property="tomoPreShipDate"/>
         <result column="tomo_pre_ship_date" property="tomoPreShipDate"/>
         <result column="af_tomo_pre_ship_date" property="afTomoPreShipDate"/>
         <result column="af_tomo_pre_ship_date" property="afTomoPreShipDate"/>
@@ -18,6 +19,7 @@
         SELECT
         SELECT
             tb.id,
             tb.id,
             tb.workshop_id,
             tb.workshop_id,
+            w.workshop_name,
             tb.status,
             tb.status,
             tb.tomo_pre_ship_date,
             tb.tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
@@ -26,6 +28,7 @@
             tb.create_time,
             tb.create_time,
             tb.update_time
             tb.update_time
         FROM shipments_plan AS tb
         FROM shipments_plan AS tb
+        INNER JOIN base_data_workshop w ON tb.workshop_id = w.id
     </sql>
     </sql>
 
 
     <select id="query" resultMap="ShipmentsPlan">
     <select id="query" resultMap="ShipmentsPlan">
@@ -39,4 +42,11 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+
+    <select id="getById" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlan">
+        <include refid="ShipmentsPlan_sql"/>
+        <where>
+            AND tb.id = #{id}
+        </where>
+    </select>
 </mapper>
 </mapper>