楚江ERP：合同增加合同名称

@@ -130,6 +130,7 @@ create table if not exists `tbl_contract_distributor_standard`
     `signed_contract_file_name`  VARCHAR(255) COMMENT '双方盖章合同名称',
     `formalized_at`              datetime comment '转为正式合同时间',
     `standardized_at`            datetime comment '转为标准合同时间',
+    `title`                      varchar(20)  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',

@@ -407,6 +407,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     private Boolean priceSpecLocked;
 
+    /**
+     * 合同名称（销售合同、销售订单）
+     */
+    @ApiModelProperty(value = "合同名称（销售合同、销售订单）")
+    private String title;
+
     public GetContractDistributorStandardBo() {
 
     }

@@ -105,8 +105,6 @@ public class ContractDistributorStandardController extends DefaultBaseController
     @Autowired
     private ContractFrameworkService contractFrameworkService;
     @Autowired
-    private ProductVarietyService productVarietyService;
-    @Autowired
     private ContractStdProcessingLineService contractStdProcessingLineService;
 
 
@@ -636,32 +634,6 @@ public class ContractDistributorStandardController extends DefaultBaseController
         // 设置响应头
         setupResponse(response, data.getCode() + "_" + data.getBuyerName() + "-合同打印.xls");
 
-        Wrapper<ContractFramework> contractFrameworkWrapper = Wrappers.lambdaQuery(ContractFramework.class)
-                .eq(ContractFramework::getCustomerId, data.getBuyer())
-                .ge(ContractFramework::getValidityTime, LocalDate.now())
-                .ge(ContractFramework::getCompany, data.getSupplier())
-                .eq(ContractFramework::getHasFrameworkAgreement, true);
-        List<ContractFramework> contractFrameworkList = contractFrameworkService.list(contractFrameworkWrapper);
-        List<String> productNameList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(contractFrameworkList)) {
-            List<String> materialTypeIdList = contractFrameworkList.stream()
-                    .filter(bo -> StringUtils.isNotBlank(bo.getMaterialTypeId()))
-                    .flatMap(bo -> Arrays.stream(bo.getMaterialTypeId().split(",")))
-                    .map(String::trim)
-                    .filter(StringUtils::isNotBlank)
-                    .distinct()
-                    .collect(Collectors.toList());
-            List<ProductVariety> productVarietyList = productVarietyService.listByIds(materialTypeIdList);
-            CollectionUtils.emptyIfNull(productVarietyList).forEach(productVariety -> {
-                if (productVariety == null || StringUtils.isBlank(productVariety.getName())) {
-                    return;
-                }
-
-                productNameList.add(productVariety.getName().substring(0, 2));
-            });
-        }
-
-
         String templatePath = "templates/standardContractTemplate.xls";
         if ("INTL_STD_CONTRACT".equals(data.getType())
                 || "INTL_INVENTORY_AGMT".equals(data.getType())
@@ -688,6 +660,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
                         contractTitle = "销售订单（外贸）";
                     }
 
