楚江ERP：合同框架调整，经销标准合同提交

@@ -60,19 +60,87 @@ create table if not exists base_data_product_variety (
 
 
 
 
 -- 合同框架
 -- 合同框架
-create table if not exists `tbl_contract_framework` (
-    `id` varchar(32) primary key comment 'ID',
-    `code` varchar(20) not null comment '编号',
-    `customer_id` varchar(32) not null comment '客户id',
-    `company`  varchar(50) not null comment '所属单位',
+create table if not exists `tbl_contract_framework`(
+    `id`                      varchar(32) primary key comment 'ID',
+    `code`                    varchar(20) not null comment '编号',
+    `customer_id`             varchar(32) not null comment '客户id',
+    `company`                 varchar(50) not null comment '所属单位',
     `has_framework_agreement` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否签订框架合同',
     `has_framework_agreement` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否签订框架合同',
-    `material_type_id` varchar(32) NOT NULL COMMENT '品种id',
-    `validity_time`  date comment '期限',
-    `create_by_id` varchar(32) not null comment '创建人ID',
-    `create_by` varchar(20) not null comment '创建人',
-    `update_by_id` varchar(32) not null comment '更新人ID',
-    `update_by` varchar(20) not null comment '更新人',
-    `create_time` datetime default now() comment '创建时间',
-    `update_time` datetime default now() comment '更新时间'
-    );
+    `material_type_id`        varchar(500) NOT NULL COMMENT '品种id',
+    `validity_time`           date comment '期限',
+    `create_by_id`            varchar(32) not null comment '创建人ID',
+    `create_by`               varchar(20) not null comment '创建人',
+    `update_by_id`            varchar(32) not null comment '更新人ID',
+    `update_by`               varchar(20) not null comment '更新人',
+    `create_time`             datetime default now() comment '创建时间',
+    `update_time`             datetime default now() comment '更新时间'
+);
+
+-- 经销标准合同
+create table if not exists `tbl_contract_distributor_standard`(
+     `id`                         varchar(32) primary key comment 'ID',
+     `code`                       varchar(20)  not null comment '编号',
+     `supplier`                   varchar(50)  not null comment '供方',
+     `buyer`                      varchar(200) not null comment '需方',
+     `dept_id`                    varchar(32)  not null comment '办事处',
+     `order_date`                 date         NOT NULL COMMENT '订货日期',
+     `unit`                       VARCHAR(50) COMMENT '单位',
+     `total_quantity`             DECIMAL(15, 4) COMMENT '合计数量',
+     `total_amount_excluding_tax` DECIMAL(15, 4) COMMENT '合计不含税金额',
+     `total_amount_including_tax` DECIMAL(15, 4) COMMENT '合计总金额',
+     `total_amount_capital`       VARCHAR(100) COMMENT '合计人民币金额（大写）',
+     `deposit_info`               VARCHAR(500) COMMENT '交付定金信息（包含数额、时间）',
+     `packaging_requirements`     VARCHAR(200) COMMENT '包装要求',
+     `payment_terms`              VARCHAR(500) COMMENT '付款信息（包含付款方式、付款期限）',
+     `execution_standard`         VARCHAR(50) COMMENT '执行标准',
+     `transport_mode`             VARCHAR(100) COMMENT '运输方式',
+     `destination`                VARCHAR(200) COMMENT '目的地',
+     `includes_packaging_fee`     tinyint(1) NOT NULL DEFAULT 0 COMMENT '单价中是否已包含包装费',
+     `includes_transport_fee`     tinyint(1) NOT NULL DEFAULT 0 COMMENT '单价中是否已包含运费',
+     `piece_weight_head`          TEXT COMMENT '件重条头',
+     `surface`                    TEXT COMMENT '表面',
+     `tolerance`                  TEXT COMMENT '公差',
+     `performance`                TEXT COMMENT '性能',
+     `special_terms`              VARCHAR(50) COMMENT '特别条款要求',
+     `designated_consignee`       TEXT COMMENT '需方指定收货人',
+     `remarks`                    TEXT COMMENT '备注',
+     `create_by_id`               varchar(32)  not null comment '创建人ID',
+     `create_by`                  varchar(20)  not null comment '创建人',
+     `update_by_id`               varchar(32)  not null comment '更新人ID',
+     `update_by`                  varchar(20)  not null comment '更新人',
+     `create_time`                datetime default now() comment '创建时间',
+     `update_time`                datetime default now() comment '更新时间'
+);
 
 
+-- 经销合同物料行
+create table if not exists  `tbl_contract_distributor_line`
+(
+    `id`                   varchar(32) primary key comment 'ID',
+    `contract_id`          varchar(32)    NOT NULL COMMENT '合同主表ID',
+    `product_id`           VARCHAR(50)    NOT NULL COMMENT '产品名称',
+    `industry`             VARCHAR(100) COMMENT '行业',
+    `quality`              VARCHAR(100) COMMENT '品质',
+    `brand`                VARCHAR(100) COMMENT '牌号',
+    `thickness`            DECIMAL(10, 4) COMMENT '厚度',
+    `thickness_tol_pos`    DECIMAL(10, 4) COMMENT '厚度公差正',
+    `thickness_tol_neg`    DECIMAL(10, 4) COMMENT '厚度公差负',
+    `width`                DECIMAL(10, 4) COMMENT '宽度',
+    `width_tol_pos`        DECIMAL(10, 4) COMMENT '宽度公差正',
+    `width_tol_neg`        DECIMAL(10, 4) COMMENT '宽度公差负',
+    `length`               DECIMAL(10, 4) COMMENT '长度',
+    `length_tol_pos`       DECIMAL(10, 4) COMMENT '长度公差正',
+    `length_tol_neg`       DECIMAL(10, 4) COMMENT '长度公差负',
+    `status`               VARCHAR(50) COMMENT '状态',
+    `quantity`             DECIMAL(15, 4) NOT NULL COMMENT '数量',
+    `unit_price`           DECIMAL(15, 4) NOT NULL COMMENT '单价',
+    `amount_excluding_tax` DECIMAL(15, 2) COMMENT '不含税金额',
+    `total_amount`         DECIMAL(15, 2) COMMENT '总金额',
+    `delivery_date`        DATE COMMENT '发货日期',
+    `show_order`           INT      DEFAULT 0 COMMENT '排序',
+    `create_by_id`         varchar(32)    not null comment '创建人ID',
+    `create_by`            varchar(20)    not null comment '创建人',
+    `update_by_id`         varchar(32)    not null comment '更新人ID',
+    `update_by`            varchar(20)    not null comment '更新人',
+    `create_time`          datetime default now() comment '创建时间',
+    `update_time`          datetime default now() comment '更新时间'
+)

+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.ContractDistributorStandard;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 经销标准合同 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetContractDistributorStandardBo extends BaseBo<ContractDistributorStandard> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 供方
+     */
+    @ApiModelProperty("供方")
+    private String supplier;
+
+    /**
+     * 需方
+     */
+    @ApiModelProperty("需方")
+    private String buyer;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate orderDate;
+
+    /**
+     * 单位
+     */
+    @ApiModelProperty("单位")
+    private String unit;
+
+    /**
+     * 合计人民币金额（大写）
+     */
+    @ApiModelProperty("合计人民币金额（大写）")
+    private String totalAmountCapital;
+
+    /**
+     * 交付定金信息（包含数额、时间）
+     */
+    @ApiModelProperty("交付定金信息（包含数额、时间）")
+    private String depositInfo;
+
+    /**
+     * 包装要求
+     */
+    @ApiModelProperty("包装要求")
+    private String packagingRequirements;
+
+    /**
+     * 付款信息（包含付款方式、付款期限）
+     */
+    @ApiModelProperty("付款信息（包含付款方式、付款期限）")
+    private String paymentTerms;
+
+    /**
+     * 执行标准
+     */
+    @ApiModelProperty("执行标准")
+    private String executionStandard;
+
+    /**
+     * 运输方式
+     */
+    @ApiModelProperty("运输方式")
+    private String transportMode;
+
+    /**
+     * 目的地
+     */
+    @ApiModelProperty("目的地")
+    private String destination;
+
+    /**
+     * 单价中是否已包含包装费
+     */
+    @ApiModelProperty("单价中是否已包含包装费")
+    private Boolean includesPackagingFee;
+
+    /**
+     * 单价中是否已包含运费
+     */
+    @ApiModelProperty("单价中是否已包含运费")
+    private Boolean includesTransportFee;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty("件重条头")
+    private String pieceWeightHead;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty("表面")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty("公差")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty("性能")
+    private String performance;
+
+    /**
+     * 特别条款要求
+     */
+    @ApiModelProperty("特别条款要求")
+    private String specialTerms;
+
+    /**
+     * 需方指定收货人
+     */
+    @ApiModelProperty("需方指定收货人")
+    private String designatedConsignee;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /**
+     * 合计不含税金额
+     */
+    @ApiModelProperty("合计不含税金额")
+    private BigDecimal totalAmountExcludingTax;
+
+    /**
+     * 合计总金额
+     */
+    @ApiModelProperty("合计总金额")
+    private BigDecimal totalAmountIncludingTax;
+
+    /**
+     * 合计数量
+     */
+    @ApiModelProperty("合计数量")
+    private BigDecimal totalQuantity;
+
+    public GetContractDistributorStandardBo() {
+
+    }
+
+    public GetContractDistributorStandardBo(ContractDistributorStandard dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ContractDistributorStandard> convert(ContractDistributorStandard dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ContractDistributorStandard dto) {
+
+    }
+}

+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.ContractDistributorStandard;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 经销标准合同 QueryBo
+ * </p>
+ */
+@Data
+public class QueryContractDistributorStandardBo extends BaseBo<ContractDistributorStandard> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 需方
+     */
+    @ApiModelProperty("需方")
+    private String buyer;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate orderDate;
+
+    /**
+     * 运输方式
+     */
+    @ApiModelProperty("运输方式")
+    private String transportMode;
+
+    /**
+     * 目的地
+     */
+    @ApiModelProperty("目的地")
+    private String destination;
+
+    /**
+     * 合计总金额
+     */
+    @ApiModelProperty("合计总金额")
+    private BigDecimal totalAmountIncludingTax;
+
+    /**
+     * 合计数量
+     */
+    @ApiModelProperty("合计数量")
+    private BigDecimal totalQuantity;
+
+    public QueryContractDistributorStandardBo() {
+
+    }
+
+    public QueryContractDistributorStandardBo(ContractDistributorStandard dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ContractDistributorStandard> convert(ContractDistributorStandard dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ContractDistributorStandard dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.contract;
+
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+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;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.xingyun.sc.bo.contract.GetContractDistributorStandardBo;
+import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
+import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
+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;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 经销标准合同 Controller
+ */
+@Api(tags = "经销标准合同")
+@Validated
+@RestController
+@RequestMapping("/contract/contractDistributorStandard")
+public class ContractDistributorStandardController extends DefaultBaseController {
+
+    @Autowired
+    private ContractDistributorStandardService contractDistributorStandardService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"contract:contractDistributorStandard:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryContractDistributorStandardBo>> query(@Valid QueryContractDistributorStandardVo vo) {
+
+        PageResult<ContractDistributorStandard> pageResult = contractDistributorStandardService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<ContractDistributorStandard> datas = pageResult.getDatas();
+        List<QueryContractDistributorStandardBo> results = null;
+
+        if (CollectionUtils.isNotEmpty(datas)) {
+            results = datas.stream().map(QueryContractDistributorStandardBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"contract:contractDistributorStandard:query"})
+    @GetMapping
+    public InvokeResult<GetContractDistributorStandardBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        ContractDistributorStandard data = contractDistributorStandardService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("经销标准合同不存在！");
+        }
+
+        GetContractDistributorStandardBo result = new GetContractDistributorStandardBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"contract:contractDistributorStandard:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateContractDistributorStandardVo vo) {
+
+        contractDistributorStandardService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"contract:contractDistributorStandard:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateContractDistributorStandardVo vo) {
+
+        contractDistributorStandardService.update(vo);
+
+        contractDistributorStandardService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
+    }
+}

 package com.lframework.xingyun.sc.controller.contract;
 package com.lframework.xingyun.sc.controller.contract;
 
 
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import com.lframework.starter.common.utils.DateUtil;
-import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
@@ -50,9 +48,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -86,7 +82,7 @@ public class ContractFrameworkController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"contractFramework:contractFramework:query"})
+    @HasPermission({"contract:contractFramework:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryContractFrameworkBo>> query(@Valid QueryContractFrameworkVo vo) {
     public InvokeResult<PageResult<QueryContractFrameworkBo>> query(@Valid QueryContractFrameworkVo vo) {
 
 
@@ -105,7 +101,13 @@ public class ContractFrameworkController extends DefaultBaseController {
         }
         }
 
 
         results = boPageResult.getDatas();
         results = boPageResult.getDatas();
-        List<String> materialTypeIdList = results.stream().map(QueryContractFrameworkBo::getMaterialTypeId).collect(Collectors.toList());
+        List<String> materialTypeIdList = results.stream()
+                .filter(bo -> StringUtils.isNotBlank(bo.getMaterialTypeId()))
+                .flatMap(bo -> Arrays.stream(bo.getMaterialTypeId().split(",")))
+                .map(String::trim)
+                .filter(StringUtils::isNotBlank)
+                .distinct()
+                .collect(Collectors.toList());
         Map<String, ProductVariety> productVarietyMap = new HashMap<>(materialTypeIdList.size());
         Map<String, ProductVariety> productVarietyMap = new HashMap<>(materialTypeIdList.size());
         if (CollectionUtils.isNotEmpty(materialTypeIdList)) {
         if (CollectionUtils.isNotEmpty(materialTypeIdList)) {
             List<ProductVariety> productVarietyList = productVarietyService.listByIds(materialTypeIdList);
             List<ProductVariety> productVarietyList = productVarietyService.listByIds(materialTypeIdList);
@@ -129,8 +131,15 @@ public class ContractFrameworkController extends DefaultBaseController {
             if (bo == null) return;
             if (bo == null) return;
 
 
             if (StringUtils.isNotBlank(bo.getMaterialTypeId())) {
             if (StringUtils.isNotBlank(bo.getMaterialTypeId())) {
-                ProductVariety productVariety = productVarietyMap.get(bo.getMaterialTypeId());
-                bo.setMaterialTypeName(productVariety != null ? productVariety.getName() : "");
+                String materialTypeName = Arrays.stream(bo.getMaterialTypeId().split(","))
+                        .map(String::trim)
+                        .filter(StringUtils::isNotBlank)
+                        .map(productVarietyMap::get)
+                        .filter(Objects::nonNull)
+                        .map(ProductVariety::getName)
+                        .collect(Collectors.joining(","));
+
+                bo.setMaterialTypeName(materialTypeName);
             }
             }
 
 
             if (StringUtils.isNotBlank(bo.getCustomerId())) {
             if (StringUtils.isNotBlank(bo.getCustomerId())) {
@@ -151,14 +160,14 @@ public class ContractFrameworkController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"contractFramework:contractFramework:add"})
+    @HasPermission({"contract:contractFramework:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<String> create(@Valid CreateContractFrameworkVo vo) {
     public InvokeResult<String> create(@Valid CreateContractFrameworkVo vo) {
         return InvokeResultBuilder.success(contractFrameworkService.create(vo));
         return InvokeResultBuilder.success(contractFrameworkService.create(vo));
     }
     }
 
 
     @ApiOperation("获取code")
     @ApiOperation("获取code")
-    @HasPermission({"contractFramework:contractFramework:add"})
+    @HasPermission({"contract:contractFramework:add"})
     @GetMapping("/code")
     @GetMapping("/code")
     public InvokeResult<String> code(String company) {
     public InvokeResult<String> code(String company) {
         StringBuilder stringBuilder = new StringBuilder();
         StringBuilder stringBuilder = new StringBuilder();
@@ -187,7 +196,7 @@ public class ContractFrameworkController extends DefaultBaseController {
      */
      */
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"contractFramework:contractFramework:query"})
+    @HasPermission({"contract:contractFramework:query"})
     @GetMapping
     @GetMapping
     public InvokeResult<QueryContractFrameworkBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<QueryContractFrameworkBo> get(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -197,11 +206,37 @@ public class ContractFrameworkController extends DefaultBaseController {
         }
         }
 
 
         QueryContractFrameworkBo result = new QueryContractFrameworkBo(data);
         QueryContractFrameworkBo result = new QueryContractFrameworkBo(data);
-        String materialTypeId = result.getMaterialTypeId();
-        ProductVariety productVariety = productVarietyService.findById(materialTypeId);
+        String materialTypeIds = result.getMaterialTypeId();
+        if (StringUtils.isNotBlank(materialTypeIds)) {
+            // 分割ID并去重
+            List<String> idList = Arrays.stream(materialTypeIds.split(","))
+                    .map(String::trim)
+                    .filter(StringUtils::isNotEmpty)
+                    .collect(Collectors.toList());
+
+            if (CollectionUtils.isNotEmpty(idList)) {
+                // 批量查询
+                List<ProductVariety> productVarietyList = productVarietyService.listByIds(idList);
+
+                // 转换为Map提高查找效率
+                Map<String, String> idToNameMap = productVarietyList.stream()
+                        .collect(Collectors.toMap(
+                                ProductVariety::getId,
+                                ProductVariety::getName
+                        ));
+
+                // 按原始顺序构建名称字符串
+                String materialTypeName = idList.stream()
+                        .map(idToNameMap::get)
+                        .filter(Objects::nonNull) // 过滤掉未找到的ID
+                        .collect(Collectors.joining(","));
+
+                result.setMaterialTypeName(materialTypeName);
+            }
+        }
+
         String customerId = result.getCustomerId();
         String customerId = result.getCustomerId();
         Customer customer = customerService.findById(customerId);
         Customer customer = customerService.findById(customerId);
-        result.setMaterialTypeName(productVariety != null ? productVariety.getName() : "");
         result.setCustomerName(customer != null ? customer.getName() : "");
         result.setCustomerName(customer != null ? customer.getName() : "");
         SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode(SUPPLIER_DIC_CODE, result.getCompany());
         SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode(SUPPLIER_DIC_CODE, result.getCompany());
         result.setCompanyName(sysDataDicItem != null ? sysDataDicItem.getName() : "");
         result.setCompanyName(sysDataDicItem != null ? sysDataDicItem.getName() : "");
@@ -213,7 +248,7 @@ public class ContractFrameworkController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"contractFramework:contractFramework:modify"})
+    @HasPermission({"contract:contractFramework:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateContractFrameworkVo vo) {
     public InvokeResult<Void> update(@Valid UpdateContractFrameworkVo vo) {
 
 
@@ -231,7 +266,7 @@ public class ContractFrameworkController extends DefaultBaseController {
      * @return
      * @return
      */
      */
     @ApiOperation("导出")
     @ApiOperation("导出")
-    @HasPermission({"contractFramework:contractFramework:export"})
+    @HasPermission({"contract:contractFramework:export"})
     @PostMapping("/export")
     @PostMapping("/export")
     public InvokeResult<Void> export(@Valid QueryContractFrameworkVo vo) {
     public InvokeResult<Void> export(@Valid QueryContractFrameworkVo vo) {
 
 
@@ -241,14 +276,14 @@ public class ContractFrameworkController extends DefaultBaseController {
     }
     }
 
 
     @ApiOperation("下载导入模板")
     @ApiOperation("下载导入模板")
-    @HasPermission({"contractFramework:contractFramework:import"})
+    @HasPermission({"contract:contractFramework:import"})
     @GetMapping("/import/template")
     @GetMapping("/import/template")
     public void downloadImportTemplate() {
     public void downloadImportTemplate() {
         ExcelUtil.exportXls("合同框架导入模板", ContractFrameworkImportModel.class);
         ExcelUtil.exportXls("合同框架导入模板", ContractFrameworkImportModel.class);
     }
     }
 
 
     @ApiOperation("导入")
     @ApiOperation("导入")
-    @HasPermission({"contractFramework:contractFramework:import"})
+    @HasPermission({"contract:contractFramework:import"})
     @PostMapping("/import")
     @PostMapping("/import")
     public InvokeResult<Void> importExcel(@NotBlank(message = "ID不能为空") String id,
     public InvokeResult<Void> importExcel(@NotBlank(message = "ID不能为空") String id,
                                           @NotNull(message = "请上传文件") MultipartFile file) {
                                           @NotNull(message = "请上传文件") MultipartFile file) {

+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_contract_distributor_standard")
+public class ContractDistributorStandard extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ContractDistributorStandard";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 编号
+     */
+    private String code;
+
+    /**
+     * 供方
+     */
+    private String supplier;
+
+    /**
+     * 需方
+     */
+    private String buyer;
+
+    /**
+     * 办事处
+     */
+    private String deptId;
+
+    /**
+     * 订货日期
+     */
+    private LocalDate orderDate;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 合计人民币金额（大写）
+     */
+    private String totalAmountCapital;
+
+    /**
+     * 交付定金信息（包含数额、时间）
+     */
+    private String depositInfo;
+
+    /**
+     * 包装要求
+     */
+    private String packagingRequirements;
+
+    /**
+     * 付款信息（包含付款方式、付款期限）
+     */
+    private String paymentTerms;
+
+    /**
+     * 执行标准
+     */
+    private String executionStandard;
+
+    /**
+     * 运输方式
+     */
+    private String transportMode;
+
+    /**
+     * 目的地
+     */
+    private String destination;
+
+    /**
+     * 单价中是否已包含包装费
+     */
+    private Boolean includesPackagingFee;
+
+    /**
+     * 单价中是否已包含运费
+     */
+    private Boolean includesTransportFee;
+
+    /**
+     * 件重条头
+     */
+    private String pieceWeightHead;
+
+    /**
+     * 表面
+     */
+    private String surface;
+
+    /**
+     * 公差
+     */
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    private String performance;
+
+    /**
+     * 特别条款要求
+     */
+    private String specialTerms;
+
+    /**
+     * 需方指定收货人
+     */
+    private String designatedConsignee;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 创建人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 BigDecimal totalQuantity;
+
+    /**
+     * 合计不含税金额
+     */
+    private BigDecimal totalAmountExcludingTax;
+
+    /**
+     * 合计总金额
+     */
+    private BigDecimal totalAmountIncludingTax;
+
+}

@@ -21,11 +21,13 @@ import com.lframework.xingyun.sc.controller.contract.ContractFrameworkController
 import com.lframework.xingyun.sc.entity.ContractFramework;
 import com.lframework.xingyun.sc.entity.ContractFramework;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Data
 @Data
 public class ContractFrameworkExportModel extends BaseBo<ContractFramework> implements ExcelModel {
 public class ContractFrameworkExportModel extends BaseBo<ContractFramework> implements ExcelModel {
@@ -90,9 +92,31 @@ public class ContractFrameworkExportModel extends BaseBo<ContractFramework> impl
         }
         }
 
 
         if (StringUtils.isNotBlank(dto.getMaterialTypeId())) {
         if (StringUtils.isNotBlank(dto.getMaterialTypeId())) {
-            ProductVarietyService productVarietyService = ApplicationUtil.getBean(ProductVarietyService.class);
-            ProductVariety productVariety = productVarietyService.findById(dto.getMaterialTypeId());
-            this.materialTypeName = productVariety != null ? productVariety.getName() : "";
+            String materialTypeIds = dto.getMaterialTypeId();
+            // 分割ID并去重
+            List<String> idList = Arrays.stream(materialTypeIds.split(","))
+                    .map(String::trim)
+                    .filter(StringUtils::isNotEmpty)
+                    .collect(Collectors.toList());
+
+            if (CollectionUtils.isNotEmpty(idList)) {
+                ProductVarietyService productVarietyService = ApplicationUtil.getBean(ProductVarietyService.class);
+                // 批量查询
+                List<ProductVariety> productVarietyList = productVarietyService.listByIds(idList);
+
+                // 转换为Map提高查找效率
+                Map<String, String> idToNameMap = productVarietyList.stream()
+                        .collect(Collectors.toMap(
+                                ProductVariety::getId,
+                                ProductVariety::getName
+                        ));
+
+                // 按原始顺序构建名称字符串
+                this.materialTypeName = idList.stream()
+                        .map(idToNameMap::get)
+                        .filter(Objects::nonNull) // 过滤掉未找到的ID
+                        .collect(Collectors.joining(","));
+            }
         }
         }
 
 
         this.hasFrameworkAgreementStr = BooleanUtils.isTrue(dto.getHasFrameworkAgreement()) ? "是" : "否";
         this.hasFrameworkAgreementStr = BooleanUtils.isTrue(dto.getHasFrameworkAgreement()) ? "是" : "否";

@@ -30,7 +30,10 @@ import org.apache.commons.lang3.StringUtils;
 
 
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.List;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
 public class ContractFrameworkImportListener extends ExcelImportListener<ContractFrameworkImportModel> {
 public class ContractFrameworkImportListener extends ExcelImportListener<ContractFrameworkImportModel> {
@@ -77,16 +80,25 @@ public class ContractFrameworkImportListener extends ExcelImportListener<Contrac
                     "第" + context.readRowHolder().getRowIndex() + "行授信截止日期不可为空");
                     "第" + context.readRowHolder().getRowIndex() + "行授信截止日期不可为空");
         }
         }
 
 
+        if (StringUtils.isBlank(data.getMaterialTypeName())) {
+            throw new DefaultClientException(
+                    "第" + context.readRowHolder().getRowIndex() + "行品种不可为空！");
+        }
+
         ProductVarietyService productVarietyService = ApplicationUtil.getBean(ProductVarietyService.class);
         ProductVarietyService productVarietyService = ApplicationUtil.getBean(ProductVarietyService.class);
         Wrapper<ProductVariety> productVarietyWrapper = Wrappers.lambdaQuery(ProductVariety.class)
         Wrapper<ProductVariety> productVarietyWrapper = Wrappers.lambdaQuery(ProductVariety.class)
-                .eq(ProductVariety::getName, data.getMaterialTypeName());
-        ProductVariety productVariety = productVarietyService.getOne(productVarietyWrapper);
-        if (productVariety == null) {
+                .in(ProductVariety::getName, Arrays.asList(data.getMaterialTypeName().split(",")));
+        List<ProductVariety> productVarietyList = productVarietyService.list(productVarietyWrapper);
+        if (CollectionUtils.isEmpty(productVarietyList)) {
             throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，品种[" + data.getMaterialTypeName()
             throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，品种[" + data.getMaterialTypeName()
                     + "]不存在，请检查后再次导入！");
                     + "]不存在，请检查后再次导入！");
         }
         }
 
 
-        data.setMaterialTypId(productVariety.getId());
+        data.setMaterialTypId(productVarietyList.stream()
+                .map(ProductVariety::getId)
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.joining(",")));
     }
     }
 
 
     @Override
     @Override

+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.ContractDistributorStandard;
+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.ContractDistributorStandardMapper;
+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;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
+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 ContractDistributorStandardServiceImpl extends
+        BaseMpServiceImpl<ContractDistributorStandardMapper, ContractDistributorStandard> implements ContractDistributorStandardService {
+
+    @Override
+    public PageResult<ContractDistributorStandard> query(Integer pageIndex, Integer pageSize, QueryContractDistributorStandardVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ContractDistributorStandard> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<ContractDistributorStandard> query(QueryContractDistributorStandardVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Cacheable(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
+    @Override
+    public ContractDistributorStandard findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增经销标准合同，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateContractDistributorStandardVo vo) {
+
+        ContractDistributorStandard data = new ContractDistributorStandard();
+        data.setId(IdUtil.getUUID());
+        data.setCode(vo.getCode());
+        data.setSupplier(vo.getSupplier());
+        data.setBuyer(vo.getBuyer());
+        data.setOrderDate(vo.getOrderDate());
+        data.setUnit(vo.getUnit());
+        data.setTotalAmountCapital(vo.getTotalAmountCapital());
+        data.setDepositInfo(vo.getDepositInfo());
+        data.setPackagingRequirements(vo.getPackagingRequirements());
+        data.setPaymentTerms(vo.getPaymentTerms());
+        data.setExecutionStandard(vo.getExecutionStandard());
+        data.setTransportMode(vo.getTransportMode());
+        data.setDestination(vo.getDestination());
+        data.setIncludesPackagingFee(vo.getIncludesPackagingFee());
+        data.setIncludesTransportFee(vo.getIncludesTransportFee());
+        data.setPieceWeightHead(vo.getPieceWeightHead());
+        data.setSurface(vo.getSurface());
+        data.setTolerance(vo.getTolerance());
+        data.setPerformance(vo.getPerformance());
+        data.setSpecialTerms(vo.getSpecialTerms());
+        data.setDesignatedConsignee(vo.getDesignatedConsignee());
+        data.setRemarks(vo.getRemarks());
+        data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
+        data.setTotalAmountIncludingTax(vo.getTotalAmountIncludingTax());
+        data.setTotalQuantity(vo.getTotalQuantity());
+
+        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(UpdateContractDistributorStandardVo vo) {
+
+        ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("经销标准合同不存在！");
+        }
+
+        LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getCode, vo.getCode())
+                .set(ContractDistributorStandard::getSupplier, vo.getSupplier())
+                .set(ContractDistributorStandard::getBuyer, vo.getBuyer())
+                .set(ContractDistributorStandard::getOrderDate, vo.getOrderDate())
+                .set(ContractDistributorStandard::getUnit, vo.getUnit())
+                .set(ContractDistributorStandard::getTotalAmountCapital, vo.getTotalAmountCapital())
+                .set(ContractDistributorStandard::getDepositInfo, vo.getDepositInfo())
+                .set(ContractDistributorStandard::getPackagingRequirements, vo.getPackagingRequirements())
+                .set(ContractDistributorStandard::getPaymentTerms, vo.getPaymentTerms())
+                .set(ContractDistributorStandard::getExecutionStandard, vo.getExecutionStandard())
+                .set(ContractDistributorStandard::getTransportMode, vo.getTransportMode())
+                .set(ContractDistributorStandard::getDestination, vo.getDestination())
+                .set(ContractDistributorStandard::getIncludesPackagingFee, vo.getIncludesPackagingFee())
+                .set(ContractDistributorStandard::getIncludesTransportFee, vo.getIncludesTransportFee())
+                .set(ContractDistributorStandard::getPieceWeightHead, vo.getPieceWeightHead())
+                .set(ContractDistributorStandard::getSurface, vo.getSurface())
+                .set(ContractDistributorStandard::getTolerance, vo.getTolerance())
+                .set(ContractDistributorStandard::getPerformance, vo.getPerformance())
+                .set(ContractDistributorStandard::getSpecialTerms, vo.getSpecialTerms())
+                .set(ContractDistributorStandard::getDesignatedConsignee, vo.getDesignatedConsignee())
+                .set(ContractDistributorStandard::getRemarks, vo.getRemarks())
+                .set(ContractDistributorStandard::getTotalAmountExcludingTax, vo.getTotalAmountExcludingTax())
+                .set(ContractDistributorStandard::getTotalAmountIncludingTax, vo.getTotalAmountIncludingTax())
+                .set(ContractDistributorStandard::getTotalQuantity, vo.getTotalQuantity())
+                .eq(ContractDistributorStandard::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
+    @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.ContractDistributorStandard;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 经销标准合同 Mapper 接口
+ * </p>
+ */
+public interface ContractDistributorStandardMapper extends BaseMapper<ContractDistributorStandard> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ContractDistributorStandard> query(@Param("vo") QueryContractDistributorStandardVo vo);
+}

+package com.lframework.xingyun.sc.service.contract;
+
+import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
+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.CreateContractDistributorStandardVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
+
+import java.util.List;
+
+/**
+ * 经销标准合同 Service
+ */
+public interface ContractDistributorStandardService extends BaseMpService<ContractDistributorStandard> {
+
+    /**
+     * 查询列表
+     *
+     * @return
+     */
+    PageResult<ContractDistributorStandard> query(Integer pageIndex, Integer pageSize, QueryContractDistributorStandardVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ContractDistributorStandard> query(QueryContractDistributorStandardVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    ContractDistributorStandard findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo
+     * @return
+     */
+    String create(CreateContractDistributorStandardVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo
+     */
+    void update(UpdateContractDistributorStandardVo vo);
+
+}

+package com.lframework.xingyun.sc.vo.contract.createVo;
+
+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 CreateContractDistributorStandardVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    @NotBlank(message = "请输入编号！")
+    @Length(message = "编号最多允许20个字符！")
+    private String code;
+
+    /**
+     * 供方
+     */
+    @ApiModelProperty(value = "供方", required = true)
+    @NotBlank(message = "请输入供方！")
+    @Length(message = "供方最多允许50个字符！")
+    private String supplier;
+
+    /**
+     * 需方
+     */
+    @ApiModelProperty(value = "需方", required = true)
+    @NotBlank(message = "请输入需方！")
+    @Length(message = "需方最多允许200个字符！")
+    private String buyer;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty(value = "订货日期", required = true)
+    @NotNull(message = "请输入订货日期！")
+    @TypeMismatch(message = "订货日期格式有误！")
+    private LocalDate orderDate;
+
+    /**
+     * 单位
+     */
+    @ApiModelProperty(value = "单位", required = true)
+    @NotBlank(message = "请输入单位！")
+    @Length(message = "单位最多允许50个字符！")
+    private String unit;
+
+    /**
+     * 合计人民币金额（大写）
+     */
+    @ApiModelProperty(value = "合计人民币金额（大写）", required = true)
+    @NotBlank(message = "请输入合计人民币金额（大写）！")
+    @Length(message = "合计人民币金额（大写）最多允许100个字符！")
+    private String totalAmountCapital;
+
+    /**
+     * 交付定金信息（包含数额、时间）
+     */
+    @ApiModelProperty(value = "交付定金信息（包含数额、时间）", required = true)
+    @NotBlank(message = "请输入交付定金信息（包含数额、时间）！")
+    @Length(message = "交付定金信息（包含数额、时间）最多允许500个字符！")
+    private String depositInfo;
+
+    /**
+     * 包装要求
+     */
+    @ApiModelProperty(value = "包装要求", required = true)
+    @NotBlank(message = "请输入包装要求！")
+    @Length(message = "包装要求最多允许200个字符！")
+    private String packagingRequirements;
+
+    /**
+     * 付款信息（包含付款方式、付款期限）
+     */
+    @ApiModelProperty(value = "付款信息（包含付款方式、付款期限）", required = true)
+    @NotBlank(message = "请输入付款信息（包含付款方式、付款期限）！")
+    @Length(message = "付款信息（包含付款方式、付款期限）最多允许500个字符！")
+    private String paymentTerms;
+
+    /**
+     * 执行标准
+     */
+    @ApiModelProperty(value = "执行标准", required = true)
+    @NotBlank(message = "请输入执行标准！")
+    @Length(message = "执行标准最多允许50个字符！")
+    private String executionStandard;
+
+    /**
+     * 运输方式
+     */
+    @ApiModelProperty(value = "运输方式", required = true)
+    @NotBlank(message = "请输入运输方式！")
+    @Length(message = "运输方式最多允许100个字符！")
+    private String transportMode;
+
+    /**
+     * 目的地
+     */
+    @ApiModelProperty(value = "目的地", required = true)
+    @NotBlank(message = "请输入目的地！")
+    @Length(message = "目的地最多允许200个字符！")
+    private String destination;
+
+    /**
+     * 单价中是否已包含包装费
+     */
+    @ApiModelProperty(value = "单价中是否已包含包装费", required = true)
+    @NotNull(message = "请输入单价中是否已包含包装费！")
+    @TypeMismatch(message = "单价中是否已包含包装费格式有误！")
+    private Boolean includesPackagingFee;
+
+    /**
+     * 单价中是否已包含运费
+     */
+    @ApiModelProperty(value = "单价中是否已包含运费", required = true)
+    @NotNull(message = "请输入单价中是否已包含运费！")
+    @TypeMismatch(message = "单价中是否已包含运费格式有误！")
+    private Boolean includesTransportFee;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty(value = "件重条头", required = true)
+    @NotBlank(message = "请输入件重条头！")
+    @Length(message = "件重条头最多允许65,535个字符！")
+    private String pieceWeightHead;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty(value = "表面", required = true)
+    @NotBlank(message = "请输入表面！")
+    @Length(message = "表面最多允许65,535个字符！")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty(value = "公差", required = true)
+    @NotBlank(message = "请输入公差！")
+    @Length(message = "公差最多允许65,535个字符！")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty(value = "性能", required = true)
+    @NotBlank(message = "请输入性能！")
+    @Length(message = "性能最多允许65,535个字符！")
+    private String performance;
+
+    /**
+     * 特别条款要求
+     */
+    @ApiModelProperty(value = "特别条款要求", required = true)
+    @NotBlank(message = "请输入特别条款要求！")
+    @Length(message = "特别条款要求最多允许50个字符！")
+    private String specialTerms;
+
+    /**
+     * 需方指定收货人
+     */
+    @ApiModelProperty(value = "需方指定收货人", required = true)
+    @NotBlank(message = "请输入需方指定收货人！")
+    @Length(message = "需方指定收货人最多允许65,535个字符！")
+    private String designatedConsignee;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", required = true)
+    @NotBlank(message = "请输入备注！")
+    @Length(message = "备注最多允许65,535个字符！")
+    private String remarks;
+
+    /**
+     * 合计数量
+     */
+    @ApiModelProperty(value = "合计数量", required = true)
+    @NotNull(message = "请输入合计数量！")
+    @TypeMismatch(message = "合计数量格式有误！")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 合计不含税金额
+     */
+    @ApiModelProperty(value = "合计不含税金额", required = true)
+    @NotNull(message = "请输入合计不含税金额！")
+    @TypeMismatch(message = "合计不含税金额格式有误！")
+    private BigDecimal totalAmountExcludingTax;
+
+    /**
+     * 合计总金额
+     */
+    @ApiModelProperty(value = "合计总金额", required = true)
+    @NotNull(message = "请输入合计总金额！")
+    @TypeMismatch(message = "合计总金额格式有误！")
+    private BigDecimal totalAmountIncludingTax;
+
+}

+package com.lframework.xingyun.sc.vo.contract.queryVo;
+
+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 QueryContractDistributorStandardVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 需方
+     */
+    @ApiModelProperty("需方")
+    private String buyer;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @TypeMismatch(message = "订货日期格式有误！")
+    private LocalDate orderDate;
+
+    @ApiModelProperty("订货日期筛选开始日期")
+    @TypeMismatch(message = "订货日期格式有误！")
+    private LocalDate orderDateStart;
+
+    @ApiModelProperty("订货日期筛选结束日期")
+    @TypeMismatch(message = "订货日期格式有误！")
+    private LocalDate orderDateEnd;
+}
+

+package com.lframework.xingyun.sc.vo.contract.updateVo;
+
+import lombok.Data;
+
+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 UpdateContractDistributorStandardVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    @NotBlank(message = "请输入编号！")
+    @Length(message = "编号最多允许20个字符！")
+    private String code;
+
+    /**
+     * 供方
+     */
+    @ApiModelProperty(value = "供方", required = true)
+    @NotBlank(message = "请输入供方！")
+    @Length(message = "供方最多允许50个字符！")
+    private String supplier;
+
+    /**
+     * 需方
+     */
+    @ApiModelProperty(value = "需方", required = true)
+    @NotBlank(message = "请输入需方！")
+    @Length(message = "需方最多允许200个字符！")
+    private String buyer;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty(value = "订货日期", required = true)
+    @TypeMismatch(message = "订货日期格式有误！")
+    @NotNull(message = "请输入订货日期！")
+    private LocalDate orderDate;
+
+    /**
+     * 单位
+     */
+    @ApiModelProperty(value = "单位", required = true)
+    @NotBlank(message = "请输入单位！")
+    @Length(message = "单位最多允许50个字符！")
+    private String unit;
+
+    /**
+     * 合计人民币金额（大写）
+     */
+    @ApiModelProperty(value = "合计人民币金额（大写）", required = true)
+    @NotBlank(message = "请输入合计人民币金额（大写）！")
+    @Length(message = "合计人民币金额（大写）最多允许100个字符！")
+    private String totalAmountCapital;
+
+    /**
+     * 交付定金信息（包含数额、时间）
+     */
+    @ApiModelProperty(value = "交付定金信息（包含数额、时间）", required = true)
+    @NotBlank(message = "请输入交付定金信息（包含数额、时间）！")
+    @Length(message = "交付定金信息（包含数额、时间）最多允许500个字符！")
+    private String depositInfo;
+
+    /**
+     * 包装要求
+     */
+    @ApiModelProperty(value = "包装要求", required = true)
+    @NotBlank(message = "请输入包装要求！")
+    @Length(message = "包装要求最多允许200个字符！")
+    private String packagingRequirements;
+
+    /**
+     * 付款信息（包含付款方式、付款期限）
+     */
+    @ApiModelProperty(value = "付款信息（包含付款方式、付款期限）", required = true)
+    @NotBlank(message = "请输入付款信息（包含付款方式、付款期限）！")
+    @Length(message = "付款信息（包含付款方式、付款期限）最多允许500个字符！")
+    private String paymentTerms;
+
+    /**
+     * 执行标准
+     */
+    @ApiModelProperty(value = "执行标准", required = true)
+    @NotBlank(message = "请输入执行标准！")
+    @Length(message = "执行标准最多允许50个字符！")
+    private String executionStandard;
+
+    /**
+     * 运输方式
+     */
+    @ApiModelProperty(value = "运输方式", required = true)
+    @NotBlank(message = "请输入运输方式！")
+    @Length(message = "运输方式最多允许100个字符！")
+    private String transportMode;
+
+    /**
+     * 目的地
+     */
+    @ApiModelProperty(value = "目的地", required = true)
+    @NotBlank(message = "请输入目的地！")
+    @Length(message = "目的地最多允许200个字符！")
+    private String destination;
+
+    /**
+     * 单价中是否已包含包装费
+     */
+    @ApiModelProperty(value = "单价中是否已包含包装费", required = true)
+    @TypeMismatch(message = "单价中是否已包含包装费格式有误！")
+    @NotNull(message = "请输入单价中是否已包含包装费！")
+    private Boolean includesPackagingFee;
+
+    /**
+     * 单价中是否已包含运费
+     */
+    @ApiModelProperty(value = "单价中是否已包含运费", required = true)
+    @TypeMismatch(message = "单价中是否已包含运费格式有误！")
+    @NotNull(message = "请输入单价中是否已包含运费！")
+    private Boolean includesTransportFee;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty(value = "件重条头", required = true)
+    @NotBlank(message = "请输入件重条头！")
+    @Length(message = "件重条头最多允许65,535个字符！")
+    private String pieceWeightHead;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty(value = "表面", required = true)
+    @NotBlank(message = "请输入表面！")
+    @Length(message = "表面最多允许65,535个字符！")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty(value = "公差", required = true)
+    @NotBlank(message = "请输入公差！")
+    @Length(message = "公差最多允许65,535个字符！")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty(value = "性能", required = true)
+    @NotBlank(message = "请输入性能！")
+    @Length(message = "性能最多允许65,535个字符！")
+    private String performance;
+
+    /**
+     * 特别条款要求
+     */
+    @ApiModelProperty(value = "特别条款要求", required = true)
+    @NotBlank(message = "请输入特别条款要求！")
+    @Length(message = "特别条款要求最多允许50个字符！")
+    private String specialTerms;
+
+    /**
+     * 需方指定收货人
+     */
+    @ApiModelProperty(value = "需方指定收货人", required = true)
+    @NotBlank(message = "请输入需方指定收货人！")
+    @Length(message = "需方指定收货人最多允许65,535个字符！")
+    private String designatedConsignee;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", required = true)
+    @NotBlank(message = "请输入备注！")
+    @Length(message = "备注最多允许65,535个字符！")
+    private String remarks;
+
+    /**
+     * 合计数量
+     */
+    @ApiModelProperty(value = "合计数量", required = true)
+    @TypeMismatch(message = "合计数量格式有误！")
+    @NotNull(message = "请输入合计数量！")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 合计不含税金额
+     */
+    @ApiModelProperty(value = "合计不含税金额", required = true)
+    @TypeMismatch(message = "合计不含税金额格式有误！")
+    @NotNull(message = "请输入合计不含税金额！")
+    private BigDecimal totalAmountExcludingTax;
+
+    /**
+     * 合计总金额
+     */
+    @ApiModelProperty(value = "合计总金额", required = true)
+    @TypeMismatch(message = "合计总金额格式有误！")
+    @NotNull(message = "请输入合计总金额！")
+    private BigDecimal totalAmountIncludingTax;
+
+}

+<?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.ContractDistributorStandardMapper">
+
+    <resultMap id="ContractDistributorStandard" type="com.lframework.xingyun.sc.entity.ContractDistributorStandard">
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <result column="supplier" property="supplier"/>
+        <result column="buyer" property="buyer"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="order_date" property="orderDate"/>
+        <result column="unit" property="unit"/>
+        <result column="total_amount_capital" property="totalAmountCapital"/>
+        <result column="deposit_info" property="depositInfo"/>
+        <result column="packaging_requirements" property="packagingRequirements"/>
+        <result column="payment_terms" property="paymentTerms"/>
+        <result column="execution_standard" property="executionStandard"/>
+        <result column="transport_mode" property="transportMode"/>
+        <result column="destination" property="destination"/>
+        <result column="includes_packaging_fee" property="includesPackagingFee"/>
+        <result column="includes_transport_fee" property="includesTransportFee"/>
+        <result column="piece_weight_head" property="pieceWeightHead"/>
+        <result column="surface" property="surface"/>
+        <result column="tolerance" property="tolerance"/>
+        <result column="performance" property="performance"/>
+        <result column="special_terms" property="specialTerms"/>
+        <result column="designated_consignee" property="designatedConsignee"/>
+        <result column="remarks" property="remarks"/>
+        <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="total_quantit" property="totalQuantit"/>
+        <result column="total_amount_excluding_tax" property="totalAmountExcludingTax"/>
+        <result column="total_amount_including_tax" property="totalAmountIncludingTax"/>
+    </resultMap>
+
+    <sql id="ContractDistributorStandard_sql">
+        SELECT
+            tb.id,
+            tb.code,
+            tb.supplier,
+            tb.buyer,
+            tb.dept_id,
+            tb.order_date,
+            tb.unit,
+            tb.total_amount_capital,
+            tb.deposit_info,
+            tb.packaging_requirements,
+            tb.payment_terms,
+            tb.execution_standard,
+            tb.transport_mode,
+            tb.destination,
+            tb.includes_packaging_fee,
+            tb.includes_transport_fee,
+            tb.piece_weight_head,
+            tb.surface,
+            tb.tolerance,
+            tb.performance,
+            tb.special_terms,
+            tb.designated_consignee,
+            tb.remarks,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time,
+            tb.total_quantit,
+            tb.total_amount_excluding_tax,
+            tb.total_amount_including_tax
+        FROM tbl_contract_distributor_standard AS tb
+    </sql>
+
+    <select id="query" resultMap="ContractDistributorStandard">
+        <include refid="ContractDistributorStandard_sql"/>
+        <where>
+            <if test="vo.code != null and vo.code != ''">
+                AND tb.code LIKE CONCAT('%', #{vo.code})
+            </if>
+            <if test="vo.buyer != null and vo.buyer != ''">
+                AND tb.buyer LIKE CONCAT('%', #{vo.buyer})
+            </if>
+            <if test="vo.deptId != null and vo.deptId != ''">
+                AND tb.dept_id = #{vo.deptId}
+            </if>
+            <if test="vo.orderDate != null">
+                AND tb.order_date IN (#{vo.orderDate})
+            </if>
+            <if test="vo.orderDateStart != null">
+                AND tb.order_date &gt;= #{vo.orderDateStart}
+            </if>
+            <if test="vo.orderDateEnd != null">
+                AND tb.order_date &lt;= #{vo.orderDateEnd}
+            </if>
+        </where>
+    </select>
+</mapper>

@@ -52,7 +52,7 @@
                 AND tb.has_framework_agreement = #{vo.hasFrameworkAgreement}
                 AND tb.has_framework_agreement = #{vo.hasFrameworkAgreement}
             </if>
             </if>
             <if test="vo.materialTypeId != null and vo.materialTypeId != ''">
             <if test="vo.materialTypeId != null and vo.materialTypeId != ''">
-                AND tb.material_type_id = #{materialTypeId}
+                AND tb.material_type_id like CONCAT('%', #{vo.materialTypeId}, '%')
             </if>
             </if>
             <if test="vo.validityTime != null">
             <if test="vo.validityTime != null">
                 AND tb.validity_time = #{vo.validityTime}
                 AND tb.validity_time = #{vo.validityTime}