YunaiV
|
9ea7bde751
|
📖 ERP：增加 ERP 首页的统计
|
2024-02-18 19:05:40 +08:00 |
|
dhb52
|
1ba2b7b600
|
fix: Customer,Clue增加followUpStatus自动查询
|
2024-02-18 00:21:10 +08:00 |
|
dhb52
|
cd1e73cc3f
|
Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
|
2024-02-18 00:05:24 +08:00 |
|
dhb52
|
d23dfd4276
|
feat: CRM/backlog 提醒数量
|
2024-02-18 00:03:11 +08:00 |
|
YunaiV
|
123a009394
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-02-17 23:51:11 +08:00 |
|
YunaiV
|
21452af780
|
✨ 2.0.1 版本发布准备
|
2024-02-17 23:44:23 +08:00 |
|
YunaiV
|
3b2200ad80
|
✨ 2.0.1 版本发布准备
|
2024-02-17 23:26:50 +08:00 |
|
YunaiV
|
08c259424a
|
Merge remote-tracking branch 'origin/master'
|
2024-02-17 21:41:08 +08:00 |
|
YunaiV
|
fb66b2768e
|
✨ 2.0.1 版本发布准备
|
2024-02-17 21:41:02 +08:00 |
|
YunaiV
|
169c1e4907
|
✨ 2.0.1 版本发布准备
|
2024-02-17 21:40:50 +08:00 |
|
YunaiV
|
ce2975a0f1
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCCReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfo.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyServiceTest.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/bo/CrmBusinessUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/bo/CrmContactUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/bo/CrmContractUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/CrmFollowUpRecordService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/CrmFollowUpRecordServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmBusinessFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmClueFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmContactFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmContractFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmCustomerFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/bo/CrmPermissionUpdateReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java
|
2024-02-17 21:04:03 +08:00 |
|
YunaiV
|
20f8cb1606
|
✨ 2.0.1 版本发布准备
|
2024-02-17 21:01:59 +08:00 |
|
YunaiV
|
63f322cb17
|
📖 CRM：code review 前端直接上传
|
2024-02-17 20:35:48 +08:00 |
|
芋道源码
|
b2782e1d9a
|
!865 基础设施：前端直连上传文件
Merge pull request !865 from 疯狂的世界/develop
|
2024-02-17 11:21:06 +00:00 |
|
YunaiV
|
0fba56cda8
|
📖 CRM：code review 合同逻辑
|
2024-02-17 19:14:48 +08:00 |
|
YunaiV
|
c6041da3c4
|
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImplTest.java
|
2024-02-17 18:17:32 +08:00 |
|
芋道源码
|
24b0b166bd
|
!867 解决当某地区有人下单但无人支付时的空指针异常
Merge pull request !867 from 杨宇庆/N/A
|
2024-02-17 10:15:10 +00:00 |
|
YunaiV
|
c40ea1eaa6
|
📖 CRM：code review 商业智能的排行版
|
2024-02-17 18:14:28 +08:00 |
|
芋道源码
|
bba32c6ba3
|
!866 新增：CRM 商业智能，其他排名接口
Merge pull request !866 from 安浩浩/develop
|
2024-02-17 10:06:18 +00:00 |
|
YunaiV
|
5955f39e24
|
📖 CRM：code review 待办项目的实现
|
2024-02-17 18:02:48 +08:00 |
|
芋道源码
|
a03e661a56
|
!868 feat: 待回款提醒,即将到期的合同,待审核回款
Merge pull request !868 from dhb52/develop
|
2024-02-17 08:44:33 +00:00 |
|
YunaiV
|
c777237d93
|
✨ 增加 ERP 系统的介绍
|
2024-02-17 10:11:04 +08:00 |
|
YunaiV
|
94153cb59e
|
✨ 增加 ERP 系统的介绍
|
2024-02-17 10:10:09 +08:00 |
|
dhb52
|
a5d33692c1
|
refactor: TodayCustomer利用CrmCustomerController#getCustomerPage
|
2024-02-16 22:45:37 +08:00 |
|
dhb52
|
72113bbbc6
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2024-02-16 22:16:44 +08:00 |
|
YunaiV
|
eefd787de6
|
✨ ERP：初始化 receipt 收款单的逻辑 100%
|
2024-02-16 08:13:21 +08:00 |
|
YunaiV
|
f93bad282f
|
✨ ERP：初始化 receipt 收款单的逻辑 30%
|
2024-02-15 19:28:54 +08:00 |
|
YunaiV
|
33f654b73b
|
✨ ERP：销售订单的 receiptPrice 调整，为接入财务的收款单做准备
|
2024-02-15 09:16:11 +08:00 |
|
dhb52
|
7936e27ea4
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2024-02-14 19:43:04 +08:00 |
|
YunaiV
|
9e3858aea7
|
✨ ERP：完成 payment 付款单的逻辑 100%
|
2024-02-14 17:13:48 +08:00 |
|
YunaiV
|
0d551a4408
|
✨ ERP：初始化 payment 付款单的逻辑 30%
|
2024-02-14 08:09:15 +08:00 |
|
YunaiV
|
2d43c1f9be
|
✨ ERP：采购订单的 paymentPrice 调整，为接入财务的付款单做准备
|
2024-02-13 14:33:02 +08:00 |
|
YunaiV
|
2d02430768
|
✨ ERP：采购出库 50%
|
2024-02-12 20:42:37 +08:00 |
|
YunaiV
|
62ef4b16af
|
✨ ERP：采购入库 100%
|
2024-02-12 16:51:56 +08:00 |
|
YunaiV
|
0599f5392c
|
✨ ERP：采购入库 50%
|
2024-02-12 10:42:23 +08:00 |
|
YunaiV
|
5d092361ed
|
✨ ERP：基本完成采购订单 100%
|
2024-02-12 10:00:02 +08:00 |
|
YunaiV
|
c5d9ad59e0
|
✨ ERP：初始化采购订单 50%
|
2024-02-12 08:39:43 +08:00 |
|
YunaiV
|
798b72778e
|
✨ ERP：初始化销售退货逻辑 100%
|
2024-02-12 06:52:20 +08:00 |
|
YunaiV
|
926286fe08
|
✨ ERP：初始化销售退货逻辑 50%
|
2024-02-12 06:08:09 +08:00 |
|
YunaiV
|
dbc367ad95
|
✨ ERP：基本完成销售入库模块
|
2024-02-11 22:12:56 +08:00 |
|
YunaiV
|
0694bc8684
|
✨ ERP：完善 ERP 销售出库单的保存
|
2024-02-11 21:19:16 +08:00 |
|
YunaiV
|
09e4763c79
|
✨ ERP：增加 ERP 可出库订单列表
|
2024-02-11 10:33:37 +08:00 |
|
YunaiV
|
6f57987208
|
✨ ERP：增加 ERP 销售出库的实现 30%（列表）
|
2024-02-10 22:47:30 +08:00 |
|
YunaiV
|
3c6ab397f9
|
✨ ERP：初始化销售出库 30%
|
2024-02-10 18:20:59 +08:00 |
|
YunaiV
|
d06a22dab3
|
✨ ERP：增加结算账户 100%
|
2024-02-10 08:32:27 +08:00 |
|
YunaiV
|
5fd23cacc7
|
✨ ERP：增加 ERP 销售订单的实现 50%（详情）
新年快乐~
|
2024-02-10 00:07:08 +08:00 |
|
YunaiV
|
30de2176a4
|
✨ ERP：增加 ERP 销售订单的实现 50%
|
2024-02-09 20:03:02 +08:00 |
|
puhui999
|
51b53d6ed8
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ProductServiceImplTest.java
|
2024-02-08 11:54:04 +08:00 |
|
puhui999
|
9caaa96e5b
|
CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品
|
2024-02-08 11:53:23 +08:00 |
|
YunaiV
|
94247addc6
|
✨ ERP：增加 ERP 盘点单的实现 100%
|
2024-02-08 06:59:19 +08:00 |
|