资金协调手续：待交付订单量基础方法

@@ -316,6 +316,7 @@ CREATE TABLE IF NOT EXISTS `purchase_order_info`
     `contract_id`                varchar(50)    DEFAULT NULL COMMENT '合同ID',
     `execution_standard_remarks` varchar(500)   DEFAULT NULL COMMENT '执行标准备注',
     `replenishment_order_id`     varchar(32)    DEFAULT NULL COMMENT '补货单ID',
+    `freeze`                     bool DEFAULT false COMMENT '是否冻结',
     PRIMARY KEY (`id`),
     KEY                          `idx_ordering_unit` (`ordering_unit`),
     KEY                          `idx_order_no` (`order_no`),
@@ -1001,7 +1002,7 @@ CREATE TABLE `fund_coordination` (
      `dept_and_role` varchar(100) DEFAULT NULL COMMENT '资金清收责任人部门和角色',
      `application_date` date DEFAULT NULL COMMENT '申请日期',
      `ordering_unit_name` text DEFAULT NULL COMMENT '订货单位',
-     `customer_short_id` varchar(32) DEFAULT NULL COMMENT '客户简称ID',
+     `customer_short_name` varchar(100) DEFAULT NULL COMMENT '客户简称',
      `customer_type` varchar(50) DEFAULT NULL COMMENT '客户类型',
      `unlimited_guarantee_letter` varchar(500) DEFAULT NULL COMMENT '无限担保书',
      `settlement_period` varchar(100) DEFAULT NULL COMMENT '结算期限',
@@ -1012,6 +1013,8 @@ CREATE TABLE `fund_coordination` (
      `overdue_receivables` varchar(100) DEFAULT NULL COMMENT '超期应收款',
      `agreed_internal_receivables` varchar(100) DEFAULT NULL COMMENT '约定内应收款',
      `requirement_specification` text DEFAULT NULL COMMENT '协调事由需求说明',
+     `requested_shipment_quantity` varchar(100) DEFAULT NULL COMMENT '申请发货量(吨)',
+     `type` varchar(20) DEFAULT NULL COMMENT '贸易类型：外贸: OUTSIDE  内贸：INSIDE',
      `office_clerk` varchar(32) DEFAULT NULL COMMENT '办事处内勤ID',
      `office_clerk_opinion` text DEFAULT NULL COMMENT '办事处内勤审核意见',
      `office_supervisor` varchar(32) DEFAULT NULL COMMENT '办事处主管ID',
@@ -1073,3 +1076,19 @@ CREATE TABLE `fund_ordering_unit_detail`(
     `update_time`            datetime    DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='资金协调手续订货单位应收款明细'
+
+CREATE TABLE `pending_delivery_order` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `fund_id` varchar(32) DEFAULT NULL COMMENT '资金协调手续主键',
+  `purchase_order_id` varchar(32) DEFAULT NULL COMMENT '订货单ID',
+  `total_quantity` varchar(50) DEFAULT NULL COMMENT '总数量(吨)',
+  `dispatched_quantity` varchar(50) DEFAULT NULL COMMENT '已发货数量(吨)',
+  `requested_shipment_quantity` varchar(50) DEFAULT NULL COMMENT '申请发货数量(吨)',
+  `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID',
+  `create_by` varchar(20) NOT NULL COMMENT '创建人',
+  `update_by_id` varchar(32) NOT NULL COMMENT '更新人ID',
+  `update_by` varchar(20) NOT NULL COMMENT '更新人',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='待交付订单'

+package com.lframework.xingyun.sc.bo.ledger.pending;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.PendingDeliveryOrder;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 待交付订单 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetPendingDeliveryOrderBo extends BaseBo<PendingDeliveryOrder> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 资金协调手续主键
+     */
+    @ApiModelProperty("资金协调手续主键")
+    private String fundId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 生产厂名称
+     */
+    @ApiModelProperty("生产厂名称")
+    private String workshopName;
+
+    /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
+     * 总数量(吨)
+     */
+    @ApiModelProperty("总数量(吨)")
+    private String totalQuantity;
+
+    /**
+     * 已发货数量(吨)
+     */
+    @ApiModelProperty("已发货数量(吨)")
+    private String dispatchedQuantity;
+
+    /**
+     * 申请发货数量(吨)
+     */
+    @ApiModelProperty("申请发货数量(吨)")
+    private String requestedShipmentQuantity;
+
+    public GetPendingDeliveryOrderBo() {
+
+    }
+
+    public GetPendingDeliveryOrderBo(PendingDeliveryOrder dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<PendingDeliveryOrder> convert(PendingDeliveryOrder dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(PendingDeliveryOrder dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.ledger.pending;
+
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.PendingDeliveryOrder;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 待交付订单 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QueryPendingDeliveryOrderBo extends BaseBo<PendingDeliveryOrder> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 资金协调手续主键
+     */
+    @ApiModelProperty("资金协调手续主键")
+    private String fundId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 生产厂名称
+     */
+    @ApiModelProperty("生产厂名称")
+    private String workshopName;
+
+    /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
+     * 总数量(吨)
+     */
+    @ApiModelProperty("总数量(吨)")
+    private String totalQuantity;
+
+    /**
+     * 已发货数量(吨)
+     */
+    @ApiModelProperty("已发货数量(吨)")
+    private String dispatchedQuantity;
+
+    /**
+     * 申请发货数量(吨)
+     */
+    @ApiModelProperty("申请发货数量(吨)")
+    private String requestedShipmentQuantity;
+
+    public QueryPendingDeliveryOrderBo() {
+
+    }
+
+    public QueryPendingDeliveryOrderBo(PendingDeliveryOrder dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<PendingDeliveryOrder> convert(PendingDeliveryOrder dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(PendingDeliveryOrder dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.ledger;
+
+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.ledger.pending.GetPendingDeliveryOrderBo;
+import com.lframework.xingyun.sc.bo.ledger.pending.QueryPendingDeliveryOrderBo;
+import com.lframework.xingyun.sc.entity.PendingDeliveryOrder;
+import com.lframework.xingyun.sc.service.ledger.PendingDeliveryOrderService;
+import com.lframework.xingyun.sc.vo.ledger.pending.CreatePendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.QueryPendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.UpdatePendingDeliveryOrderVo;
+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("/pendingDeliveryOrder")
+public class PendingDeliveryOrderController extends DefaultBaseController {
+
+    @Autowired
+    private PendingDeliveryOrderService pendingDeliveryOrderService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryPendingDeliveryOrderBo>> query(@Valid QueryPendingDeliveryOrderVo vo) {
+
+        PageResult<PendingDeliveryOrder> pageResult = pendingDeliveryOrderService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<PendingDeliveryOrder> datas = pageResult.getDatas();
+        List<QueryPendingDeliveryOrderBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(QueryPendingDeliveryOrderBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @GetMapping
+    public InvokeResult<GetPendingDeliveryOrderBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        PendingDeliveryOrder data = pendingDeliveryOrderService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("待交付订单不存在！");
+        }
+
+        GetPendingDeliveryOrderBo result = new GetPendingDeliveryOrderBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreatePendingDeliveryOrderVo vo) {
+
+        pendingDeliveryOrderService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdatePendingDeliveryOrderVo vo) {
+
+        pendingDeliveryOrderService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        pendingDeliveryOrderService.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.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 待交付订单
+ * </p>
+ *
+ */
+@Data
+@TableName("pending_delivery_order")
+public class PendingDeliveryOrder extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "PendingDeliveryOrder";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 资金协调手续主键
+     */
+    private String fundId;
+
+    /**
+     * 订货单ID
+     */
+    private String purchaseOrderId;
+
+    /**
+     * 订单编号
+     */
+    @TableField(exist = false)
+    private String orderNo;
+
+    /**
+     * 订货单位名称
+     */
+    @TableField(exist = false)
+    private String orderingUnitName;
+
+    /**
+     * 生产厂名称
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
+     * 办事处名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 总数量(吨)
+     */
+    private String totalQuantity;
+
+    /**
+     * 已发货数量(吨)
+     */
+    private String dispatchedQuantity;
+
+    /**
+     * 申请发货数量(吨)
+     */
+    private String requestedShipmentQuantity;
+
+    /**
+     * 创建人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.ledger;
+
+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.components.security.SecurityUtil;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+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.entity.PendingDeliveryOrder;
+import com.lframework.xingyun.sc.mappers.PendingDeliveryOrderMapper;
+import com.lframework.xingyun.sc.service.ledger.PendingDeliveryOrderService;
+import com.lframework.xingyun.sc.vo.ledger.pending.CreatePendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.QueryPendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.UpdatePendingDeliveryOrderVo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PendingDeliveryOrderServiceImpl extends BaseMpServiceImpl<PendingDeliveryOrderMapper, PendingDeliveryOrder> implements PendingDeliveryOrderService {
+
+    @Override
+    public PageResult<PendingDeliveryOrder> query(Integer pageIndex, Integer pageSize, QueryPendingDeliveryOrderVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<PendingDeliveryOrder> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<PendingDeliveryOrder> query(QueryPendingDeliveryOrderVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public PendingDeliveryOrder findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增待交付订单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreatePendingDeliveryOrderVo vo) {
+
+        PendingDeliveryOrder data = new PendingDeliveryOrder();
+        data.setId(IdUtil.getId());
+        data.setPurchaseOrderId(vo.getPurchaseOrderId());
+        if (!StringUtil.isBlank(vo.getTotalQuantity())) {
+            data.setTotalQuantity(vo.getTotalQuantity());
+        }
+        if (!StringUtil.isBlank(vo.getDispatchedQuantity())) {
+            data.setDispatchedQuantity(vo.getDispatchedQuantity());
+        }
+        if (!StringUtil.isBlank(vo.getRequestedShipmentQuantity())) {
+            data.setRequestedShipmentQuantity(vo.getRequestedShipmentQuantity());
+        }
+
+        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(UpdatePendingDeliveryOrderVo vo) {
+
+        PendingDeliveryOrder data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("待交付订单不存在！");
+        }
+
+        LambdaUpdateWrapper<PendingDeliveryOrder> updateWrapper = Wrappers.lambdaUpdate(PendingDeliveryOrder.class)
+                .set(PendingDeliveryOrder::getPurchaseOrderId, vo.getPurchaseOrderId())
+                .set(PendingDeliveryOrder::getTotalQuantity, StringUtil.isBlank(vo.getTotalQuantity()) ? null : vo.getTotalQuantity())
+                .set(PendingDeliveryOrder::getDispatchedQuantity, StringUtil.isBlank(vo.getDispatchedQuantity()) ? null : vo.getDispatchedQuantity())
+                .set(PendingDeliveryOrder::getRequestedShipmentQuantity, StringUtil.isBlank(vo.getRequestedShipmentQuantity()) ? null : vo.getRequestedShipmentQuantity())
+                .eq(PendingDeliveryOrder::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 batchAdd(List<CreatePendingDeliveryOrderVo> createPendingDeliveryOrderVoList) {
+        if (CollectionUtils.isEmpty(createPendingDeliveryOrderVoList)) {
+            return;
+        }
+        String userId = SecurityUtil.getCurrentUser().getId();
+        List<PendingDeliveryOrder> pendingDeliveryOrderList = new ArrayList<>();
+        for (CreatePendingDeliveryOrderVo vo : createPendingDeliveryOrderVoList) {
+            PendingDeliveryOrder pendingDeliveryOrder = new PendingDeliveryOrder();
+            pendingDeliveryOrder.setId(IdUtil.getId());
+            pendingDeliveryOrder.setPurchaseOrderId(vo.getPurchaseOrderId());
+            pendingDeliveryOrder.setTotalQuantity(vo.getTotalQuantity());
+            pendingDeliveryOrder.setDispatchedQuantity(vo.getDispatchedQuantity());
+            pendingDeliveryOrder.setRequestedShipmentQuantity(vo.getRequestedShipmentQuantity());
+            pendingDeliveryOrder.setCreateById(userId);
+            pendingDeliveryOrder.setUpdateById(userId);
+            pendingDeliveryOrder.setCreateTime(LocalDateTime.now());
+            pendingDeliveryOrder.setUpdateTime(LocalDateTime.now());
+            pendingDeliveryOrderList.add(pendingDeliveryOrder);
+        }
+        getBaseMapper().batchAdd(pendingDeliveryOrderList);
+    }
+
+    @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.FundOrderingUnitDetail;
+import com.lframework.xingyun.sc.entity.PendingDeliveryOrder;
+import com.lframework.xingyun.sc.vo.ledger.pending.QueryPendingDeliveryOrderVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 待交付订单 Mapper 接口
+ * </p>
+ *
+ */
+public interface PendingDeliveryOrderMapper extends BaseMapper<PendingDeliveryOrder> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PendingDeliveryOrder> query(@Param("vo") QueryPendingDeliveryOrderVo vo);
+
+    void batchAdd(@Param("list") List<PendingDeliveryOrder> list);
+}

+package com.lframework.xingyun.sc.service.ledger;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.PendingDeliveryOrder;
+import com.lframework.xingyun.sc.vo.ledger.pending.CreatePendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.QueryPendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.UpdatePendingDeliveryOrderVo;
+import java.util.List;
+
+/**
+ * 待交付订单 Service
+ */
+public interface PendingDeliveryOrderService extends BaseMpService<PendingDeliveryOrder> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<PendingDeliveryOrder> query(Integer pageIndex, Integer pageSize, QueryPendingDeliveryOrderVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PendingDeliveryOrder> query(QueryPendingDeliveryOrderVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    PendingDeliveryOrder findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreatePendingDeliveryOrderVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdatePendingDeliveryOrderVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+
+    /**
+     * 批量新增
+     */
+    void batchAdd(List<CreatePendingDeliveryOrderVo> createPendingDeliveryOrderVoList);
+}

+package com.lframework.xingyun.sc.vo.ledger.pending;
+
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreatePendingDeliveryOrderVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 资金协调手续主键
+     */
+    @ApiModelProperty("资金协调手续主键")
+    @Length(message = "资金协调手续主键最多允许32个字符！")
+    private String fundId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty(value = "订货单ID", required = true)
+    @NotBlank(message = "请输入订货单ID！")
+    @Length(message = "订货单ID最多允许32个字符！")
+    private String purchaseOrderId;
+
+    /**
+     * 总数量(吨)
+     */
+    @ApiModelProperty("总数量(吨)")
+    @Length(message = "总数量(吨)最多允许50个字符！")
+    private String totalQuantity;
+
+    /**
+     * 已发货数量(吨)
+     */
+    @ApiModelProperty("已发货数量(吨)")
+    @Length(message = "已发货数量(吨)最多允许50个字符！")
+    private String dispatchedQuantity;
+
+    /**
+     * 申请发货数量(吨)
+     */
+    @ApiModelProperty("申请发货数量(吨)")
+    @Length(message = "申请发货数量(吨)最多允许50个字符！")
+    private String requestedShipmentQuantity;
+
+}

+package com.lframework.xingyun.sc.vo.ledger.pending;
+
+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 QueryPendingDeliveryOrderVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 资金协调手续主键
+     */
+    @ApiModelProperty("资金协调手续主键")
+    private String fundId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+}

+package com.lframework.xingyun.sc.vo.ledger.pending;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdatePendingDeliveryOrderVo 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)
+    @NotBlank(message = "资金协调手续主键！")
+    @Length(message = "资金协调手续主键最多允许32个字符！")
+    private String fundId;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty(value = "订货单ID", required = true)
+    @NotBlank(message = "请输入订货单ID！")
+    @Length(message = "订货单ID最多允许32个字符！")
+    private String purchaseOrderId;
+
+    /**
+     * 总数量(吨)
+     */
+    @ApiModelProperty("总数量(吨)")
+    @Length(message = "总数量(吨)最多允许50个字符！")
+    private String totalQuantity;
+
+    /**
+     * 已发货数量(吨)
+     */
+    @ApiModelProperty("已发货数量(吨)")
+    @Length(message = "已发货数量(吨)最多允许50个字符！")
+    private String dispatchedQuantity;
+
+    /**
+     * 申请发货数量(吨)
+     */
+    @ApiModelProperty("申请发货数量(吨)")
+    @Length(message = "申请发货数量(吨)最多允许50个字符！")
+    private String requestedShipmentQuantity;
+
+}

+<?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.PendingDeliveryOrderMapper">
+
+    <resultMap id="PendingDeliveryOrder" type="com.lframework.xingyun.sc.entity.PendingDeliveryOrder">
+        <id column="id" property="id"/>
+        <result column="fund_id" property="fundId"/>
+        <result column="purchase_order_id" property="purchaseOrderId"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="ordering_unit_name" property="orderingUnitName"/>
+        <result column="workshop_name" property="workshopName"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="total_quantity" property="totalQuantity"/>
+        <result column="dispatched_quantity" property="dispatchedQuantity"/>
+        <result column="requested_shipment_quantity" property="requestedShipmentQuantity"/>
+        <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="PendingDeliveryOrder_sql">
+        SELECT
+            tb.id,
+            tb.fund_id,
+            tb.purchase_order_id,
+            poi.order_no,
+            cu.name AS ordering_unit_name,
+            ws.name AS workshop_name,
+            sd.name AS dept_name,
+            tb.total_quantity,
+            tb.dispatched_quantity,
+            tb.requested_shipment_quantity,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM pending_delivery_order AS tb
+        left join purchase_order_info as poi on poi.id = tb.purchase_order_id
+        left join base_data_customer as cu on cu.id = poi.ordering_unit
+        left join sys_dept as sd on sd.id = poi.dept_id
+        left join base_data_workshop as ws on ws.id = poi.workshop_id
+    </sql>
+
+    <select id="query" resultMap="PendingDeliveryOrder">
+        <include refid="PendingDeliveryOrder_sql"/>
+        <where>
+            <if test="vo.purchaseOrderId != null and vo.purchaseOrderId != ''">
+                AND tb.purchase_order_id = #{vo.purchaseOrderId}
+            </if>
+            <if test="vo.fundId != null and vo.fundId != ''">
+                AND tb.fund_id = #{vo.fundId}
+            </if>
+        </where>
+    </select>
+
+    <insert id="batchAdd">
+        INSERT INTO pending_delivery_order (
+        id,
+        fund_id,
+        purchase_order_id,
+        total_quantity,
+        dispatched_quantity,
+        requested_shipment_quantity,
+        create_by_id,
+        create_by,
+        update_by_id,
+        update_by,
+        create_time,
+        update_time
+        ) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id},
+            #{item.fundId},
+            #{item.purchaseOrderId},
+            #{item.totalQuantity},
+            #{item.dispatchedQuantity},
+            #{item.requestedShipmentQuantity},
+            #{item.createById},
+            #{item.createBy},
+            #{item.updateById},
+            #{item.updateBy},
+            #{item.createTime},
+            #{item.updateTime}
+            )
+        </foreach>
+    </insert>
+</mapper>