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

@@ -143,6 +143,42 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String destination;
 
     /**
+     * 省ID
+     */
+    @ApiModelProperty("省ID")
+    private String provinceId;
+
+    /**
+     * 省名称
+     */
+    @ApiModelProperty("省名称")
+    private String provinceName;
+
+    /**
+     * 市ID
+     */
+    @ApiModelProperty("市ID")
+    private String cityId;
+
+    /**
+     * 市名称
+     */
+    @ApiModelProperty("市名称")
+    private String cityName;
+
+    /**
+     * 区ID
+     */
+    @ApiModelProperty("区ID")
+    private String districtId;
+
+    /**
+     * 区名称
+     */
+    @ApiModelProperty("区名称")
+    private String districtName;
+
+    /**
      * 单价中是否已包含包装费
      */
     @ApiModelProperty("单价中是否已包含包装费")

@@ -80,6 +80,42 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     private String destination;
 
     /**
+     * 省ID
+     */
+    @ApiModelProperty("省ID")
+    private String provinceId;
+
+    /**
+     * 省名称
+     */
+    @ApiModelProperty("省名称")
+    private String provinceName;
+
+    /**
+     * 市ID
+     */
+    @ApiModelProperty("市ID")
+    private String cityId;
+
+    /**
+     * 市名称
+     */
+    @ApiModelProperty("市名称")
+    private String cityName;
+
+    /**
+     * 区ID
+     */
+    @ApiModelProperty("区ID")
+    private String districtId;
+
+    /**
+     * 区名称
+     */
+    @ApiModelProperty("区名称")
+    private String districtName;
+
+    /**
      * 合计总金额
      */
     @ApiModelProperty("合计总金额")

@@ -76,4 +76,9 @@ public interface GenerateCodeTypePool {
      * 框架合同
      */
     Integer CONTRACT_FRAMEWORK = 401;
+
+    /**
+     * 合同
+     */
+    Integer CONTRACT = 402;
 }

@@ -11,9 +11,12 @@ 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.dto.dic.city.DicCityDto;
 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.DicCityService;
+import com.lframework.starter.web.inner.service.GenerateCodeService;
 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;
@@ -23,6 +26,7 @@ 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.components.code.GenerateCodeTypePool;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
@@ -68,6 +72,11 @@ public class ContractDistributorStandardController extends DefaultBaseController
     private SysUserService sysUserService;
     @Autowired
     private SysDataDicItemService sysDataDicItemService;
+    @Autowired
+    private GenerateCodeService generateCodeService;
+    @Autowired
+    private DicCityService dicCityService;
+
 
     public static final String SUPPLIER_DIC_CODE = "SUPPLIER"; // 所属单位/供方
     public static final String UNIT_DIC_CODE = "UNIT"; // 单位
@@ -143,6 +152,18 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 Customer customer = customerMap.get(bo.getBuyer());
                 bo.setBuyerName(customer == null ? "" : customer.getName());
             }
+
+            if (StringUtils.isNotBlank(bo.getDestination())) {
+                List<DicCityDto> dicCityDtoList = dicCityService.getChainById(bo.getDestination());
+                if (CollectionUtils.isNotEmpty(dicCityDtoList) && dicCityDtoList.size() == 3) {
+                    bo.setProvinceId(dicCityDtoList.get(0).getId());
+                    bo.setProvinceName(dicCityDtoList.get(0).getName());
+                    bo.setCityId(dicCityDtoList.get(1).getId());
+                    bo.setCityName(dicCityDtoList.get(1).getName());
+                    bo.setDistrictId(dicCityDtoList.get(2).getId());
+                    bo.setDistrictName(dicCityDtoList.get(2).getName());
+                }
+            }
         });
 
         boPageResult.setDatas(boList);
@@ -184,6 +205,16 @@ public class ContractDistributorStandardController extends DefaultBaseController
         SysDataDicItem standardDicItem = sysDataDicItemService.findByCode(APPLICABLE_STANDARD_DIC_CODE, result.getExecutionStandard());
         result.setExecutionStandardName(standardDicItem == null ? "" : standardDicItem.getName());
 
