楚江ERP-发货单基础接口开发

+package com.lframework.xingyun.sc.bo.shipments.order;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 发货单 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 发货计划ID
+     */
+    @ApiModelProperty("发货计划ID")
+    private String planId;
+
+    /**
+     * 购货单位ID
+     */
+    @ApiModelProperty("购货单位ID")
+    private String customerId;
+
+    /**
+     * 厂房ID
+     */
+    @ApiModelProperty("厂房ID")
+    private String workshopId;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate shipmentsDate;
+
+    /**
+     * 办事处ID
+     */
+    @ApiModelProperty("办事处ID")
+    private String deptId;
+
+    /**
+     * 交货方式
+     */
+    @ApiModelProperty("交货方式")
+    private String deliveryType;
+
+    /**
+     * 目的地
+     */
+    @ApiModelProperty("目的地")
+    private String destination;
+
+    /**
+     * 实发数量
+     */
+    @ApiModelProperty("实发数量")
+    private Double actualShipmentQuantity;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 创建人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 GetShipmentsOrderInfoBo() {
+
+    }
+
+    public GetShipmentsOrderInfoBo(ShipmentsOrderInfo dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ShipmentsOrderInfo> convert(ShipmentsOrderInfo dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ShipmentsOrderInfo dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.shipments.order;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 发货单 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QueryShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 发货计划ID
+     */
+    @ApiModelProperty("发货计划ID")
+    private String planId;
+
+    /**
+     * 购货单位ID
+     */
+    @ApiModelProperty("购货单位ID")
+    private String customerId;
+
+    /**
+     * 购货单位名称
+     */
+    @ApiModelProperty("购货单位名称")
+    private String customerName;
+
+    /**
+     * 厂房ID
+     */
+    @ApiModelProperty("厂房ID")
+    private String workshopId;
+
+    /**
+     * 厂房名称
+     */
+    @ApiModelProperty("厂房名称")
+    private String workshopName;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate shipmentsDate;
+
+    /**
+     * 办事处ID
+     */
+    @ApiModelProperty("办事处ID")
+    private String deptId;
+
+    /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
+     * 交货方式
+     */
+    @ApiModelProperty("交货方式")
+    private String deliveryType;
+
+    /**
+     * 目的地
+     */
+    @ApiModelProperty("目的地")
+    private String destination;
+
+    /**
+     * 实发数量
+     */
+    @ApiModelProperty("实发数量")
+    private Double actualShipmentQuantity;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 创建人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 QueryShipmentsOrderInfoBo() {
+
+    }
+
+    public QueryShipmentsOrderInfoBo(ShipmentsOrderInfo dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ShipmentsOrderInfo> convert(ShipmentsOrderInfo dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ShipmentsOrderInfo dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.shipments;
+
+import com.lframework.xingyun.sc.bo.shipments.order.GetShipmentsOrderInfoBo;
+import com.lframework.xingyun.sc.bo.shipments.order.QueryShipmentsOrderInfoBo;
+import com.lframework.xingyun.sc.vo.shipments.order.QueryShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
+import com.lframework.xingyun.sc.vo.shipments.order.CreateShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.vo.shipments.order.UpdateShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
+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.annotation.Resource;
+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 org.springframework.web.bind.annotation.DeleteMapping;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+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/order")
+public class ShipmentsOrderInfoController extends DefaultBaseController {
+
+
+    @Resource
+    private ShipmentsOrderInfoService shipmentsOrderInfoService;
+
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"shipments:order:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryShipmentsOrderInfoBo>> query(@Valid QueryShipmentsOrderInfoVo vo) {
+        PageResult<ShipmentsOrderInfo> pageResult = shipmentsOrderInfoService.query(getPageIndex(vo), getPageSize(vo), vo);
+        List<ShipmentsOrderInfo> dataList = pageResult.getDatas();
+        List<QueryShipmentsOrderInfoBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = dataList.stream().map(QueryShipmentsOrderInfoBo::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:order:query"})
+    @GetMapping
+    public InvokeResult<GetShipmentsOrderInfoBo> get(@NotBlank(message = "id不能为空！") String id) {
+        ShipmentsOrderInfo data = shipmentsOrderInfoService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("发货单不存在！");
+        }
+        GetShipmentsOrderInfoBo result = new GetShipmentsOrderInfoBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"shipments:order:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateShipmentsOrderInfoVo vo) {
+        shipmentsOrderInfoService.create(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"shipments:order:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateShipmentsOrderInfoVo vo) {
+        shipmentsOrderInfoService.update(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"shipments:order:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+        shipmentsOrderInfoService.deleteById(id);
+        return InvokeResultBuilder.success();
+    }
+}

@@ -120,4 +120,15 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
         shipmentsPlanDetailService.planDetailSplit(vo);
         shipmentsPlanDetailService.planDetailSplit(vo);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    /**
+     * 批量删除
+     */
+    @ApiOperation("批量删除")
+    @HasPermission({"shipments:plan:add"})
+    @PostMapping("/batchDelete")
+    public InvokeResult<Void> batchDelete(@Valid @RequestBody List<String> ids) {
+        shipmentsPlanDetailService.batchDelete(ids);
+        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 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_order_info")
+public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ShipmentsOrderInfo";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 发货计划ID
+     */
+    private String planId;
+
+    /**
+     * 购货单位ID
+     */
+    private String customerId;
+
+    /**
+     * 购货单位名称
+     */
+    @TableField(exist = false)
+    private String customerName;
+
+    /**
+     * 厂房ID
+     */
+    private String workshopId;
+
+    /**
+     * 厂房名称
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
+     * 发货日期
+     */
+    private LocalDate shipmentsDate;
+
+    /**
+     * 办事处ID
+     */
+    private String deptId;
+
+    /**
+     * 办事处名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 交货方式
+     */
+    private String deliveryType;
+
+    /**
+     * 目的地
+     */
+    private String destination;
+
+    /**
+     * 实发数量
+     */
+    private Double actualShipmentQuantity;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 创建人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.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
+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 org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
+import com.lframework.xingyun.sc.vo.shipments.order.CreateShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.vo.shipments.order.QueryShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.vo.shipments.order.UpdateShipmentsOrderInfoVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOrderInfoMapper, ShipmentsOrderInfo> implements ShipmentsOrderInfoService {
+
+
+
+    @Resource
+    private SysDeptService sysDeptService;
+
+
+
+    public ShipmentsOrderInfoServiceImpl(SysDeptService sysDeptService) {
+        this.sysDeptService = sysDeptService;
+    }
+
+    @Override
+    public PageResult<ShipmentsOrderInfo> query(Integer pageIndex, Integer pageSize, QueryShipmentsOrderInfoVo vo) {
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ShipmentsOrderInfo> dataList = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
+    public List<ShipmentsOrderInfo> query(QueryShipmentsOrderInfoVo vo) {
+        List<ShipmentsOrderInfo> shipmentsOrderList = getBaseMapper().query(vo);
+        if (CollectionUtils.isEmpty(shipmentsOrderList)) {
+            return Collections.emptyList();
+        }
+        // 办事处处理
+        List<String> deptIds = new ArrayList<>();
+        for (ShipmentsOrderInfo orderInfo : shipmentsOrderList) {
+            String deptId = orderInfo.getDeptId();
+            if (StringUtils.isBlank(deptId)) {
+                continue;
+            }
+            String[] split = deptId.split(",");
+            Collections.addAll(deptIds, split);
+        }
+        Map<String, SysDept> deptMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(deptIds)) {
+            List<SysDept> deptList = sysDeptService.listByIds(deptIds);
+            deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getId, Function.identity()));
+        }
+        for (ShipmentsOrderInfo orderInfo : shipmentsOrderList) {
+            String deptId = orderInfo.getDeptId();
+            if (StringUtils.isBlank(deptId)) {
+                continue;
+            }
+            String[] split = deptId.split(",");
+            if (split.length > 1) {
+                StringBuilder builder = new StringBuilder();
+                for (int i = 1; i < split.length; i++) {
+                    builder.append(split[i]);
+                    builder.append(",");
+                }
+                builder.deleteCharAt(builder.length() - 1);
+
+                orderInfo.setDeptName(builder.toString());
+            } else {
+                SysDept sysDept = deptMap.get(split[0]);
+                if (sysDept != null) {
+                    orderInfo.setDeptName(sysDept.getName());
+                }
+            }
+        }
+
+        return shipmentsOrderList;
+    }
+
+    @Override
+    public ShipmentsOrderInfo findById(String id) {
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增发货单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateShipmentsOrderInfoVo vo) {
+        ShipmentsOrderInfo data = new ShipmentsOrderInfo();
+        data.setId(IdUtil.getId());
+        data.setPlanId(vo.getPlanId());
+        data.setCustomerId(vo.getCustomerId());
+        data.setWorkshopId(vo.getWorkshopId());
+        data.setShipmentsDate(vo.getShipmentsDate());
+        data.setDeptId(vo.getDeptId());
+        data.setDeliveryType(vo.getDeliveryType());
+        data.setDestination(vo.getDestination());
+
+        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(UpdateShipmentsOrderInfoVo vo) {
+        ShipmentsOrderInfo data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("发货单不存在！");
+        }
+        LambdaUpdateWrapper<ShipmentsOrderInfo> updateWrapper = Wrappers.lambdaUpdate(ShipmentsOrderInfo.class)
+                .set(ShipmentsOrderInfo::getPlanId, vo.getPlanId())
+                .set(ShipmentsOrderInfo::getCustomerId, vo.getCustomerId())
+                .set(ShipmentsOrderInfo::getWorkshopId, vo.getWorkshopId())
+                .set(ShipmentsOrderInfo::getShipmentsDate, vo.getShipmentsDate())
+                .set(ShipmentsOrderInfo::getDeptId, vo.getDeptId())
+                .set(ShipmentsOrderInfo::getDeliveryType, vo.getDeliveryType())
+                .set(ShipmentsOrderInfo::getDestination, vo.getDestination())
+                .eq(ShipmentsOrderInfo::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);
+    }
+}

@@ -281,6 +281,22 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
         }
     }
     }
 
 
+    /**
+     * 批量删除
+     *
+     * @param ids   主键ID集合
+     */
+    @Override
+    public void batchDelete(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        LambdaUpdateWrapper<ShipmentsPlanDetail> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlanDetail.class);
+        updateWrapper.in(ShipmentsPlanDetail::getId, ids);
+
+        getBaseMapper().delete(updateWrapper);
+    }
+
 
 
     /**
     /**
      * 封装发货计划明细数据
      * 封装发货计划明细数据

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

+package com.lframework.xingyun.sc.service.shipments;
+
+import com.lframework.xingyun.sc.vo.shipments.order.CreateShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.vo.shipments.order.QueryShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.vo.shipments.order.UpdateShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import java.util.List;
+
+/**
+ * 发货单 Service
+ */
+public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderInfo> {
+
+    /**
+     * 查询列表
+     *
+     * @return  PageResult<ShipmentsOrderInfo>
+     */
+    PageResult<ShipmentsOrderInfo> query(Integer pageIndex, Integer pageSize, QueryShipmentsOrderInfoVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      List<ShipmentsOrderInfo>
+     */
+    List<ShipmentsOrderInfo> query(QueryShipmentsOrderInfoVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id    主键ID
+     * @return      ShipmentsOrderInfo
+     */
+    ShipmentsOrderInfo findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo    数据实体
+     * @return      String
+     */
+    String create(CreateShipmentsOrderInfoVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo    数据实体
+     */
+    void update(UpdateShipmentsOrderInfoVo vo);
+
+    /**
+     * 根据ID删除
+     *
+     * @param id    主键ID
+     */
+    void deleteById(String id);
+}

@@ -73,4 +73,11 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * 自动生成发货计划
      * 自动生成发货计划
      */
      */
     void autoCreateShipmentPlan();
     void autoCreateShipmentPlan();
+
+    /**
+     * 批量删除
+     *
+     * @param ids   主键ID集合
+     */
+    void batchDelete(List<String> ids);
 }
 }

+package com.lframework.xingyun.sc.vo.shipments.order;
+
+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 CreateShipmentsOrderInfoVo 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)
+    @NotBlank(message = "请输入购货单位ID！")
+    @Length(message = "购货单位ID最多允许32个字符！")
+    private String customerId;
+
+    /**
+     * 厂房ID
+     */
+    @ApiModelProperty(value = "厂房ID", required = true)
+    @NotBlank(message = "请输入厂房ID！")
+    @Length(message = "厂房ID最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty(value = "发货日期", required = true)
+    @NotNull(message = "请输入发货日期！")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate shipmentsDate;
+
+    /**
+     * 办事处ID
+     */
+    @ApiModelProperty(value = "办事处ID", required = true)
+    @NotBlank(message = "请输入办事处ID！")
+    @Length(message = "办事处ID最多允许500个字符！")
+    private String deptId;
+
+    /**
+     * 交货方式
+     */
+    @ApiModelProperty(value = "交货方式", required = true)
+    @NotBlank(message = "请输入交货方式！")
+    @Length(message = "交货方式最多允许100个字符！")
+    private String deliveryType;
+
+    /**
+     * 目的地
+     */
+    @ApiModelProperty(value = "目的地", required = true)
+    @NotBlank(message = "请输入目的地！")
+    @Length(message = "目的地最多允许100个字符！")
+    private String destination;
+
+}

+package com.lframework.xingyun.sc.vo.shipments.order;
+
+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 QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 厂房ID
+     */
+    @ApiModelProperty("厂房ID")
+    private String workshopId;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate shipmentsDate;
+
+    /**
+     * 办事处ID
+     */
+    @ApiModelProperty("办事处ID")
+    private String deptId;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+}

