1.0.55 报价单后端生成单号

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java

@@ -30,6 +30,7 @@ import org.dromara.oa.crm.mapper.CrmQuoteInfoMapper;
 import org.dromara.oa.crm.mapper.CrmQuoteMaterialMapper;
 import org.dromara.oa.crm.service.ICrmCustomerContactService;
 import org.dromara.oa.crm.service.ICrmQuoteInfoService;
+import org.dromara.system.api.RemoteCodeRuleService;
 import org.dromara.workflow.api.RemoteWorkflowService;
 import org.dromara.workflow.api.domain.RemoteStartProcess;
 import org.dromara.workflow.api.event.ProcessEvent;
@@ -62,6 +63,9 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService {
     @DubboReference(timeout = 30000)
     private RemoteWorkflowService remoteWorkflowService;
 
+    @DubboReference()
+    private RemoteCodeRuleService remoteCodeRuleService;
+
     /**
      * 查询报价单信息
      *
@@ -191,6 +195,10 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService {
     public Boolean insertByBo(CrmQuoteInfoBo bo) {
         CrmQuoteInfo add = MapstructUtils.convert(bo, CrmQuoteInfo.class);
         validEntityBeforeSave(add);
+
+        String quoteCode = remoteCodeRuleService.selectCodeRuleCode("1004");
+        add.setQuoteCode(quoteCode);
+
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setQuoteId(add.getQuoteId());

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java

@@ -124,6 +124,16 @@ public class ErpProjectInfoBo extends BaseEntity {
      */
     private Long contractId;
 
+    /**
+     * 合同编号
+     */
+    private String contractCode;
+
+    /**
+     * 合同名称
+     */
+    private String contractName;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java

@@ -136,6 +136,8 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
             .eq(StringUtils.isNotBlank(bo.getProjectStatus()), ErpProjectInfo::getProjectStatus, bo.getProjectStatus())
             .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpProjectInfo::getFlowStatus, bo.getFlowStatus())
             .eq(bo.getContractId() != null, ErpProjectInfo::getContractId, bo.getContractId())
+            .like(StringUtils.isNotBlank(bo.getContractCode()), "c.contract_code", bo.getContractCode())
+            .like(StringUtils.isNotBlank(bo.getContractName()), "c.contract_name", bo.getContractName())
             .eq(ErpProjectInfo::getProjectCategory, ProjectCategoryConstant.CONTRACT_ORDER)
             .eq("t.del_flag", "0")
             .orderByDesc(ErpProjectInfo::getCreateTime);