+        List<DicCityDto> dicCityDtoList = dicCityService.getChainById(result.getDestination());
+        if (CollectionUtils.isNotEmpty(dicCityDtoList) && dicCityDtoList.size() == 3) {
+            result.setProvinceId(dicCityDtoList.get(0).getId());
+            result.setProvinceName(dicCityDtoList.get(0).getName());
+            result.setCityId(dicCityDtoList.get(1).getId());
+            result.setCityName(dicCityDtoList.get(1).getName());
+            result.setDistrictId(dicCityDtoList.get(2).getId());
+            result.setDistrictName(dicCityDtoList.get(2).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());
@@ -232,7 +263,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
     @ApiOperation("修改")
     @HasPermission({"contract:contractDistributorStandard:modify"})
     @PutMapping
-    public InvokeResult<Void> update(@Valid UpdateContractDistributorStandardVo vo) {
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateContractDistributorStandardVo vo) {
 
         contractDistributorStandardService.update(vo);
 
@@ -240,4 +271,27 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
         return InvokeResultBuilder.success();
     }
+
+    @ApiOperation("获取code")
+    @HasPermission({"contract:contractDistributorStandard:add"})
+    @GetMapping("/code")
+    public InvokeResult<String> code() {
+        StringBuilder stringBuilder = new StringBuilder();
+        // 获取当前人员及所在部门
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        SysUser sysUser = sysUserService.findById(currentUserId);
+        if (sysUser != null) {
+            GetSysUserBo getSysUserBo = new GetSysUserBo(sysUser);
+            //部门
+            List<String> depts = getSysUserBo.getDepts();
+            if (CollectionUtils.isNotEmpty(depts)) {
+                String deptId = depts.get(0);
+                SysDept sysDept = sysDeptService.findById(deptId);
+                stringBuilder.append(sysDept.getCode());
+            }
+        }
+
+        stringBuilder.append(generateCodeService.generate(GenerateCodeTypePool.CONTRACT));
+        return InvokeResultBuilder.success(stringBuilder.toString());
+    }
 }

 package com.lframework.xingyun.sc.impl.contract;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -21,7 +23,10 @@ import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardSer
 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.UpdateContractDistributorLineVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -29,7 +34,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class ContractDistributorStandardServiceImpl extends
@@ -160,6 +167,55 @@ public class ContractDistributorStandardServiceImpl extends
 
         getBaseMapper().update(updateWrapper);
 
