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

@@ -106,8 +106,11 @@ create table if not exists `tbl_contract_distributor_standard`
     `packaging`                  TEXT COMMENT '包装',
     `special_terms`              VARCHAR(50) COMMENT '特别条款要求',
     `designated_consignee`       TEXT COMMENT '需方指定收货人',
+    `special_instructions`       TEXT COMMENT '特别说明',
     `remarks`                    TEXT COMMENT '备注',
     `status`                     varchar(20)  not null DEFAULT 'DRAFT' COMMENT '状态',
+    `type`                       varchar(20)  COMMENT '合同类型',
+    `parent_id`                  varchar(32)  COMMENT '父合同id',
     `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',

+package com.lframework.xingyun.sc.bo.contract;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.ContractDistributorLine;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 经销标准合同物料行 GetBo
+ * </p>
+ */
+@Data
+public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    private String contractId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private BigDecimal width;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty("数量")
+    private BigDecimal quantity;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+    /**
+     * 不含税金额
+     */
+    @ApiModelProperty("不含税金额")
+    private BigDecimal amountExcludingTax;
+
+    /**
+     * 总金额
+     */
+    @ApiModelProperty("总金额")
+    private BigDecimal totalAmount;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer showOrder;
+
+    /**
+     * 产品名称
+     */
+    @ApiModelProperty("产品名称")
+    private String productId;
+
+    /**
+     * 产品名称
+     */
+    @ApiModelProperty("产品名称")
+    private String productName;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    public GetContractDistributorLineBo() {
+
+    }
+
+    public GetContractDistributorLineBo(ContractDistributorLine dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ContractDistributorLine> convert(ContractDistributorLine dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ContractDistributorLine dto) {
+
+    }
+}
+

@@ -6,15 +6,17 @@ import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
  * 经销标准合同 GetBo
  * </p>
- *
  */
 @Data
 public class GetContractDistributorStandardBo extends BaseBo<ContractDistributorStandard> {
@@ -38,18 +40,36 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String supplier;
 
     /**
+     * 供方名称
+     */
+    @ApiModelProperty("供方名称")
+    private String supplierName;
+
+    /**
      * 需方
      */
     @ApiModelProperty("需方")
     private String buyer;
 
     /**
+     * 需方名称
+     */
+    @ApiModelProperty("需方名称")
+    private String buyerName;
+
+    /**
      * 办事处
      */
     @ApiModelProperty("办事处")
     private String deptId;
 
     /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
      * 订货日期
      */
     @ApiModelProperty("订货日期")
@@ -63,6 +83,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String unit;
 
     /**
+     * 单位名称
+     */
+    @ApiModelProperty("单位名称")
+    private String unitName;
+
+    /**
      * 合计人民币金额（大写）
      */
     @ApiModelProperty("合计人民币金额（大写）")
@@ -93,6 +119,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String executionStandard;
 
     /**
+     * 执行标准名称
+     */
+    @ApiModelProperty("执行标准名称")
+    private String executionStandardName;
+
+    /**
      * 执行标准备注
      */
     @ApiModelProperty("执行标准备注")
@@ -159,12 +191,24 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String specialTerms;
 
     /**
+     * 特别条款要求名称
+     */
+    @ApiModelProperty("特别条款要求名称")
+    private String specialTermsName;
+
+    /**
      * 需方指定收货人
      */
     @ApiModelProperty("需方指定收货人")
     private String designatedConsignee;
 
     /**
+     * 特别说明
+     */
+    @ApiModelProperty(value = "特别说明")
+    private String specialInstructions;
+
+    /**
      * 备注
      */
     @ApiModelProperty("备注")
@@ -188,6 +232,30 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty("合计数量")
     private BigDecimal totalQuantity;
 
+    /**
+     * 状态（DRAFT:草稿;FORMAL:正式;DELETED:删除）
+     */
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    /**
+     * 合同类型
+     */
+    @ApiModelProperty(value = "合同类型")
+    private String type;
+
+    /**
+     * 父合同id
+     */
+    @ApiModelProperty(value = "父合同id")
+    private String parentId;
+
+    /**
+     * 经销标准合同物料行
+     */
+    @ApiModelProperty("经销标准合同物料行")
+    private List<GetContractDistributorLineBo> contractDistributorLineList;
+
     public GetContractDistributorStandardBo() {
 
     }

@@ -91,6 +91,18 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     @ApiModelProperty("合计数量")
     private BigDecimal totalQuantity;
 
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty("类型")
+    private String type;
+
     public QueryContractDistributorStandardBo() {
 
     }

@@ -3,7 +3,6 @@ package com.lframework.xingyun.sc.controller.contract;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
@@ -12,17 +11,21 @@ import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.bo.system.user.GetSysUserBo;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
+import com.lframework.xingyun.sc.bo.contract.GetContractDistributorLineBo;
 import com.lframework.xingyun.sc.bo.contract.GetContractDistributorStandardBo;
 import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
+import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
-import com.lframework.xingyun.sc.entity.PurchaseReturnDetail;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
@@ -38,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -55,11 +59,21 @@ public class ContractDistributorStandardController extends DefaultBaseController
     @Autowired
     private ContractDistributorStandardService contractDistributorStandardService;
     @Autowired
+    private ContractDistributorLineService contractDistributorLineService;
+    @Autowired
     private SysDeptService sysDeptService;
     @Autowired
     private CustomerService customerService;
     @Autowired
     private SysUserService sysUserService;
+    @Autowired
+    private SysDataDicItemService sysDataDicItemService;
+
+    public static final String SUPPLIER_DIC_CODE = "SUPPLIER"; // 所属单位/供方
+    public static final String UNIT_DIC_CODE = "UNIT"; // 单位
+    public static final String CONTRACT_PRODUCT_DIC_CODE = "CONTRACT_PRODUCT"; // 合同产品名称
+    public static final String CONDITIONS_REQUIRED_DIC_CODE = "CONDITIONS_REQUIRED"; // 特别条款要求
+    public static final String APPLICABLE_STANDARD_DIC_CODE = "APPLICABLE_STANDARD"; // 执行标准
 
     /**
      * 查询列表
@@ -150,7 +164,37 @@ public class ContractDistributorStandardController extends DefaultBaseController
         }
 
         GetContractDistributorStandardBo result = new GetContractDistributorStandardBo(data);
+        Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
+                .eq(ContractDistributorLine::getContractId, id)
+                .orderByAsc(ContractDistributorLine::getShowOrder);
+        List<ContractDistributorLine> contractDistributorLineList = contractDistributorLineService.list(lineWrapper);
+        if (CollectionUtils.isEmpty(contractDistributorLineList)) {
+            throw new DefaultClientException("经销标准合同物料行为空！");
+        }
 
+        String buyerId = result.getBuyer();
+        Customer customer = customerService.findById(buyerId);
+        result.setBuyerName(customer.getName());
+        SysDataDicItem supplierDicItem = sysDataDicItemService.findByCode(SUPPLIER_DIC_CODE, result.getSupplier());
+        result.setSupplierName(supplierDicItem == null ? "" : supplierDicItem.getName());
+        SysDataDicItem unitDicItem = sysDataDicItemService.findByCode(UNIT_DIC_CODE, result.getUnit());
+        result.setUnitName(unitDicItem == null ? "" : unitDicItem.getName());
+        SysDataDicItem requiredDicItem = sysDataDicItemService.findByCode(CONDITIONS_REQUIRED_DIC_CODE, result.getSpecialTerms());
+        result.setSpecialTermsName(requiredDicItem == null ? "" : requiredDicItem.getName());
+        SysDataDicItem standardDicItem = sysDataDicItemService.findByCode(APPLICABLE_STANDARD_DIC_CODE, result.getExecutionStandard());
+        result.setExecutionStandardName(standardDicItem == null ? "" : standardDicItem.getName());
+
+        List<SysDataDicItem> productDicItemList = sysDataDicItemService.findByDicCode(CONTRACT_PRODUCT_DIC_CODE);
+        Map<String, String> productCodeAndNameMap = productDicItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+        List<GetContractDistributorLineBo> lineBoList = new ArrayList<>(contractDistributorLineList.size());
+        contractDistributorLineList.forEach(contractDistributorLine -> {
+            GetContractDistributorLineBo contractDistributorLineBo = new GetContractDistributorLineBo(contractDistributorLine);
+            String productName = productCodeAndNameMap.get(contractDistributorLineBo.getProductId());
+            contractDistributorLineBo.setProductName(productName);
+            lineBoList.add(contractDistributorLineBo);
+        });
+
+        result.setContractDistributorLineList(lineBoList);
         return InvokeResultBuilder.success(result);
     }
 
@@ -161,6 +205,10 @@ public class ContractDistributorStandardController extends DefaultBaseController
     @HasPermission({"contract:contractDistributorStandard:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateContractDistributorStandardVo vo) {
+        if (CollectionUtils.isEmpty(vo.getContractDistributorLineList())) {
+            throw new DefaultClientException("经销标准合同物料行不可为空");
+        }
+
         //获取当前人员ID
         String currentUserId = SecurityUtil.getCurrentUser().getId();
         SysUser sysUser = sysUserService.findById(currentUserId);

@@ -2,8 +2,10 @@ package com.lframework.xingyun.sc.controller.customer;
 
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.ExcelUtil;
+import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysUserService;
@@ -65,6 +67,8 @@ public class CustomerCreditController extends DefaultBaseController {
     private CorePersonnelService corePersonnelService;
     @Resource
     private SysUserService sysUserService;
+    @Autowired
+    private RedisHandler redisHandler;
 
     /**
      * 查询列表
@@ -106,6 +110,36 @@ public class CustomerCreditController extends DefaultBaseController {
     }
 
     /**
+     * 根据ID查询变更审核的数据
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"customer-credit-manage:customer-credit-plan:examine"})
+    @GetMapping("/getExamineById")
+    public InvokeResult<GetCustomerCreditBo> getExamineById(@NotBlank(message = "id不能为空！") String id) {
+
+        Object o = redisHandler.get(id);
+        CustomerCredit customerCredit = null;
+        if (o != null) {
+            String jsonString = o.toString();
+            // 2. 反序列化为 CustomerCredit 对象
+            customerCredit = JsonUtil.parseObject(jsonString, CustomerCredit.class);
+            GetCustomerCreditBo result = packCustomerCreditData(customerCredit);
+            return InvokeResultBuilder.success(result);
+        } else {
+            CustomerCredit data = customerCreditService.findById(id);
+            if (data == null) {
+                throw new DefaultClientException("客户资信表不存在！");
+            }
+
+            GetCustomerCreditBo result = packCustomerCreditData(data);
+
+            return InvokeResultBuilder.success(result);
+        }
+
+    }
+
+    /**
      * 新增
      */
     @ApiOperation("新增")

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 经销标准合同物料行
+ * </p>
+ */
+@Data
+@TableName("tbl_contract_distributor_line")
+public class ContractDistributorLine extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ContractDistributorLine";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    private String contractId;
+
+    /**
+     * 行业
+     */
+    private String industry;
+
+    /**
+     * 品质
+     */
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    private BigDecimal thickness;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 长度
+     */
+    private BigDecimal length;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 不含税金额
+     */
+    private BigDecimal amountExcludingTax;
+
+    /**
+     * 总金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 发货日期
+     */
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    private Integer showOrder;
+
+    /**
+     * 创建人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;
+
+    /**
+     * 产品名称
+     */
+    private String productId;
+
+    /**
+     * 厚度公差正
+     */
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度公差正
+     */
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度公差正
+     */
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    private BigDecimal lengthTolNeg;
+
+}

@@ -148,6 +148,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String designatedConsignee;
 
     /**
+     * 特别说明
+     */
+    private String specialInstructions;
+
+    /**
      * 备注
      */
     private String remarks;
@@ -158,6 +163,16 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String status;
 
     /**
+     * 合同类型
+     */
+    private String type;
+
+    /**
+     * 父合同id
+     */
+    private String parentId;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

+package com.lframework.xingyun.sc.impl.contract;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.xingyun.sc.entity.ContractDistributorLine;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.xingyun.sc.mappers.ContractDistributorLineMapper;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorLineVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorLineVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorLineVo;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+@Service
+public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<ContractDistributorLineMapper, ContractDistributorLine> implements ContractDistributorLineService {
+
+    @Override
+    public PageResult<ContractDistributorLine> query(Integer pageIndex, Integer pageSize, QueryContractDistributorLineVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ContractDistributorLine> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<ContractDistributorLine> query(QueryContractDistributorLineVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Cacheable(value = ContractDistributorLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
+    @Override
+    public ContractDistributorLine findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增经销标准合同物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateContractDistributorLineVo vo) {
+
+        ContractDistributorLine data = new ContractDistributorLine();
+        data.setId(IdUtil.getUUID());
+        data.setContractId(vo.getContractId());
+        data.setIndustry(vo.getIndustry());
+        data.setQuality(vo.getQuality());
+        data.setBrand(vo.getBrand());
+        data.setThickness(vo.getThickness());
+        data.setWidth(vo.getWidth());
+        data.setLength(vo.getLength());
+        data.setStatus(vo.getStatus());
+        data.setQuantity(vo.getQuantity());
+        data.setUnitPrice(vo.getUnitPrice());
+        data.setAmountExcludingTax(vo.getAmountExcludingTax());
+        data.setTotalAmount(vo.getTotalAmount());
+        data.setDeliveryDate(vo.getDeliveryDate());
+        data.setShowOrder(vo.getShowOrder());
+        data.setProductId(vo.getProductId());
+        data.setThicknessTolPos(vo.getThicknessTolPos());
+        data.setThicknessTolNeg(vo.getThicknessTolNeg());
+        data.setWidthTolPos(vo.getWidthTolPos());
+        data.setWidthTolNeg(vo.getWidthTolNeg());
+        data.setLengthTolPos(vo.getLengthTolPos());
+        data.setLengthTolNeg(vo.getLengthTolNeg());
+
+        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(UpdateContractDistributorLineVo vo) {
+
+        ContractDistributorLine data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("经销标准合同物料行不存在！");
+        }
+
+        LambdaUpdateWrapper<ContractDistributorLine> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorLine.class)
+                .set(ContractDistributorLine::getContractId, vo.getContractId())
+                .set(ContractDistributorLine::getIndustry, vo.getIndustry())
+                .set(ContractDistributorLine::getQuality, vo.getQuality())
+                .set(ContractDistributorLine::getBrand, vo.getBrand())
+                .set(ContractDistributorLine::getThickness, vo.getThickness())
+                .set(ContractDistributorLine::getWidth, vo.getWidth())
+                .set(ContractDistributorLine::getLength, vo.getLength())
+                .set(ContractDistributorLine::getStatus, vo.getStatus())
+                .set(ContractDistributorLine::getQuantity, vo.getQuantity())
+                .set(ContractDistributorLine::getUnitPrice, vo.getUnitPrice())
+                .set(ContractDistributorLine::getAmountExcludingTax, vo.getAmountExcludingTax())
+                .set(ContractDistributorLine::getTotalAmount, vo.getTotalAmount())
+                .set(ContractDistributorLine::getDeliveryDate, vo.getDeliveryDate())
+                .set(ContractDistributorLine::getShowOrder, vo.getShowOrder())
+                .set(ContractDistributorLine::getProductId, vo.getProductId())
+                .set(ContractDistributorLine::getThicknessTolPos, vo.getThicknessTolPos())
+                .set(ContractDistributorLine::getThicknessTolNeg, vo.getThicknessTolNeg())
+                .set(ContractDistributorLine::getWidthTolPos, vo.getWidthTolPos())
+                .set(ContractDistributorLine::getWidthTolNeg, vo.getWidthTolNeg())
+                .set(ContractDistributorLine::getLengthTolPos, vo.getLengthTolPos())
+                .set(ContractDistributorLine::getLengthTolNeg, vo.getLengthTolNeg())
+                .eq(ContractDistributorLine::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @CacheEvict(value = ContractDistributorLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}
+

@@ -16,10 +16,13 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.xingyun.sc.mappers.ContractDistributorStandardMapper;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorLineVo;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -32,6 +35,9 @@ import java.util.List;
 public class ContractDistributorStandardServiceImpl extends
         BaseMpServiceImpl<ContractDistributorStandardMapper, ContractDistributorStandard> implements ContractDistributorStandardService {
 
+    @Autowired
+    private ContractDistributorLineService contractDistributorLineService;
+
     @Override
     public PageResult<ContractDistributorStandard> query(Integer pageIndex, Integer pageSize, QueryContractDistributorStandardVo vo) {
 
@@ -88,15 +94,25 @@ public class ContractDistributorStandardServiceImpl extends
         data.setSpecialTerms(vo.getSpecialTerms());
         data.setDesignatedConsignee(vo.getDesignatedConsignee());
         data.setRemarks(vo.getRemarks());
+        data.setSpecialInstructions(vo.getSpecialInstructions());
         data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
         data.setTotalAmountIncludingTax(vo.getTotalAmountIncludingTax());
         data.setTotalQuantity(vo.getTotalQuantity());
+        data.setParentId(vo.getParentId());
+        data.setType(vo.getType());
 
         getBaseMapper().insert(data);
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
 
+        for (int i = 0; i < vo.getContractDistributorLineList().size(); i++) {
+            CreateContractDistributorLineVo createContractDistributorLineVo = vo.getContractDistributorLineList().get(i);
+            createContractDistributorLineVo.setContractId(data.getId());
+            createContractDistributorLineVo.setShowOrder(i);
+            contractDistributorLineService.create(createContractDistributorLineVo);
+        }
+
         return data.getId();
     }
 
@@ -133,10 +149,13 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getPackaging, vo.getPackaging())
                 .set(ContractDistributorStandard::getSpecialTerms, vo.getSpecialTerms())
                 .set(ContractDistributorStandard::getDesignatedConsignee, vo.getDesignatedConsignee())
+                .set(ContractDistributorStandard::getSpecialInstructions, vo.getSpecialInstructions())
                 .set(ContractDistributorStandard::getRemarks, vo.getRemarks())
                 .set(ContractDistributorStandard::getTotalAmountExcludingTax, vo.getTotalAmountExcludingTax())
                 .set(ContractDistributorStandard::getTotalAmountIncludingTax, vo.getTotalAmountIncludingTax())
                 .set(ContractDistributorStandard::getTotalQuantity, vo.getTotalQuantity())
+                .set(ContractDistributorStandard::getType, vo.getType())
+                .set(ContractDistributorStandard::getParentId, vo.getParentId())
                 .eq(ContractDistributorStandard::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.ContractDistributorLine;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorLineVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 经销标准合同物料行 Mapper 接口
+ * </p>
+ */
+public interface ContractDistributorLineMapper extends BaseMapper<ContractDistributorLine> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ContractDistributorLine> query(@Param("vo") QueryContractDistributorLineVo vo);
+}

+package com.lframework.xingyun.sc.service.contract;
+
+import com.lframework.xingyun.sc.entity.ContractDistributorLine;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorLineVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorLineVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorLineVo;
+
+import java.util.List;
+
+/**
+ * 经销标准合同物料行 Service
+ */
+public interface ContractDistributorLineService extends BaseMpService<ContractDistributorLine> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<ContractDistributorLine> query(Integer pageIndex, Integer pageSize, QueryContractDistributorLineVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<ContractDistributorLine> query(QueryContractDistributorLineVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    ContractDistributorLine findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateContractDistributorLineVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateContractDistributorLineVo vo);
+
+}
+

+package com.lframework.xingyun.sc.vo.contract.createVo;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+@Data
+public class CreateContractDistributorLineVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty(value = "合同主表ID", required = true)
+    @NotBlank(message = "请输入合同主表ID！")
+    @Length(message = "合同主表ID最多允许32个字符！")
+    private String contractId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty(value = "行业", required = true)
+    @NotBlank(message = "请输入行业！")
+    @Length(message = "行业最多允许100个字符！")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty(value = "品质", required = true)
+    @NotBlank(message = "请输入品质！")
+    @Length(message = "品质最多允许100个字符！")
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty(value = "牌号", required = true)
+    @NotBlank(message = "请输入牌号！")
+    @Length(message = "牌号最多允许100个字符！")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty(value = "厚度", required = true)
+    @NotNull(message = "请输入厚度！")
+    @TypeMismatch(message = "厚度格式有误！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty(value = "宽度", required = true)
+    @NotNull(message = "请输入宽度！")
+    @TypeMismatch(message = "宽度格式有误！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty(value = "长度", required = true)
+    @NotNull(message = "请输入长度！")
+    @TypeMismatch(message = "长度格式有误！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态", required = true)
+    @NotBlank(message = "请输入状态！")
+    @Length(message = "状态最多允许50个字符！")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量", required = true)
+    @NotNull(message = "请输入数量！")
+    @TypeMismatch(message = "数量格式有误！")
+    @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty(value = "单价", required = true)
+    @NotNull(message = "请输入单价！")
+    @TypeMismatch(message = "单价格式有误！")
+    @IsNumberPrecision(message = "单价最多允许4位小数！", value = 4)
+    private BigDecimal unitPrice;
+
+    /**
+     * 不含税金额
+     */
+    @ApiModelProperty(value = "不含税金额", required = true)
+    @NotNull(message = "请输入不含税金额！")
+    @TypeMismatch(message = "不含税金额格式有误！")
+    @IsNumberPrecision(message = "不含税金额最多允许2位小数！", value = 2)
+    private BigDecimal amountExcludingTax;
+
+    /**
+     * 总金额
+     */
+    @ApiModelProperty(value = "总金额", required = true)
+    @NotNull(message = "请输入总金额！")
+    @TypeMismatch(message = "总金额格式有误！")
+    @IsNumberPrecision(message = "总金额最多允许2位小数！", value = 2)
+    private BigDecimal totalAmount;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty(value = "发货日期", required = true)
+    @NotNull(message = "请输入发货日期！")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序", required = true)
+    @NotNull(message = "请输入排序！")
+    @TypeMismatch(message = "排序格式有误！")
+    private Integer showOrder;
+
+    /**
+     * 产品名称
+     */
+    @ApiModelProperty(value = "产品名称", required = true)
+    @NotBlank(message = "请输入产品名称！")
+    private String productId;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty(value = "厚度公差正", required = true)
+    @NotNull(message = "请输入厚度公差正！")
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty(value = "厚度公差负", required = true)
+    @NotNull(message = "请输入厚度公差负！")
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty(value = "宽度公差正", required = true)
+    @NotNull(message = "请输入宽度公差正！")
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty(value = "宽度公差负", required = true)
+    @NotNull(message = "请输入宽度公差负！")
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty(value = "长度公差正", required = true)
+    @NotNull(message = "请输入长度公差正！")
+    @TypeMismatch(message = "长度公差正格式有误！")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty(value = "长度公差负", required = true)
+    @NotNull(message = "请输入长度公差负！")
+    @TypeMismatch(message = "长度公差负格式有误！")
+    private BigDecimal lengthTolNeg;
+
+}

@@ -13,6 +13,7 @@ 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;
 
@@ -202,6 +203,14 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     private String designatedConsignee;
 
     /**
+     * 特别说明
+     */
+    @ApiModelProperty(value = "特别说明", required = true)
+    @NotBlank(message = "请输入特别说明！")
+    @Length(message = "特别说明最多允许65,535个字符！")
+    private String specialInstructions;
+
+    /**
      * 备注
      */
     @ApiModelProperty(value = "备注", required = true)
@@ -233,4 +242,23 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     @TypeMismatch(message = "合计总金额格式有误！")
     private BigDecimal totalAmountIncludingTax;
 
+    /**
+     * 合同类型
+     */
+    @ApiModelProperty(value = "合同类型", required = true)
+    @NotBlank(message = "请输入合同类型！")
+    private String type;
+
+    /**
+     * 父合同id
+     */
+    @ApiModelProperty(value = "父合同id")
+    private String parentId;
+
+    /**
+     * 经销标准合同物料行
+     */
+    @ApiModelProperty(value = "经销标准合同物料行", required = true)
+    @NotNull(message = "经销标准合同物料行不可为空！")
+    private List<CreateContractDistributorLineVo> contractDistributorLineList;
 }

+package com.lframework.xingyun.sc.vo.contract.queryVo;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class QueryContractDistributorLineVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    private String contractId;
+
+}

@@ -64,5 +64,8 @@ public class QueryContractDistributorStandardVo extends PageVo implements BaseVo
 
     @ApiModelProperty("状态")
     private String status;
+
+    @ApiModelProperty("类型")
+    private String type;
 }
 

+package com.lframework.xingyun.sc.vo.contract.updateVo;
+
+import lombok.Data;
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+
+import javax.validation.constraints.NotNull;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+
+@Data
+public class UpdateContractDistributorLineVo 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 contractId;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty(value = "行业", required = true)
+    @NotBlank(message = "请输入行业！")
+    @Length(message = "行业最多允许100个字符！")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty(value = "品质", required = true)
+    @NotBlank(message = "请输入品质！")
+    @Length(message = "品质最多允许100个字符！")
+    private String quality;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty(value = "牌号", required = true)
+    @NotBlank(message = "请输入牌号！")
+    @Length(message = "牌号最多允许100个字符！")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty(value = "厚度", required = true)
+    @TypeMismatch(message = "厚度格式有误！")
+    @NotNull(message = "请输入厚度！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty(value = "宽度", required = true)
+    @TypeMismatch(message = "宽度格式有误！")
+    @NotNull(message = "请输入宽度！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty(value = "长度", required = true)
+    @TypeMismatch(message = "长度格式有误！")
+    @NotNull(message = "请输入长度！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态", required = true)
+    @NotBlank(message = "请输入状态！")
+    @Length(message = "状态最多允许50个字符！")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量", required = true)
+    @TypeMismatch(message = "数量格式有误！")
+    @NotNull(message = "请输入数量！")
+    @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty(value = "单价", required = true)
+    @TypeMismatch(message = "单价格式有误！")
+    @NotNull(message = "请输入单价！")
+    @IsNumberPrecision(message = "单价最多允许4位小数！", value = 4)
+    private BigDecimal unitPrice;
+
+    /**
+     * 不含税金额
+     */
+    @ApiModelProperty(value = "不含税金额", required = true)
+    @TypeMismatch(message = "不含税金额格式有误！")
+    @NotNull(message = "请输入不含税金额！")
+    @IsNumberPrecision(message = "不含税金额最多允许2位小数！", value = 2)
+    private BigDecimal amountExcludingTax;
+
+    /**
+     * 总金额
+     */
+    @ApiModelProperty(value = "总金额", required = true)
+    @TypeMismatch(message = "总金额格式有误！")
+    @NotNull(message = "请输入总金额！")
+    @IsNumberPrecision(message = "总金额最多允许2位小数！", value = 2)
+    private BigDecimal totalAmount;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty(value = "发货日期", required = true)
+    @TypeMismatch(message = "发货日期格式有误！")
+    @NotNull(message = "请输入发货日期！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序", required = true)
+    @TypeMismatch(message = "排序格式有误！")
+    @NotNull(message = "请输入排序！")
+    private Integer showOrder;
+
+    /**
+     * 产品名称
+     */
+    @ApiModelProperty(value = "产品名称", required = true)
+    @NotBlank(message = "请输入产品名称！")
+    private String productId;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty(value = "厚度公差正", required = true)
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    @NotNull(message = "请输入厚度公差正！")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty(value = "厚度公差负", required = true)
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    @NotNull(message = "请输入厚度公差负！")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty(value = "宽度公差正", required = true)
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    @NotNull(message = "请输入宽度公差正！")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty(value = "宽度公差负", required = true)
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    @NotNull(message = "请输入宽度公差负！")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty(value = "长度公差正", required = true)
+    @TypeMismatch(message = "长度公差正格式有误！")
+    @NotNull(message = "请输入长度公差正！")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty(value = "长度公差负", required = true)
+    @TypeMismatch(message = "长度公差负格式有误！")
+    @NotNull(message = "请输入长度公差负！")
+    private BigDecimal lengthTolNeg;
+
+}
+

@@ -204,6 +204,14 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     private String designatedConsignee;
 
     /**
+     * 特别说明
+     */
+    @ApiModelProperty(value = "特别说明", required = true)
+    @NotBlank(message = "请输入特别说明！")
+    @Length(message = "特别说明最多允许65,535个字符！")
+    private String specialInstructions;
+
+    /**
      * 备注
      */
     @ApiModelProperty(value = "备注", required = true)
@@ -235,4 +243,22 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     @NotNull(message = "请输入合计总金额！")
     private BigDecimal totalAmountIncludingTax;
 
+    /**
+     * 状态（DRAFT:草稿;FORMAL:正式;DELETED:删除）
+     */
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    /**
+     * 合同类型
+     */
+    @ApiModelProperty(value = "合同类型", required = true)
+    @NotBlank(message = "请输入合同类型！")
+    private String type;
+
+    /**
+     * 父合同id
+     */
+    @ApiModelProperty(value = "父合同id")
+    private String parentId;
 }

+<?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.ContractDistributorLineMapper">
+
+    <resultMap id="ContractDistributorLine" type="com.lframework.xingyun.sc.entity.ContractDistributorLine">
+        <id column="id" property="id"/>
+        <result column="contract_id" property="contractId"/>
+        <result column="industry" property="industry"/>
+        <result column="quality" property="quality"/>
+        <result column="brand" property="brand"/>
+        <result column="thickness" property="thickness"/>
+        <result column="width" property="width"/>
+        <result column="length" property="length"/>
+        <result column="status" property="status"/>
+        <result column="quantity" property="quantity"/>
+        <result column="unit_price" property="unitPrice"/>
+        <result column="amount_excluding_tax" property="amountExcludingTax"/>
+        <result column="total_amount" property="totalAmount"/>
+        <result column="delivery_date" property="deliveryDate"/>
+        <result column="show_order" property="showOrder"/>
+        <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"/>
+        <result column="product_id" property="productId"/>
+        <result column="thickness_tol_pos" property="thicknessTolPos"/>
+        <result column="thickness_tol_neg" property="thicknessTolNeg"/>
+        <result column="width_tol_pos" property="widthTolPos"/>
+        <result column="width_tol_neg" property="widthTolNeg"/>
+        <result column="length_tol_pos" property="lengthTolPos"/>
+        <result column="length_tol_neg" property="lengthTolNeg"/>
+    </resultMap>
+
+    <sql id="ContractDistributorLine_sql">
+        SELECT tb.id,
+               tb.contract_id,
+               tb.industry,
+               tb.quality,
+               tb.brand,
+               tb.thickness,
+               tb.width,
+               tb.length,
+               tb.status,
+               tb.quantity,
+               tb.unit_price,
+               tb.amount_excluding_tax,
+               tb.total_amount,
+               tb.delivery_date,
+               tb.show_order,
+               tb.create_by_id,
+               tb.create_by,
+               tb.update_by_id,
+               tb.update_by,
+               tb.create_time,
+               tb.update_time,
+               tb.product_id,
+               tb.thickness_tol_pos,
+               tb.thickness_tol_neg,
+               tb.width_tol_pos,
+               tb.width_tol_neg,
+               tb.length_tol_pos,
+               tb.length_tol_neg
+        FROM tbl_contract_distributor_line AS tb
+    </sql>
+
+    <select id="query" resultMap="ContractDistributorLine">
+        <include refid="ContractDistributorLine_sql"/>
+        <where>
+            <if test="vo.contractId != null and vo.contractId != ''">
+                AND tb.contract_id = #{vo.contractId}
+            </if>
+        </where>
+    </select>
+</mapper>

@@ -27,6 +27,7 @@
         <result column="packaging" property="packaging"/>
         <result column="special_terms" property="specialTerms"/>
         <result column="designated_consignee" property="designatedConsignee"/>
+        <result column="special_instructions" property="specialInstructions"/>
         <result column="remarks" property="remarks"/>
         <result column="status" property="status"/>
         <result column="create_by_id" property="createById"/>
@@ -38,6 +39,8 @@
         <result column="total_quantity" property="totalQuantity"/>
         <result column="total_amount_excluding_tax" property="totalAmountExcludingTax"/>
         <result column="total_amount_including_tax" property="totalAmountIncludingTax"/>
+        <result column="type" property="type"/>
+        <result column="parent_id" property="parentId"/>
     </resultMap>
 
     <sql id="ContractDistributorStandard_sql">
@@ -66,6 +69,7 @@
             tb.packaging,
             tb.special_terms,
             tb.designated_consignee,
+            tb.special_instructions,
             tb.remarks,
             tb.status,
             tb.create_by_id,
@@ -76,7 +80,9 @@
             tb.update_time,
             tb.total_quantity,
             tb.total_amount_excluding_tax,
-            tb.total_amount_including_tax
+            tb.total_amount_including_tax,
+            tb.type,
+            tb.parent_id
         FROM tbl_contract_distributor_standard AS tb
     </sql>
 
@@ -84,7 +90,7 @@
         <include refid="ContractDistributorStandard_sql"/>
         <where>
             <if test="vo.code != null and vo.code != ''">
-                AND tb.code LIKE CONCAT('%', #{vo.code})
+                AND code like CONCAT('%', #{vo.code}, '%')
             </if>
             <if test="vo.buyerList != null and vo.buyerList.size() > 0">
                 AND tb.buyer IN
@@ -108,7 +114,10 @@
                 AND tb.order_date &lt;= #{vo.orderDateEnd}
             </if>
             <if test="vo.status != null">
-                AND tb.status = #{vo.status}
+                AND tb.status LIKE CONCAT(#{vo.status}, '%')
+            </if>
+            <if test="vo.type != null">
+                AND tb.type = #{vo.type}
             </if>
         </where>
     </select>