+package com.lframework.xingyun.sc.vo.shipments.order;
+
+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 UpdateShipmentsOrderInfoVo 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 planId;
+
+    /**
+     * 购货单位ID
+     */
+    @ApiModelProperty(value = "购货单位ID", required = true)
+    @NotBlank(message = "请输入购货单位ID！")
+    @Length(message = "购货单位ID最多允许32个字符！")
+    private String customerId;
+
+    /**
+     * 厂房ID
+     */
+    @ApiModelProperty(value = "厂房ID", required = true)
+    @NotBlank(message = "请输入厂房ID！")
+    @Length(message = "厂房ID最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty(value = "发货日期", required = true)
+    @TypeMismatch(message = "发货日期格式有误！")
+    @NotNull(message = "请输入发货日期！")
+    private LocalDate shipmentsDate;
+
+    /**
+     * 办事处ID
+     */
+    @ApiModelProperty(value = "办事处ID", required = true)
+    @NotBlank(message = "请输入办事处ID！")
+    @Length(message = "办事处ID最多允许500个字符！")
+    private String deptId;
+
+    /**
+     * 交货方式
+     */
+    @ApiModelProperty(value = "交货方式", required = true)
+    @NotBlank(message = "请输入交货方式！")
+    @Length(message = "交货方式最多允许100个字符！")
+    private String deliveryType;
+
+    /**
+     * 目的地
+     */
+    @ApiModelProperty(value = "目的地", required = true)
+    @NotBlank(message = "请输入目的地！")
+    @Length(message = "目的地最多允许100个字符！")
+    private String destination;
+
+}