+        Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
+                .eq(ContractDistributorLine::getContractId, data.getId());
+        List<ContractDistributorLine> oldContractDistributorLineList = contractDistributorLineService.list(lineWrapper);
+        List<String> oldlineIdList = CollectionUtils.emptyIfNull(oldContractDistributorLineList)
+                .stream()
+                .map(ContractDistributorLine::getId).collect(Collectors.toList());
+        List<String> existIdList = new ArrayList<>(oldlineIdList.size());
+        for (int i = 0; i < vo.getContractDistributorLineList().size(); i++) {
+            UpdateContractDistributorLineVo updateContractDistributorLineVo = vo.getContractDistributorLineList().get(i);
+            updateContractDistributorLineVo.setShowOrder(i);
+            if (StringUtils.isNotBlank(updateContractDistributorLineVo.getId())) {
+                existIdList.add(updateContractDistributorLineVo.getId());
+                contractDistributorLineService.update(updateContractDistributorLineVo);
+            } else {
+                updateContractDistributorLineVo.setContractId(data.getId());
+                CreateContractDistributorLineVo createContractDistributorLineVo = new CreateContractDistributorLineVo();
+                createContractDistributorLineVo.setContractId(updateContractDistributorLineVo.getContractId());
+                createContractDistributorLineVo.setIndustry(updateContractDistributorLineVo.getIndustry());
+                createContractDistributorLineVo.setQuality(updateContractDistributorLineVo.getQuality());
+                createContractDistributorLineVo.setBrand(updateContractDistributorLineVo.getBrand());
+                createContractDistributorLineVo.setThickness(updateContractDistributorLineVo.getThickness());
+                createContractDistributorLineVo.setWidth(updateContractDistributorLineVo.getWidth());
+                createContractDistributorLineVo.setLength(updateContractDistributorLineVo.getLength());
+                createContractDistributorLineVo.setStatus(updateContractDistributorLineVo.getStatus());
+                createContractDistributorLineVo.setQuantity(updateContractDistributorLineVo.getQuantity());
+                createContractDistributorLineVo.setUnitPrice(updateContractDistributorLineVo.getUnitPrice());
+                createContractDistributorLineVo.setAmountExcludingTax(updateContractDistributorLineVo.getAmountExcludingTax());
+                createContractDistributorLineVo.setTotalAmount(updateContractDistributorLineVo.getTotalAmount());
+                createContractDistributorLineVo.setDeliveryDate(updateContractDistributorLineVo.getDeliveryDate());
+                createContractDistributorLineVo.setShowOrder(updateContractDistributorLineVo.getShowOrder());
+                createContractDistributorLineVo.setProductId(updateContractDistributorLineVo.getProductId());
+                createContractDistributorLineVo.setThicknessTolPos(updateContractDistributorLineVo.getThicknessTolPos());
+                createContractDistributorLineVo.setThicknessTolNeg(updateContractDistributorLineVo.getThicknessTolNeg());
+                createContractDistributorLineVo.setWidthTolPos(updateContractDistributorLineVo.getWidthTolPos());
+                createContractDistributorLineVo.setWidthTolNeg(updateContractDistributorLineVo.getWidthTolNeg());
+                createContractDistributorLineVo.setLengthTolPos(updateContractDistributorLineVo.getLengthTolPos());
+                createContractDistributorLineVo.setLengthTolNeg(updateContractDistributorLineVo.getLengthTolNeg());
+
+                contractDistributorLineService.create(createContractDistributorLineVo);
+            }
+        }
+
+        List<String> needDeleteLineIdList = oldlineIdList.stream()
+                .filter(oldLineId -> !existIdList.contains(oldLineId))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(needDeleteLineIdList)) {
+            contractDistributorLineService.removeByIds(needDeleteLineIdList);
+        }
+
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
     }

@@ -78,8 +78,7 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     /**
      * 交付定金信息（包含数额、时间）
      */
-    @ApiModelProperty(value = "交付定金信息（包含数额、时间）", required = true)
-    @NotBlank(message = "请输入交付定金信息（包含数额、时间）！")
+    @ApiModelProperty(value = "交付定金信息（包含数额、时间）")
     @Length(message = "交付定金信息（包含数额、时间）最多允许500个字符！")
     private String depositInfo;
 

@@ -25,127 +25,111 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
     /**
      * ID
      */
-    @ApiModelProperty(value = "ID", required = true)
-    @NotBlank(message = "id不能为空！")
+    @ApiModelProperty(value = "ID")
     private String id;
 
     /**
      * 合同主表ID
      */
-    @ApiModelProperty(value = "合同主表ID", required = true)
-    @NotBlank(message = "请输入合同主表ID！")
+    @ApiModelProperty(value = "合同主表ID")
     @Length(message = "合同主表ID最多允许32个字符！")
     private String contractId;
 
     /**
      * 行业
      */
-    @ApiModelProperty(value = "行业", required = true)
-    @NotBlank(message = "请输入行业！")
+    @ApiModelProperty(value = "行业")
     @Length(message = "行业最多允许100个字符！")
     private String industry;
 
     /**
      * 品质
      */
-    @ApiModelProperty(value = "品质", required = true)
-    @NotBlank(message = "请输入品质！")
+    @ApiModelProperty(value = "品质")
     @Length(message = "品质最多允许100个字符！")
     private String quality;
 
     /**
      * 牌号
      */
-    @ApiModelProperty(value = "牌号", required = true)
-    @NotBlank(message = "请输入牌号！")
+    @ApiModelProperty(value = "牌号")
     @Length(message = "牌号最多允许100个字符！")
     private String brand;
 
     /**
      * 厚度
      */
-    @ApiModelProperty(value = "厚度", required = true)
+    @ApiModelProperty(value = "厚度")
     @TypeMismatch(message = "厚度格式有误！")
