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

+package com.lframework.xingyun.sc.bo.order;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 订货单表 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 供货单位：安徽楚江高精铜带有限公司（GJ）、安徽楚江科技新材料股份有限公司（XC）
+     */
+    @ApiModelProperty("供货单位")
+    private String supplyUnit;
+
+    /**
+     * 订货单位ID
+     */
+    @ApiModelProperty("订货单位ID")
+    private String orderingUnit;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate orderDate;
+
+    /**
+     * 结算方式或期限
+     */
+    @ApiModelProperty("结算方式或期限")
+    private String settlementTerms;
+
+    /**
+     * 交货方式
+     */
+    @ApiModelProperty("交货方式")
+    private String deliveryMethod;
+
+    /**
+     * 价格表编号
+     */
+    @ApiModelProperty("价格表编号")
+    private String priceListNo;
+
+    /**
+     * 执行标准
+     */
+    @ApiModelProperty("执行标准")
+    private String executionStandard;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty("开票情况")
+    private String invoicingStatus;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    private String shippingCost;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty("件重条头")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty("表面")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty("公差")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty("性能")
+    private String performance;
+
+    /**
+     * 元素
+     */
+    @ApiModelProperty("元素")
+    private String element;
+
+    /**
+     * 包装
+     */
+    @ApiModelProperty("包装")
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String examineStatus;
+
+    /**
+     * 生产工艺
+     */
+    @ApiModelProperty("生产工艺")
+    private String productionProcess;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 办事处名称(非持久化字段)
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopId;
+
+    /**
+     * 生产厂名称(非持久化字段)
+     */
+    @ApiModelProperty("生产厂名称")
+    private String workshopName;
+
+    /**
+     * 客户资信Id
+     */
+    @ApiModelProperty("客户资信Id")
+    private String customerCreditId;
+
+    /**
+     * 客户资信等级(非持久化字段)
+     */
+    @ApiModelProperty("客户资信等级")
+    private String customerTier;
+
+    /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private String sumNumber;
+
+    /**
+     * 撤销数量
+     */
+    @ApiModelProperty("撤销数量")
+    private String revocationNumber;
+
+    /**
+     * 实际订货数量=总数量-撤销数量
+     */
+    @ApiModelProperty("实际订货数量")
+    private String actualOrderNumber;
+
+
+
+    public GetPurchaseOrderInfoBo() {
+
+    }
+
+    public GetPurchaseOrderInfoBo(PurchaseOrderInfo dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<PurchaseOrderInfo> convert(PurchaseOrderInfo dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(PurchaseOrderInfo dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.order;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import com.lframework.starter.common.constants.StringPool;
+import java.time.LocalDate;
+
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 订货单表物料行 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetPurchaseOrderLineBo extends BaseBo<PurchaseOrderLine> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 订货单主表ID
+     */
+    @ApiModelProperty("订货单主表ID")
+    private String purchaseOrderId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty("数量")
+    private BigDecimal quantity;
+
+    /**
+     * 销售价格
+     */
+    @ApiModelProperty("销售价格")
+    private BigDecimal salesPrice;
+
+    /**
+     * 交货日期
+     */
+    @ApiModelProperty("交货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer showOrder;
+
+    /**
+     * 考核超协
+     */
+    @ApiModelProperty("考核超协")
+    private String assessmentExceedsAgreement;
+
+    public GetPurchaseOrderLineBo() {
+
+    }
+
+    public GetPurchaseOrderLineBo(PurchaseOrderLine dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<PurchaseOrderLine> convert(PurchaseOrderLine dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(PurchaseOrderLine dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.order;
+
+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.order.GetPurchaseOrderInfoBo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+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("/purchaseOrderInfo")
+public class PurchaseOrderInfoController extends DefaultBaseController {
+
+    @Autowired
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<GetPurchaseOrderInfoBo>> query(@Valid QueryPurchaseOrderInfoVo vo) {
+
+        PageResult<PurchaseOrderInfo> pageResult = purchaseOrderInfoService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<PurchaseOrderInfo> datas = pageResult.getDatas();
+        List<GetPurchaseOrderInfoBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetPurchaseOrderInfoBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:query"})
+    @GetMapping
+    public InvokeResult<GetPurchaseOrderInfoBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        PurchaseOrderInfo data = purchaseOrderInfoService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("订货单表不存在！");
+        }
+
+        GetPurchaseOrderInfoBo result = new GetPurchaseOrderInfoBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreatePurchaseOrderInfoVo vo) {
+
+        purchaseOrderInfoService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdatePurchaseOrderInfoVo vo) {
+
+        purchaseOrderInfoService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        purchaseOrderInfoService.deleteById(id);
+
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.controller.order;
+
+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.order.GetPurchaseOrderLineBo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
+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("/purchaseOrderLine")
+public class PurchaseOrderLineController extends DefaultBaseController {
+
+    @Autowired
+    private PurchaseOrderLineService purchaseOrderLineService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"purchaseOrderLine:purchaseorderline:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<GetPurchaseOrderLineBo>> query(@Valid QueryPurchaseOrderLineVo vo) {
+
+        PageResult<PurchaseOrderLine> pageResult = purchaseOrderLineService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<PurchaseOrderLine> datas = pageResult.getDatas();
+        List<GetPurchaseOrderLineBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetPurchaseOrderLineBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"purchaseOrderLine:purchaseorderline:query"})
+    @GetMapping
+    public InvokeResult<GetPurchaseOrderLineBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        PurchaseOrderLine data = purchaseOrderLineService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("订货单表物料行不存在！");
+        }
+
+        GetPurchaseOrderLineBo result = new GetPurchaseOrderLineBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"purchaseOrderLine:purchaseorderline:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreatePurchaseOrderLineVo vo) {
+
+        purchaseOrderLineService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"purchaseOrderLine:purchaseorderline:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdatePurchaseOrderLineVo vo) {
+
+        purchaseOrderLineService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"purchaseOrderLine:purchaseorderline:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        purchaseOrderLineService.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 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("purchase_order_info")
+public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "PurchaseOrderInfo";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 供货单位：安徽楚江高精铜带有限公司（GJ）、安徽楚江科技新材料股份有限公司（XC）
+     */
+    private String supplyUnit;
+
+    /**
+     * 订货单位ID
+     */
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称（非持久化字段）
+     */
+    @TableField(exist = false)
+    private String orderingUnitName;
+
+    /**
+     * 订货日期
+     */
+    private LocalDate orderDate;
+
+    /**
+     * 结算方式或期限
+     */
+    private String settlementTerms;
+
+    /**
+     * 交货方式
+     */
+    private String deliveryMethod;
+
+    /**
+     * 价格表编号
+     */
+    private String priceListNo;
+
+    /**
+     * 执行标准
+     */
+    private String executionStandard;
+
+    /**
+     * 开票情况
+     */
+    private String invoicingStatus;
+
+    /**
+     * 运费
+     */
+    private String shippingCost;
+
+    /**
+     * 件重条头
+     */
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    private String surface;
+
+    /**
+     * 公差
+     */
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    private String performance;
+
+    /**
+     * 元素
+     */
+    private String element;
+
+    /**
+     * 包装
+     */
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 审核状态
+     */
+    private String examineStatus;
+
+    /**
+     * 生产工艺
+     */
+    private String productionProcess;
+
+    /**
+     * 办事处
+     */
+    private String deptId;
+
+    /**
+     * 办事处名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 生产厂
+     */
+    private String workshopId;
+
+    /**
+     * 生产厂名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+
+    /**
+     * 客户资信Id
+     */
+    private String customerCreditId;
+
+    /**
+     * 客户资信等级(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String customerTier;
+
+    /**
+     * 创建人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("tbl_purchase_order_line")
+public class PurchaseOrderLine extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "PurchaseOrderLine";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 订货单主表ID
+     */
+    private String purchaseOrderId;
+
+    /**
+     * 行业
+     */
+    private String industry;
+
+    /**
+     * 品质
+     */
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 销售价格
+     */
+    private BigDecimal salesPrice;
+
+    /**
+     * 交货日期
+     */
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    private Integer showOrder;
+
+    /**
+     * 考核超协
+     */
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 创建人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.order;
+
+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.utils.StringUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import java.io.Serializable;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+
+@Service
+public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrderInfoMapper, PurchaseOrderInfo> implements PurchaseOrderInfoService {
+
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
+
+    @Override
+    public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<PurchaseOrderInfo> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<PurchaseOrderInfo> query(QueryPurchaseOrderInfoVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public PurchaseOrderInfo findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增订货单表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreatePurchaseOrderInfoVo vo) {
+
+        PurchaseOrderInfo data = new PurchaseOrderInfo();
+        data.setId(IdUtil.getId());
+        if (!StringUtil.isBlank(vo.getOrderNo())) {
+            data.setOrderNo(vo.getOrderNo());
+        }
+        if (!StringUtil.isBlank(vo.getSupplyUnit())) {
+            data.setSupplyUnit(vo.getSupplyUnit());
+        }
+        if (!StringUtil.isBlank(vo.getOrderingUnit())) {
+            data.setOrderingUnit(vo.getOrderingUnit());
+        }
+        if (vo.getOrderDate() != null) {
+            data.setOrderDate(vo.getOrderDate());
+        }
+        if (!StringUtil.isBlank(vo.getSettlementTerms())) {
+            data.setSettlementTerms(vo.getSettlementTerms());
+        }
+        if (!StringUtil.isBlank(vo.getDeliveryMethod())) {
+            data.setDeliveryMethod(vo.getDeliveryMethod());
+        }
+        if (!StringUtil.isBlank(vo.getPriceListNo())) {
+            data.setPriceListNo(vo.getPriceListNo());
+        }
+        if (!StringUtil.isBlank(vo.getExecutionStandard())) {
+            data.setExecutionStandard(vo.getExecutionStandard());
+        }
+        if (!StringUtil.isBlank(vo.getInvoicingStatus())) {
+            data.setInvoicingStatus(vo.getInvoicingStatus());
+        }
+        if (!StringUtil.isBlank(vo.getShippingCost())) {
+            data.setShippingCost(vo.getShippingCost());
+        }
+        if (!StringUtil.isBlank(vo.getPieceWeightHeader())) {
+            data.setPieceWeightHeader(vo.getPieceWeightHeader());
+        }
+        if (!StringUtil.isBlank(vo.getSurface())) {
+            data.setSurface(vo.getSurface());
+        }
+        if (!StringUtil.isBlank(vo.getTolerance())) {
+            data.setTolerance(vo.getTolerance());
+        }
+        if (!StringUtil.isBlank(vo.getPerformance())) {
+            data.setPerformance(vo.getPerformance());
+        }
+        if (!StringUtil.isBlank(vo.getElement())) {
+            data.setElement(vo.getElement());
+        }
+        if (!StringUtil.isBlank(vo.getPackaging())) {
+            data.setPackaging(vo.getPackaging());
+        }
+        if (!StringUtil.isBlank(vo.getRemarks())) {
+            data.setRemarks(vo.getRemarks());
+        }
+        if (!StringUtil.isBlank(vo.getStatus())) {
+            data.setStatus(vo.getStatus());
+        }
+        if (!StringUtil.isBlank(vo.getExamineStatus())) {
+            data.setExamineStatus(vo.getExamineStatus());
+        }
+        if (!StringUtil.isBlank(vo.getProductionProcess())) {
+            data.setProductionProcess(vo.getProductionProcess());
+        }
+        if (!StringUtil.isBlank(vo.getDeptId())) {
+            data.setDeptId(vo.getDeptId());
+        }
+        if (!StringUtil.isBlank(vo.getWorkshopId())) {
+            data.setWorkshopId(vo.getWorkshopId());
+        }
+        if (!StringUtil.isBlank(vo.getCustomerCreditId())) {
+            data.setCustomerCreditId(vo.getCustomerCreditId());
+        }
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        //新增订货单物料行
+        List<CreatePurchaseOrderLineVo> createPurchaseOrderLineVoList = vo.getCreatePurchaseOrderLineVoList();
+        if (CollectionUtils.isNotEmpty(createPurchaseOrderLineVoList)) {
+            for (CreatePurchaseOrderLineVo createPurchaseOrderLineVo : createPurchaseOrderLineVoList) {
+                createPurchaseOrderLineVo.setPurchaseOrderId(data.getId());
+                purchaseOrderLineService.create(createPurchaseOrderLineVo);
+            }
+        }
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改订货单表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdatePurchaseOrderInfoVo vo) {
+
+        PurchaseOrderInfo data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("订货单表不存在！");
+        }
+
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                .set(PurchaseOrderInfo::getOrderNo, StringUtil.isBlank(vo.getOrderNo()) ? null : vo.getOrderNo())
+                .set(PurchaseOrderInfo::getSupplyUnit, StringUtil.isBlank(vo.getSupplyUnit()) ? null : vo.getSupplyUnit())
+                .set(PurchaseOrderInfo::getOrderingUnit, StringUtil.isBlank(vo.getOrderingUnit()) ? null : vo.getOrderingUnit())
+                .set(PurchaseOrderInfo::getOrderDate, vo.getOrderDate() == null ? null : vo.getOrderDate())
+                .set(PurchaseOrderInfo::getSettlementTerms, StringUtil.isBlank(vo.getSettlementTerms()) ? null : vo.getSettlementTerms())
+                .set(PurchaseOrderInfo::getDeliveryMethod, StringUtil.isBlank(vo.getDeliveryMethod()) ? null : vo.getDeliveryMethod())
+                .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(vo.getPriceListNo()) ? null : vo.getPriceListNo())
+                .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(vo.getExecutionStandard()) ? null : vo.getExecutionStandard())
+                .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(vo.getInvoicingStatus()) ? null : vo.getInvoicingStatus())
+                .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
+                .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(vo.getPieceWeightHeader()) ? null : vo.getPieceWeightHeader())
+                .set(PurchaseOrderInfo::getSurface, StringUtil.isBlank(vo.getSurface()) ? null : vo.getSurface())
+                .set(PurchaseOrderInfo::getTolerance, StringUtil.isBlank(vo.getTolerance()) ? null : vo.getTolerance())
+                .set(PurchaseOrderInfo::getPerformance, StringUtil.isBlank(vo.getPerformance()) ? null : vo.getPerformance())
+                .set(PurchaseOrderInfo::getElement, StringUtil.isBlank(vo.getElement()) ? null : vo.getElement())
+                .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
+                .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
+                .set(PurchaseOrderInfo::getStatus, StringUtil.isBlank(vo.getStatus()) ? null : vo.getStatus())
+                .set(PurchaseOrderInfo::getExamineStatus, StringUtil.isBlank(vo.getExamineStatus()) ? null : vo.getExamineStatus())
+                .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(vo.getProductionProcess()) ? null : vo.getProductionProcess())
+                .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
+                .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
+                .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(vo.getCustomerCreditId()) ? null : vo.getCustomerCreditId())
+                .eq(PurchaseOrderInfo::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.order;
+
+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.utils.StringUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import java.io.Serializable;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
+import com.lframework.xingyun.sc.mappers.PurchaseOrderLineMapper;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrderLineMapper, PurchaseOrderLine> implements PurchaseOrderLineService {
+
+    @Override
+    public PageResult<PurchaseOrderLine> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderLineVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<PurchaseOrderLine> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<PurchaseOrderLine> query(QueryPurchaseOrderLineVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public PurchaseOrderLine findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增订货单表物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreatePurchaseOrderLineVo vo) {
+
+        PurchaseOrderLine data = new PurchaseOrderLine();
+        data.setId(IdUtil.getId());
+        data.setPurchaseOrderId(vo.getPurchaseOrderId());
+        if (!StringUtil.isBlank(vo.getIndustry())) {
+            data.setIndustry(vo.getIndustry());
+        }
+        if (!StringUtil.isBlank(vo.getQuality())) {
+            data.setQuality(vo.getQuality());
+        }
+        if (!StringUtil.isBlank(vo.getBrand())) {
+            data.setBrand(vo.getBrand());
+        }
+        if (vo.getThickness() != null) {
+            data.setThickness(vo.getThickness());
+        }
+        if (vo.getThicknessTolPos() != null) {
+            data.setThicknessTolPos(vo.getThicknessTolPos());
+        }
+        if (vo.getThicknessTolNeg() != null) {
+            data.setThicknessTolNeg(vo.getThicknessTolNeg());
+        }
+        if (vo.getWidth() != null) {
+            data.setWidth(vo.getWidth());
+        }
+        if (vo.getWidthTolPos() != null) {
+            data.setWidthTolPos(vo.getWidthTolPos());
+        }
+        if (vo.getWidthTolNeg() != null) {
+            data.setWidthTolNeg(vo.getWidthTolNeg());
+        }
+        if (vo.getLength() != null) {
+            data.setLength(vo.getLength());
+        }
+        if (vo.getLengthTolPos() != null) {
+            data.setLengthTolPos(vo.getLengthTolPos());
+        }
+        if (vo.getLengthTolNeg() != null) {
+            data.setLengthTolNeg(vo.getLengthTolNeg());
+        }
+        if (!StringUtil.isBlank(vo.getStatus())) {
+            data.setStatus(vo.getStatus());
+        }
+        if (vo.getQuantity() != null) {
+            data.setQuantity(vo.getQuantity());
+        }
+        if (vo.getSalesPrice() != null) {
+            data.setSalesPrice(vo.getSalesPrice());
+        }
+        if (vo.getDeliveryDate() != null) {
+            data.setDeliveryDate(vo.getDeliveryDate());
+        }
+        if (vo.getShowOrder() != null) {
+            data.setShowOrder(vo.getShowOrder());
+        }
+        if (!StringUtil.isBlank(vo.getAssessmentExceedsAgreement())) {
+            data.setAssessmentExceedsAgreement(vo.getAssessmentExceedsAgreement());
+        }
+
+        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(UpdatePurchaseOrderLineVo vo) {
+
+        PurchaseOrderLine data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("订货单表物料行不存在！");
+        }
+
+        LambdaUpdateWrapper<PurchaseOrderLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class)
+                .set(PurchaseOrderLine::getPurchaseOrderId, vo.getPurchaseOrderId())
+                .set(PurchaseOrderLine::getIndustry, StringUtil.isBlank(vo.getIndustry()) ? null : vo.getIndustry())
+                .set(PurchaseOrderLine::getQuality, StringUtil.isBlank(vo.getQuality()) ? null : vo.getQuality())
+                .set(PurchaseOrderLine::getBrand, StringUtil.isBlank(vo.getBrand()) ? null : vo.getBrand())
+                .set(PurchaseOrderLine::getThickness, vo.getThickness() == null ? null : vo.getThickness())
+                .set(PurchaseOrderLine::getThicknessTolPos, vo.getThicknessTolPos() == null ? null : vo.getThicknessTolPos())
+                .set(PurchaseOrderLine::getThicknessTolNeg, vo.getThicknessTolNeg() == null ? null : vo.getThicknessTolNeg())
+                .set(PurchaseOrderLine::getWidth, vo.getWidth() == null ? null : vo.getWidth())
+                .set(PurchaseOrderLine::getWidthTolPos, vo.getWidthTolPos() == null ? null : vo.getWidthTolPos())
+                .set(PurchaseOrderLine::getWidthTolNeg, vo.getWidthTolNeg() == null ? null : vo.getWidthTolNeg())
+                .set(PurchaseOrderLine::getLength, vo.getLength() == null ? null : vo.getLength())
+                .set(PurchaseOrderLine::getLengthTolPos, vo.getLengthTolPos() == null ? null : vo.getLengthTolPos())
+                .set(PurchaseOrderLine::getLengthTolNeg, vo.getLengthTolNeg() == null ? null : vo.getLengthTolNeg())
+                .set(PurchaseOrderLine::getStatus, StringUtil.isBlank(vo.getStatus()) ? null : vo.getStatus())
+                .set(PurchaseOrderLine::getQuantity, vo.getQuantity() == null ? null : vo.getQuantity())
+                .set(PurchaseOrderLine::getSalesPrice, vo.getSalesPrice() == null ? null : vo.getSalesPrice())
+                .set(PurchaseOrderLine::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
+                .set(PurchaseOrderLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
+                .set(PurchaseOrderLine::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
+                .eq(PurchaseOrderLine::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.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订货单表 Mapper 接口
+ * </p>
+ *
+ */
+public interface PurchaseOrderInfoMapper extends BaseMapper<PurchaseOrderInfo> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PurchaseOrderInfo> query(@Param("vo") QueryPurchaseOrderInfoVo vo);
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订货单表物料行 Mapper 接口
+ * </p>
+ *
+ */
+public interface PurchaseOrderLineMapper extends BaseMapper<PurchaseOrderLine> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PurchaseOrderLine> query(@Param("vo") QueryPurchaseOrderLineVo vo);
+}

+package com.lframework.xingyun.sc.service.order;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+import java.util.List;
+
+/**
+ * 订货单表 Service
+ */
+public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInfo> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PurchaseOrderInfo> query(QueryPurchaseOrderInfoVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    PurchaseOrderInfo findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreatePurchaseOrderInfoVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdatePurchaseOrderInfoVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.sc.service.order;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
+import java.util.List;
+
+/**
+ * 订货单表物料行 Service
+ */
+public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLine> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<PurchaseOrderLine> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderLineVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PurchaseOrderLine> query(QueryPurchaseOrderLineVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    PurchaseOrderLine findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreatePurchaseOrderLineVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdatePurchaseOrderLineVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.sc.vo.order;
+
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    @Length(message = "订单编号最多允许50个字符！")
+    private String orderNo;
+
+    /**
+     * 供货单位：安徽楚江高精铜带有限公司（GJ）、安徽楚江科技新材料股份有限公司（XC）
+     */
+    @ApiModelProperty("供货单位")
+    @Length(message = "供货单位最多允许100个字符！")
+    private String supplyUnit;
+
+    /**
+     * 订货单位ID
+     */
+    @ApiModelProperty("订货单位ID")
+    @Length(message = "订货单位ID最多允许100个字符！")
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @TypeMismatch(message = "订货日期格式有误！")
+    private LocalDate orderDate;
+
+    /**
+     * 结算方式或期限
+     */
+    @ApiModelProperty("结算方式或期限")
+    @Length(message = "结算方式或期限最多允许100个字符！")
+    private String settlementTerms;
+
+    /**
+     * 交货方式
+     */
+    @ApiModelProperty("交货方式")
+    @Length(message = "交货方式最多允许50个字符！")
+    private String deliveryMethod;
+
+    /**
+     * 价格表编号
+     */
+    @ApiModelProperty("价格表编号")
+    @Length(message = "价格表编号最多允许50个字符！")
+    private String priceListNo;
+
+    /**
+     * 执行标准
+     */
+    @ApiModelProperty("执行标准")
+    @Length(message = "执行标准最多允许100个字符！")
+    private String executionStandard;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty("开票情况")
+    @Length(message = "开票情况最多允许50个字符！")
+    private String invoicingStatus;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    @Length(message = "运费最多允许20个字符！")
+    private String shippingCost;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty("件重条头")
+    @Length(message = "件重条头最多允许500个字符！")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty("表面")
+    @Length(message = "表面最多允许500个字符！")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty("公差")
+    @Length(message = "公差最多允许500个字符！")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty("性能")
+    @Length(message = "性能最多允许500个字符！")
+    private String performance;
+
+    /**
+     * 元素
+     */
+    @ApiModelProperty("元素")
+    @Length(message = "元素最多允许500个字符！")
+    private String element;
+
+    /**
+     * 包装
+     */
+    @ApiModelProperty("包装")
+    @Length(message = "包装最多允许500个字符！")
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(message = "备注最多允许500个字符！")
+    private String remarks;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    @Length(message = "状态最多允许20个字符！")
+    private String status;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String examineStatus;
+
+    /**
+     * 生产工艺
+     */
+    @ApiModelProperty("生产工艺")
+    private String productionProcess;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopId;
+
+    /**
+     * 客户资信Id
+     */
+    @ApiModelProperty("客户资信Id")
+    private String customerCreditId;
+
+    /**
+     * 订货单物料行
+     */
+    @ApiModelProperty("订货单物料行")
+    private List<CreatePurchaseOrderLineVo> createPurchaseOrderLineVoList;
+
+}

+package com.lframework.xingyun.sc.vo.order;
+
+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 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 CreatePurchaseOrderLineVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订货单主表ID
+     */
+    @ApiModelProperty(value = "订货单主表ID", required = true)
+    @NotBlank(message = "请输入订货单主表ID！")
+    @Length(message = "订货单主表ID最多允许32个字符！")
+    private String purchaseOrderId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    @Length(message = "行业最多允许100个字符！")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    @Length(message = "品质最多允许100个字符！")
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    @Length(message = "牌号最多允许100个字符！")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    @TypeMismatch(message = "厚度格式有误！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    @IsNumberPrecision(message = "厚度公差正最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    @IsNumberPrecision(message = "厚度公差负最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    @TypeMismatch(message = "宽度格式有误！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    @IsNumberPrecision(message = "宽度公差正最多允许4位小数！", value = 4)
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    @IsNumberPrecision(message = "宽度公差负最多允许4位小数！", value = 4)
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    @TypeMismatch(message = "长度格式有误！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    @TypeMismatch(message = "长度公差正格式有误！")
+    @IsNumberPrecision(message = "长度公差正最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    @TypeMismatch(message = "长度公差负格式有误！")
+    @IsNumberPrecision(message = "长度公差负最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    @Length(message = "状态最多允许50个字符！")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty("数量")
+    @TypeMismatch(message = "数量格式有误！")
+    @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 销售价格
+     */
+    @ApiModelProperty("销售价格")
+    @TypeMismatch(message = "销售价格格式有误！")
+    @IsNumberPrecision(message = "销售价格最多允许4位小数！", value = 4)
+    private BigDecimal salesPrice;
+
+    /**
+     * 交货日期
+     */
+    @ApiModelProperty("交货日期")
+    @TypeMismatch(message = "交货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    @TypeMismatch(message = "排序格式有误！")
+    private Integer showOrder;
+
+    /**
+     * 考核超协
+     */
+    @ApiModelProperty("考核超协")
+    @Length(message = "考核超协最多允许20个字符！")
+    private String assessmentExceedsAgreement;
+
+}

+package com.lframework.xingyun.sc.vo.order;
+
+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 QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 订货单位ID
+     */
+    @ApiModelProperty("订货单位ID")
+    private String orderingUnitId;
+
+    /**
+     * 订货开始日期
+     */
+    @ApiModelProperty("登记开始日期")
+    private String orderDateStart;
+
+    /**
+     * 订货结束日期
+     */
+    @ApiModelProperty("登记结束日期")
+    private String orderDateEnd;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String examineStatus;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopId;
+
+}

+package com.lframework.xingyun.sc.vo.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 QueryPurchaseOrderLineVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订货单主表ID
+     */
+    @ApiModelProperty("订货单主表ID")
+    private String purchaseOrderId;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 交货日期
+     */
+    @ApiModelProperty("交货日期")
+    @TypeMismatch(message = "交货日期格式有误！")
+    private LocalDate deliveryDate;
+
+}

+package com.lframework.xingyun.sc.vo.order;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    @Length(message = "订单编号最多允许50个字符！")
+    private String orderNo;
+
+    /**
+     * 供货单位:安徽楚江高精铜带有限公司（GJ）、安徽楚江科技新材料股份有限公司（XC）
+     */
+    @ApiModelProperty("供货单位")
+    @Length(message = "供货单位最多允许100个字符！")
+    private String supplyUnit;
+
+    /**
+     * 订货单位ID
+     */
+    @ApiModelProperty("订货单位ID")
+    @Length(message = "订货单位ID最多允许100个字符！")
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @TypeMismatch(message = "订货日期格式有误！")
+    private LocalDate orderDate;
+
+    /**
+     * 结算方式或期限
+     */
+    @ApiModelProperty("结算方式或期限")
+    @Length(message = "结算方式或期限最多允许100个字符！")
+    private String settlementTerms;
+
+    /**
+     * 交货方式
+     */
+    @ApiModelProperty("交货方式")
+    @Length(message = "交货方式最多允许50个字符！")
+    private String deliveryMethod;
+
+    /**
+     * 价格表编号
+     */
+    @ApiModelProperty("价格表编号")
+    @Length(message = "价格表编号最多允许50个字符！")
+    private String priceListNo;
+
+    /**
+     * 执行标准
+     */
+    @ApiModelProperty("执行标准")
+    @Length(message = "执行标准最多允许100个字符！")
+    private String executionStandard;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty("开票情况")
+    @Length(message = "开票情况最多允许50个字符！")
+    private String invoicingStatus;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    @Length(message = "运费最多允许20个字符！")
+    private String shippingCost;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty("件重条头")
+    @Length(message = "件重条头最多允许500个字符！")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty("表面")
+    @Length(message = "表面最多允许500个字符！")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty("公差")
+    @Length(message = "公差最多允许500个字符！")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty("性能")
+    @Length(message = "性能最多允许500个字符！")
+    private String performance;
+
+    /**
+     * 元素
+     */
+    @ApiModelProperty("元素")
+    @Length(message = "元素最多允许500个字符！")
+    private String element;
+
+    /**
+     * 包装
+     */
+    @ApiModelProperty("包装")
+    @Length(message = "包装最多允许500个字符！")
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(message = "备注最多允许500个字符！")
+    private String remarks;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    @Length(message = "状态最多允许20个字符！")
+    private String status;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String examineStatus;
+
+    /**
+     * 生产工艺
+     */
+    @ApiModelProperty("生产工艺")
+    @Length(message = "生产工艺最多允许500个字符！")
+    private String productionProcess;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopId;
+
+    /**
+     * 客户资信Id
+     */
+    @ApiModelProperty("客户资信Id")
+    private String customerCreditId;
+
+}

+package com.lframework.xingyun.sc.vo.order;
+
+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 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 UpdatePurchaseOrderLineVo 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 purchaseOrderId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    @Length(message = "行业最多允许100个字符！")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    @Length(message = "品质最多允许100个字符！")
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    @Length(message = "牌号最多允许100个字符！")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    @TypeMismatch(message = "厚度格式有误！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    @IsNumberPrecision(message = "厚度公差正最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    @IsNumberPrecision(message = "厚度公差负最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    @TypeMismatch(message = "宽度格式有误！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    @IsNumberPrecision(message = "宽度公差正最多允许4位小数！", value = 4)
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    @IsNumberPrecision(message = "宽度公差负最多允许4位小数！", value = 4)
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    @TypeMismatch(message = "长度格式有误！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    @TypeMismatch(message = "长度公差正格式有误！")
+    @IsNumberPrecision(message = "长度公差正最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    @TypeMismatch(message = "长度公差负格式有误！")
+    @IsNumberPrecision(message = "长度公差负最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    @Length(message = "状态最多允许50个字符！")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty("数量")
+    @TypeMismatch(message = "数量格式有误！")
+    @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 销售价格
+     */
+    @ApiModelProperty("销售价格")
+    @TypeMismatch(message = "销售价格格式有误！")
+    @IsNumberPrecision(message = "销售价格最多允许4位小数！", value = 4)
+    private BigDecimal salesPrice;
+
+    /**
+     * 交货日期
+     */
+    @ApiModelProperty("交货日期")
+    @TypeMismatch(message = "交货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    @TypeMismatch(message = "排序格式有误！")
+    private Integer showOrder;
+
+    /**
+     * 考核超协
+     */
+    @ApiModelProperty("考核超协")
+    @Length(message = "考核超协最多允许20个字符！")
+    private String assessmentExceedsAgreement;
+
+}

+<?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.PurchaseOrderInfoMapper">
+
+    <resultMap id="PurchaseOrderInfo" type="com.lframework.xingyun.sc.entity.PurchaseOrderInfo">
+        <id column="id" property="id"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="supply_unit" property="supplyUnit"/>
+        <result column="ordering_unit" property="orderingUnit"/>
+        <result column="ordering_unit_name" property="orderingUnitName"/>
+        <result column="order_date" property="orderDate"/>
+        <result column="settlement_terms" property="settlementTerms"/>
+        <result column="delivery_method" property="deliveryMethod"/>
+        <result column="price_list_no" property="priceListNo"/>
+        <result column="execution_standard" property="executionStandard"/>
+        <result column="invoicing_status" property="invoicingStatus"/>
+        <result column="shipping_cost" property="shippingCost"/>
+        <result column="piece_weight_header" property="pieceWeightHeader"/>
+        <result column="surface" property="surface"/>
+        <result column="tolerance" property="tolerance"/>
+        <result column="performance" property="performance"/>
+        <result column="element" property="element"/>
+        <result column="packaging" property="packaging"/>
+        <result column="remarks" property="remarks"/>
+        <result column="status" property="status"/>
+        <result column="examine_status" property="examineStatus"/>
+        <result column="production_process" property="productionProcess"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
+        <result column="customer_credit_id" property="customerCreditId"/>
+        <result column="customer_tier" property="customerTier"/>
+        <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="PurchaseOrderInfo_sql">
+        SELECT
+            tb.id,
+            tb.order_no,
+            tb.supply_unit,
+            tb.ordering_unit,
+            cu.name AS ordering_unit_name,
+            tb.order_date,
+            tb.settlement_terms,
+            tb.delivery_method,
+            tb.price_list_no,
+            tb.execution_standard,
+            tb.invoicing_status,
+            tb.shipping_cost,
+            tb.piece_weight_header,
+            tb.surface,
+            tb.tolerance,
+            tb.performance,
+            tb.element,
+            tb.packaging,
+            tb.remarks,
+            tb.status,
+            tb.examine_status,
+            tb.production_process,
+            tb.dept_id,
+            sd.name AS dept_name,
+            tb.workshop_id,
+            ws.name AS workshop_name,
+            tb.customer_credit_id,
+            cc.company_suggested_category AS customer_tier,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM purchase_order_info AS tb
+        left join base_data_customer as cu on cu.id = tb.ordering_unit
+        left join sys_dept as sd on sd.id = tb.dept_id
+        left join base_data_workshop as ws on ws.id = tb.workshop_id
+        left join customer_credit as cc on cc.id = tb.customer_credit_id
+    </sql>
+
+    <select id="query" resultMap="PurchaseOrderInfo">
+        <include refid="PurchaseOrderInfo_sql"/>
+        <where>
+            <if test="vo.orderNo != null and vo.orderNo != ''">
+                AND tb.order_no = #{vo.orderNo}
+            </if>
+            <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
+                AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
+            </if>
+            <if test="vo.orderDateStart != null">
+                AND tb.order_date >= #{vo.orderDate}
+            </if>
+            <if test="vo.orderDateEnd != null">
+                <![CDATA[
+               AND tb.order_date <= #{vo.orderDate}
+                ]]>
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
+            <if test="vo.examineStatus != null and vo.examineStatus != ''">
+                AND tb.examine_status = #{vo.examineStatus}
+            </if>
+            <if test="vo.deptId != null and vo.deptId != ''">
+                AND tb.dept_id = #{vo.deptId}
+            </if>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+                AND tb.workshop_id = #{vo.workshopId}
+            </if>
+        </where>
+        ORDER BY tb.update_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.PurchaseOrderLineMapper">
+
+    <resultMap id="PurchaseOrderLine" type="com.lframework.xingyun.sc.entity.PurchaseOrderLine">
+        <id column="id" property="id"/>
+        <result column="purchase_order_id" property="purchaseOrderId"/>
+        <result column="industry" property="industry"/>
+        <result column="quality" property="quality"/>
+        <result column="brand" property="brand"/>
+        <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="status" property="status"/>
+        <result column="quantity" property="quantity"/>
+        <result column="sales_price" property="salesPrice"/>
+        <result column="delivery_date" property="deliveryDate"/>
+        <result column="show_order" property="showOrder"/>
+        <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
+        <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="PurchaseOrderLine_sql">
+        SELECT
+            tb.id,
+            tb.purchase_order_id,
+            tb.industry,
+            tb.quality,
+            tb.brand,
+            tb.thickness,
+            tb.thickness_tol_pos,
+            tb.thickness_tol_neg,
+            tb.width,
+            tb.width_tol_pos,
+            tb.width_tol_neg,
+            tb.length,
+            tb.length_tol_pos,
+            tb.length_tol_neg,
+            tb.status,
+            tb.quantity,
+            tb.sales_price,
+            tb.delivery_date,
+            tb.show_order,
+            tb.assessment_exceeds_agreement,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM tbl_purchase_order_line AS tb
+    </sql>
+
+    <select id="query" resultMap="PurchaseOrderLine">
+        <include refid="PurchaseOrderLine_sql"/>
+        <where>
+            <if test="vo.purchaseOrderId != null and vo.purchaseOrderId != ''">
+                AND tb.purchase_order_id = #{vo.purchaseOrderId}
+            </if>
+            <if test="vo.brand != null and vo.brand != ''">
+                AND tb.brand = #{vo.brand}
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
+            <if test="vo.deliveryDate != null">
+                AND tb.delivery_date = #{vo.deliveryDate}
+            </if>
+        </where>
+        ORDER BY tb.show_order ASC
+    </select>
+</mapper>