+                    List<String> productNameList = contractFrameworkService.getCustomerFrameworkProductNameList(data.getBuyer(), data.getSupplier());
+
                     if (CollectionUtils.isNotEmpty(data.getContractDistributorLineList())) {
                         for (GetContractDistributorLineBo contractDistributorLineBo : data.getContractDistributorLineList()) {
                             if (StringUtils.isNotBlank(contractDistributorLineBo.getProductName())

@@ -39,7 +39,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;

@@ -318,6 +318,10 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
      */
     private LocalDateTime standardizedAt;
 
+    /**
+     * 合同名称（销售合同、销售订单）
+     */
+    private String title;
 
     /**
      * 是否展示正式合同审核按钮(非持久化字段)

@@ -10,8 +10,10 @@ import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
-import com.lframework.xingyun.sc.entity.ContractDistributorLine;
-import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.xingyun.sc.controller.contract.ContractDistributorStandardController;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -23,12 +25,11 @@ 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.entity.ContractStdProcessingLine;
-import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 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.service.contract.ContractFrameworkService;
 import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorLineVo;
@@ -76,7 +77,10 @@ public class ContractDistributorStandardServiceImpl extends
     private ContractStdProcessingLineService contractStdProcessingLineService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
-
+    @Resource
+    private ContractFrameworkService contractFrameworkService;
+    @Resource
+    private SysDataDicItemService sysDataDicItemService;
 
     @Override
     public PageResult<ContractDistributorStandard> query(Integer pageIndex, Integer pageSize, QueryContractDistributorStandardVo vo) {
@@ -129,7 +133,22 @@ public class ContractDistributorStandardServiceImpl extends
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String create(CreateContractDistributorStandardVo vo) {
+        List<String> productNameList = contractFrameworkService.getCustomerFrameworkProductNameList(vo.getBuyer(), vo.getSupplier());
+        String title = "销售订单";
+        List<SysDataDicItem> productDicItemList = sysDataDicItemService.findByDicCode(ContractDistributorStandardController.CONTRACT_PRODUCT_DIC_CODE);
+        Map<String, String> productCodeAndNameMap = productDicItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+
+        for (int i = 0; i < vo.getContractDistributorLineList().size(); i++) {
+            CreateContractDistributorLineVo createContractDistributorLineVo = vo.getContractDistributorLineList().get(i);
+            String productName = productCodeAndNameMap.get(createContractDistributorLineVo.getProductId());
+            if (StringUtils.isNotBlank(productName)
+                    && !productNameList.contains(productName.substring(0, 2))) {
+                title = "销售合同";
+                break;
+            }
+        }
 
+        vo.setTitle(title);
         ContractDistributorStandard data = createContractBase(vo);
 
         OpLogUtil.setVariable("id", data.getId());
@@ -149,7 +168,22 @@ public class ContractDistributorStandardServiceImpl extends
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String createStdContract(CreateContractDistributorStandardVo vo) {
+        List<String> productNameList = contractFrameworkService.getCustomerFrameworkProductNameList(vo.getBuyer(), vo.getSupplier());
+        String title = "销售订单";
+        List<SysDataDicItem> productDicItemList = sysDataDicItemService.findByDicCode(ContractDistributorStandardController.CONTRACT_PRODUCT_DIC_CODE);
+        Map<String, String> productCodeAndNameMap = productDicItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
 
+        for (int i = 0; i < vo.getContractStdProcessingLineList().size(); i++) {
+            CreateContractStdProcessingLineVo createContractStdProcessingLineVo = vo.getContractStdProcessingLineList().get(i);
+            String productName = productCodeAndNameMap.get(createContractStdProcessingLineVo.getProductId());
+            if (StringUtils.isNotBlank(productName)
+                    && !productNameList.contains(productName.substring(0, 2))) {
+                title = "销售合同";
+                break;
+            }
+        }
+
+        vo.setTitle(title);
         ContractDistributorStandard data = createContractBase(vo);
 
         OpLogUtil.setVariable("id", data.getId());
@@ -200,6 +234,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setTotalQuantity(vo.getTotalQuantity());
         data.setParentId(vo.getParentId());
         data.setType(vo.getType());
+        data.setTitle(vo.getTitle());
 
         getBaseMapper().insert(data);
         return data;
@@ -209,7 +244,33 @@ public class ContractDistributorStandardServiceImpl extends
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void update(UpdateContractDistributorStandardVo vo) {
+        List<String> productNameList = contractFrameworkService.getCustomerFrameworkProductNameList(vo.getBuyer(), vo.getSupplier());
+        String title = "销售订单";
+        List<SysDataDicItem> productDicItemList = sysDataDicItemService.findByDicCode(ContractDistributorStandardController.CONTRACT_PRODUCT_DIC_CODE);
+        Map<String, String> productCodeAndNameMap = productDicItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+        if ("PROCESS_STD_AGMT".equals(vo.getType())) {
+            for (int i = 0; i < vo.getContractStdProcessingLineList().size(); i++) {
+                UpdateContractStdProcessingLineVo updateContractStdProcessingLineVo = vo.getContractStdProcessingLineList().get(i);
+                String productName = productCodeAndNameMap.get(updateContractStdProcessingLineVo.getProductId());
+                if (StringUtils.isNotBlank(productName)
+                        && !productNameList.contains(productName.substring(0, 2))) {
+                    title = "销售合同";
+                    break;
+                }
+            }
+        } else {
+            for (int i = 0; i < vo.getContractDistributorLineList().size(); i++) {
+                UpdateContractDistributorLineVo updateContractDistributorLineVo = vo.getContractDistributorLineList().get(i);
+                String productName = productCodeAndNameMap.get(updateContractDistributorLineVo.getProductId());
+                if (StringUtils.isNotBlank(productName)
+                        && !productNameList.contains(productName.substring(0, 2))) {
+                    title = "销售合同";
+                    break;
+                }
+            }
+        }
 
+        vo.setTitle(title);
         ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("合同不存在！");
@@ -247,6 +308,7 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getTotalQuantity, vo.getTotalQuantity())
                 .set(ContractDistributorStandard::getType, vo.getType())
                 .set(ContractDistributorStandard::getParentId, vo.getParentId())
+                .set(ContractDistributorStandard::getTitle, vo.getTitle())
                 .eq(ContractDistributorStandard::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);

 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;
@@ -14,23 +15,35 @@ import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.basedata.entity.ProductVariety;
+import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
 import com.lframework.xingyun.sc.entity.ContractFramework;
 import com.lframework.xingyun.sc.mappers.ContractFrameworkMapper;
 import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractFrameworkVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractFrameworkVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractFrameworkVo;
+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;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFrameworkMapper, ContractFramework> implements ContractFrameworkService {
 
+    @Autowired
+    private ProductVarietyService productVarietyService;
+
     @Override
     public PageResult<ContractFramework> query(Integer pageIndex, Integer pageSize, QueryContractFrameworkVo vo) {
 
@@ -102,6 +115,40 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
         return data.getId();
     }
 
+    @Override
+    public List<String> getCustomerFrameworkProductNameList(String customerId, String company) {
+        if (StringUtils.isBlank(customerId) || StringUtils.isBlank(customerId)) {
+            return new ArrayList<>(0);
+        }
+
+        Wrapper<ContractFramework> contractFrameworkWrapper = Wrappers.lambdaQuery(ContractFramework.class)
+                .eq(ContractFramework::getCustomerId, customerId)
+                .ge(ContractFramework::getValidityTime, LocalDate.now())
+                .ge(ContractFramework::getCompany, company)
+                .eq(ContractFramework::getHasFrameworkAgreement, true);
+        List<ContractFramework> contractFrameworkList = list(contractFrameworkWrapper);
+        List<String> productNameList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(contractFrameworkList)) {
+            List<String> materialTypeIdList = contractFrameworkList.stream()
+                    .filter(bo -> StringUtils.isNotBlank(bo.getMaterialTypeId()))
+                    .flatMap(bo -> Arrays.stream(bo.getMaterialTypeId().split(",")))
+                    .map(String::trim)
+                    .filter(StringUtils::isNotBlank)
+                    .distinct()
+                    .collect(Collectors.toList());
+            List<ProductVariety> productVarietyList = productVarietyService.listByIds(materialTypeIdList);
+            CollectionUtils.emptyIfNull(productVarietyList).forEach(productVariety -> {
+                if (productVariety == null || StringUtils.isBlank(productVariety.getName())) {
+                    return;
+                }
+
+                productNameList.add(productVariety.getName().substring(0, 2));
+            });
+        }
+
+        return productNameList;
+    }
+
     @CacheEvict(value = ContractFramework.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -120,5 +120,4 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      * @return 一年内未签订合同的企业
      */
     List<String> getContractSigned(List<String> buyerList);
-
 }

@@ -39,15 +39,22 @@ public interface ContractFrameworkService extends BaseMpService<ContractFramewor
 
     /**
      * 修改
+     *
      * @param vo
      */
     void update(UpdateContractFrameworkVo vo);
 
     /**
      * 创建
+     *
      * @param vo
      * @return
      */
     String create(CreateContractFrameworkVo vo);
 
+
+    /**
+     * 获取指定客户框架合同的物料名称
+     */
+    List<String> getCustomerFrameworkProductNameList(String customerId, String company);
 }

@@ -310,4 +310,10 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
      */
     @ApiModelProperty(value = "标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
     private String standardApproved;
+
+    /**
+     * 合同名称（销售合同、销售订单）
+     */
+    @ApiModelProperty(value = "合同名称（销售合同、销售订单）")
+    private String title;
 }

@@ -349,4 +349,9 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     @ApiModelProperty(value = "双方盖章合同名称")
     private String signedContractFileName;
 
+    /**
+     * 合同名称（销售合同、销售订单）
+     */
+    @ApiModelProperty(value = "合同名称（销售合同、销售订单）")
+    private String title;
 }

@@ -60,6 +60,7 @@
         <result column="signed_contract_file_name" property="signedContractFileName"/>
         <result column="formalized_at" property="formalizedAt"/>
         <result column="standardized_at" property="standardizedAt"/>
+        <result column="title" property="title"/>
     </resultMap>
 
     <sql id="ContractDistributorStandard_sql">
@@ -119,7 +120,8 @@
                tb.signed_contract_file_id,
                tb.signed_contract_file_name,
                tb.formalized_at,
-               tb.standardized_at
+               tb.standardized_at,
+               tb.title
         FROM tbl_contract_distributor_standard AS tb
     </sql>