-    @NotNull(message = "请输入厚度！")
     @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
     private BigDecimal thickness;
 
     /**
      * 宽度
      */
-    @ApiModelProperty(value = "宽度", required = true)
+    @ApiModelProperty(value = "宽度")
     @TypeMismatch(message = "宽度格式有误！")
-    @NotNull(message = "请输入宽度！")
     @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
     private BigDecimal width;
 
     /**
      * 长度
      */
-    @ApiModelProperty(value = "长度", required = true)
+    @ApiModelProperty(value = "长度")
     @TypeMismatch(message = "长度格式有误！")
-    @NotNull(message = "请输入长度！")
     @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
     private BigDecimal length;
 
     /**
      * 状态
      */
-    @ApiModelProperty(value = "状态", required = true)
-    @NotBlank(message = "请输入状态！")
+    @ApiModelProperty(value = "状态")
     @Length(message = "状态最多允许50个字符！")
     private String status;
 
     /**
      * 数量
      */
-    @ApiModelProperty(value = "数量", required = true)
+    @ApiModelProperty(value = "数量")
     @TypeMismatch(message = "数量格式有误！")
-    @NotNull(message = "请输入数量！")
     @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
     private BigDecimal quantity;
 
     /**
      * 单价
      */
-    @ApiModelProperty(value = "单价", required = true)
+    @ApiModelProperty(value = "单价")
     @TypeMismatch(message = "单价格式有误！")
-    @NotNull(message = "请输入单价！")
     @IsNumberPrecision(message = "单价最多允许4位小数！", value = 4)
     private BigDecimal unitPrice;
 
     /**
      * 不含税金额
      */
-    @ApiModelProperty(value = "不含税金额", required = true)
+    @ApiModelProperty(value = "不含税金额")
     @TypeMismatch(message = "不含税金额格式有误！")
-    @NotNull(message = "请输入不含税金额！")
     @IsNumberPrecision(message = "不含税金额最多允许2位小数！", value = 2)
     private BigDecimal amountExcludingTax;
 
     /**
      * 总金额
      */
-    @ApiModelProperty(value = "总金额", required = true)
+    @ApiModelProperty(value = "总金额")
     @TypeMismatch(message = "总金额格式有误！")
-    @NotNull(message = "请输入总金额！")
     @IsNumberPrecision(message = "总金额最多允许2位小数！", value = 2)
     private BigDecimal totalAmount;
 
     /**
      * 发货日期
      */
-    @ApiModelProperty(value = "发货日期", required = true)
+    @ApiModelProperty(value = "发货日期")
     @TypeMismatch(message = "发货日期格式有误！")
-    @NotNull(message = "请输入发货日期！")
     private LocalDate deliveryDate;
 
     /**
      * 排序
      */
-    @ApiModelProperty(value = "排序", required = true)
-    @TypeMismatch(message = "排序格式有误！")
-    @NotNull(message = "请输入排序！")
+    @ApiModelProperty(value = "排序")
     private Integer showOrder;
 
     /**
@@ -158,49 +142,43 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
     /**
      * 厚度公差正
      */
-    @ApiModelProperty(value = "厚度公差正", required = true)
+    @ApiModelProperty(value = "厚度公差正")
     @TypeMismatch(message = "厚度公差正格式有误！")
-    @NotNull(message = "请输入厚度公差正！")
     private BigDecimal thicknessTolPos;
 
     /**
      * 厚度公差负
      */
-    @ApiModelProperty(value = "厚度公差负", required = true)
+    @ApiModelProperty(value = "厚度公差负")
     @TypeMismatch(message = "厚度公差负格式有误！")
-    @NotNull(message = "请输入厚度公差负！")
     private BigDecimal thicknessTolNeg;
 
     /**
      * 宽度公差正
      */
-    @ApiModelProperty(value = "宽度公差正", required = true)
+    @ApiModelProperty(value = "宽度公差正")
     @TypeMismatch(message = "宽度公差正格式有误！")
-    @NotNull(message = "请输入宽度公差正！")
     private BigDecimal widthTolPos;
 
     /**
      * 宽度公差负
      */