+<?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.ShipmentsOrderInfoMapper">
+
+    <resultMap id="ShipmentsOrderInfo" type="com.lframework.xingyun.sc.entity.ShipmentsOrderInfo">
+        <id column="id" property="id"/>
+        <result column="plan_id" property="planId"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="customer_name" property="customerName"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
+        <result column="shipments_date" property="shipmentsDate"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="delivery_type" property="deliveryType"/>
+        <result column="destination" property="destination"/>
+        <result column="actual_shipment_quantity" property="actualShipmentQuantity"/>
+        <result column="status" property="status"/>
+        <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="ShipmentsOrderInfo_sql">
+        SELECT
+            tb.id,
+            tb.plan_id,
+            tb.customer_id,
+            c.name AS customer_name,
+            tb.workshop_id,
+            w.name AS workshop_name,
+            tb.shipments_date,
+            tb.dept_id,
+            tb.delivery_type,
+            tb.destination,
+            tb.actual_shipment_quantity,
+            tb.status,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time
+        FROM shipments_order_info AS tb
+        LEFT JOIN base_data_customer c ON tb.customer_id = c.id
+        LEFT JOIN base_data_workshop w ON tb.workshop_id = w.id
+    </sql>
+
+    <select id="query" resultMap="ShipmentsOrderInfo">
+        <include refid="ShipmentsOrderInfo_sql"/>
+        <where>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+                AND tb.workshop_id = #{vo.workshopId}
+            </if>
+            <if test="vo.shipmentsDate != null">
+                AND tb.shipments_date = #{vo.shipmentsDate}
+            </if>
+            <if test="vo.deptId != null and vo.deptId != ''">
+                AND tb.dept_id = #{vo.deptId}
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
+        </where>
+    </select>
+</mapper>

@@ -77,6 +77,7 @@
                 AND tb.shipments_date = #{vo.shipmentsDate}
                 AND tb.shipments_date = #{vo.shipmentsDate}
             </if>
             </if>
         </where>
         </where>
+        ORDER BY tb.create_time desc
     </select>
     </select>
 
 
     <insert id="batchAdd">
     <insert id="batchAdd">