-    @ApiModelProperty(value = "宽度公差负", required = true)
+    @ApiModelProperty(value = "宽度公差负")
     @TypeMismatch(message = "宽度公差负格式有误！")
-    @NotNull(message = "请输入宽度公差负！")
     private BigDecimal widthTolNeg;
 
     /**
      * 长度公差正
      */
-    @ApiModelProperty(value = "长度公差正", required = true)
+    @ApiModelProperty(value = "长度公差正")
     @TypeMismatch(message = "长度公差正格式有误！")
-    @NotNull(message = "请输入长度公差正！")
     private BigDecimal lengthTolPos;
 
     /**
      * 长度公差负
      */
-    @ApiModelProperty(value = "长度公差负", required = true)
+    @ApiModelProperty(value = "长度公差负")
     @TypeMismatch(message = "长度公差负格式有误！")
-    @NotNull(message = "请输入长度公差负！")
     private BigDecimal lengthTolNeg;
 
 }

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class UpdateContractDistributorStandardVo implements BaseVo, Serializable {
@@ -79,40 +80,35 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     /**
      * 交付定金信息（包含数额、时间）
      */
-    @ApiModelProperty(value = "交付定金信息（包含数额、时间）", required = true)
-    @NotBlank(message = "请输入交付定金信息（包含数额、时间）！")
+    @ApiModelProperty(value = "交付定金信息（包含数额、时间）")
     @Length(message = "交付定金信息（包含数额、时间）最多允许500个字符！")
     private String depositInfo;
 
     /**
      * 包装要求
      */
-    @ApiModelProperty(value = "包装要求", required = true)
-    @NotBlank(message = "请输入包装要求！")
+    @ApiModelProperty(value = "包装要求")
     @Length(message = "包装要求最多允许200个字符！")
     private String packagingRequirements;
 
     /**
      * 付款信息（包含付款方式、付款期限）
      */
-    @ApiModelProperty(value = "付款信息（包含付款方式、付款期限）", required = true)
-    @NotBlank(message = "请输入付款信息（包含付款方式、付款期限）！")
+    @ApiModelProperty(value = "付款信息（包含付款方式、付款期限）")
     @Length(message = "付款信息（包含付款方式、付款期限）最多允许500个字符！")
     private String paymentTerms;
 
     /**
      * 执行标准
      */
-    @ApiModelProperty(value = "执行标准", required = true)
-    @NotBlank(message = "请输入执行标准！")
+    @ApiModelProperty(value = "执行标准")
     @Length(message = "执行标准最多允许50个字符！")
     private String executionStandard;
 
     /**
      * 运输方式
      */
-    @ApiModelProperty(value = "运输方式", required = true)
-    @NotBlank(message = "请输入运输方式！")
+    @ApiModelProperty(value = "运输方式")
     @Length(message = "运输方式最多允许100个字符！")
     private String transportMode;
 
@@ -126,121 +122,106 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     /**
      * 目的地
      */
-    @ApiModelProperty(value = "目的地", required = true)
-    @NotBlank(message = "请输入目的地！")
+    @ApiModelProperty(value = "目的地")
     @Length(message = "目的地最多允许200个字符！")
     private String destination;
 
     /**
      * 单价中是否已包含包装费
      */
-    @ApiModelProperty(value = "单价中是否已包含包装费", required = true)
+    @ApiModelProperty(value = "单价中是否已包含包装费")
     @TypeMismatch(message = "单价中是否已包含包装费格式有误！")
-    @NotNull(message = "请输入单价中是否已包含包装费！")
     private Boolean includesPackagingFee;
 
     /**
      * 单价中是否已包含运费
      */
-    @ApiModelProperty(value = "单价中是否已包含运费", required = true)
+    @ApiModelProperty(value = "单价中是否已包含运费")
     @TypeMismatch(message = "单价中是否已包含运费格式有误！")
-    @NotNull(message = "请输入单价中是否已包含运费！")
     private Boolean includesTransportFee;
 
     /**
      * 件重条头
      */
-    @ApiModelProperty(value = "件重条头", required = true)
-    @NotBlank(message = "请输入件重条头！")
+    @ApiModelProperty(value = "件重条头")
     @Length(message = "件重条头最多允许65,535个字符！")
     private String pieceWeightHead;
 
     /**
      * 表面
      */
-    @ApiModelProperty(value = "表面", required = true)
-    @NotBlank(message = "请输入表面！")
+    @ApiModelProperty(value = "表面")
     @Length(message = "表面最多允许65,535个字符！")
     private String surface;
 
     /**
      * 公差
      */
-    @ApiModelProperty(value = "公差", required = true)
-    @NotBlank(message = "请输入公差！")
+    @ApiModelProperty(value = "公差")
     @Length(message = "公差最多允许65,535个字符！")
     private String tolerance;
 
     /**
      * 性能
      */
-    @ApiModelProperty(value = "性能", required = true)
-    @NotBlank(message = "请输入性能！")
+    @ApiModelProperty(value = "性能")
     @Length(message = "性能最多允许65,535个字符！")
     private String performance;
 
     /**
      * 包装
      */
-    @ApiModelProperty(value = "包装", required = true)
-    @NotBlank(message = "请输入包装！")
+    @ApiModelProperty(value = "包装")
     @Length(message = "包装最多允许65,535个字符！")
     private String packaging;
 
     /**
      * 特别条款要求
      */
-    @ApiModelProperty(value = "特别条款要求", required = true)
-    @NotBlank(message = "请输入特别条款要求！")
+    @ApiModelProperty(value = "特别条款要求")
     @Length(message = "特别条款要求最多允许50个字符！")
     private String specialTerms;
 
     /**
      * 需方指定收货人
      */
-    @ApiModelProperty(value = "需方指定收货人", required = true)
-    @NotBlank(message = "请输入需方指定收货人！")
+    @ApiModelProperty(value = "需方指定收货人")
     @Length(message = "需方指定收货人最多允许65,535个字符！")
     private String designatedConsignee;
 
     /**
      * 特别说明
      */
-    @ApiModelProperty(value = "特别说明", required = true)
-    @NotBlank(message = "请输入特别说明！")
+    @ApiModelProperty(value = "特别说明")
     @Length(message = "特别说明最多允许65,535个字符！")
     private String specialInstructions;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注", required = true)
-    @NotBlank(message = "请输入备注！")
+    @ApiModelProperty(value = "备注")
     @Length(message = "备注最多允许65,535个字符！")
     private String remarks;
 
     /**
      * 合计数量
      */
-    @ApiModelProperty(value = "合计数量", required = true)
+    @ApiModelProperty(value = "合计数量")
     @TypeMismatch(message = "合计数量格式有误！")
-    @NotNull(message = "请输入合计数量！")
     private BigDecimal totalQuantity;
 
     /**
      * 合计不含税金额
      */
-    @ApiModelProperty(value = "合计不含税金额", required = true)
+    @ApiModelProperty(value = "合计不含税金额")
     @TypeMismatch(message = "合计不含税金额格式有误！")
-    @NotNull(message = "请输入合计不含税金额！")
     private BigDecimal totalAmountExcludingTax;
 
     /**
      * 合计总金额
      */
-    @ApiModelProperty(value = "合计总金额", required = true)
+    @ApiModelProperty(value = "合计总金额")
     @TypeMismatch(message = "合计总金额格式有误！")
-    @NotNull(message = "请输入合计总金额！")
     private BigDecimal totalAmountIncludingTax;
 
     /**
@@ -252,8 +233,7 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     /**
      * 合同类型
      */
-    @ApiModelProperty(value = "合同类型", required = true)
-    @NotBlank(message = "请输入合同类型！")
+    @ApiModelProperty(value = "合同类型")
     private String type;
 
     /**
@@ -261,4 +241,11 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
      */
     @ApiModelProperty(value = "父合同id")
     private String parentId;
+
+    /**
+     * 经销标准合同物料行
+     */
+    @ApiModelProperty(value = "经销标准合同物料行", required = true)
+    @NotNull(message = "经销标准合同物料行不可为空！")
+    private List<UpdateContractDistributorLineVo> contractDistributorLineList;
 }