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 |
|
dhb52
|
3b612b2e6d
|
feat: 待回款提醒,即将到期的合同,待审核回款
|
2024-02-07 23:53:48 +08:00 |
|
YunaiV
|
573a79cad6
|
✨ ERP：增加 ERP 调拨单的实现 100%
|
2024-02-07 20:47:26 +08:00 |
|
YunaiV
|
f93963028f
|
✨ ERP：增加 ERP 调拨单的实现 50%
|
2024-02-07 17:01:33 +08:00 |
|
YunaiV
|
7495bb05d1
|
✨ ERP：增加 ERP 客户的实现
|
2024-02-07 15:41:00 +08:00 |
|
YunaiV
|
256d243507
|
✨ ERP：初始化其它出库的实现
|
2024-02-07 15:00:40 +08:00 |
|
YunaiV
|
dbc6134f80
|
✨ ERP：增加库存变更记录
|
2024-02-07 12:24:56 +08:00 |
|
YunaiV
|
3479ef8123
|
✨ ERP：增加金额计算的四舍五入
|
2024-02-07 10:34:23 +08:00 |
|
YunaiV
|
f6d3290426
|
✨ ERP：增加入库单号的自动生成
|
2024-02-07 00:37:42 +08:00 |
|
YunaiV
|
593e1fd59c
|
✨ ERP：增加入库单的审批功能
|
2024-02-06 23:28:57 +08:00 |
|
dhb52
|
6fc8c4809f
|
feat: 合同[审批状态]条件筛选
|
2024-02-06 22:58:01 +08:00 |
|
YunaiV
|
bfe3dc95fe
|
✨ ERP：增加供应商的实现
|
2024-02-06 17:59:44 +08:00 |
|
YunaiV
|
46d26659bf
|
✨ ERP：初始化其它入库的表单 50%
|
2024-02-06 15:58:29 +08:00 |
|
YunaiV
|
db79926c31
|
✨ ERP：完成 stock 产品库存、库存明细的实现
|
2024-02-05 19:24:33 +08:00 |
|
YunaiV
|
4f236c62ee
|
✨ 全局：修改 Vue3 + EP 版本的代码生成的注释相关
|
2024-02-05 19:04:44 +08:00 |
|
杨宇庆
|
5a2554205d
|
解决当某地区有人下单但无人支付时的空指针异常
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-02-04 18:59:53 +00:00 |
|
YunaiV
|
b7654eafea
|
✨ ERP：完成 stock 仓库信息的实现
|
2024-02-05 01:36:34 +08:00 |
|
YunaiV
|
a36ae0c469
|
✨ ERP：完成 product 信息、分类、单位的实现
|
2024-02-05 00:15:51 +08:00 |
|
puhui999
|
84f3b230d2
|
CRM-合同: 新增合同关联商品
|
2024-02-05 00:14:50 +08:00 |
|
安浩浩
|
3213cad317
|
新增：CRM 商业智能，其他排名接口
|
2024-02-04 23:54:58 +08:00 |
|
owen
|
787b0140e7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-02-04 20:58:38 +08:00 |
|
owen
|
5804957149
|
基础设施：前端直连上传，优先使用自定义域名
|
2024-02-04 20:57:06 +08:00 |
|
YunaiV
|
e66ded2860
|
✨ ERP：初始化 product 信息、分类、单位的实现
|
2024-02-04 19:57:47 +08:00 |
|
owen
|
478db1bd39
|
基础设施：增加前端直连上传文件到S3服务的功能
|
2024-02-04 19:44:25 +08:00 |
|
YunaiV
|
bf8ec22144
|
📖 CRM：code review 合同的代码实现
|
2024-02-04 12:57:26 +08:00 |
|
YunaiV
|
3347d3320d
|
📖 CRM：code review 合同的代码实现
|
2024-02-04 09:41:50 +08:00 |
|
芋道源码
|
bb9173f7f0
|
!864 CRM-合同：完善 TODO
Merge pull request !864 from puhui999/develop
|
2024-02-04 01:13:25 +00:00 |
|
puhui999
|
ba6218b835
|
CRM-合同: transfer
|
2024-02-03 22:13:02 +08:00 |
|
puhui999
|
59dfa10461
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
|
2024-02-03 20:52:08 +08:00 |
|
puhui999
|
53badfc367
|
CRM-CONTRACT: 完善合同编辑回显
|
2024-02-03 20:49:13 +08:00 |
|
YunaiV
|
9fbbce4e8d
|
📖 BPMN：code review bpmn 中辅助查找代码
|
2024-02-03 16:12:27 +08:00 |
|
芋道源码
|
b5777b57f1
|
!863 添加assigne处理器
Merge pull request !863 from 云开/feature/BPM_CC_COPY
|
2024-02-03 08:09:11 +00:00 |
|
kyle
|
66615f9e14
|
chore: 整理代码
|
2024-02-03 15:41:57 +08:00 |
|
kyle
|
b2370564a4
|
feat: 添加查找用户的处理器，用于在bpmn中辅助查找用户
|
2024-02-03 15:41:53 +08:00 |
|
puhui999
|
6a63f2f078
|
CRM-CONTRACT: 完善合同编辑回显
|
2024-02-03 14:08:06 +08:00 |
|
puhui999
|
59e6f23788
|
CRM-CONTRACT: 完善 TODO
|
2024-02-03 12:29:28 +08:00 |
|
YunaiV
|
e9a29e6dd4
|
CRM：优化合同金额排行、回款金额排行
|
2024-02-03 01:14:35 +08:00 |
|
芋道源码
|
1fd731a90a
|
!861 修改：CRM 商业智能，合并模块到 crm，优化查询
Merge pull request !861 from 安浩浩/develop
|
2024-02-02 01:29:35 +00:00 |
|
puhui999
|
1a96fb2ffc
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
|
2024-02-01 14:17:15 +08:00 |
|
YunaiV
|
f5f827b59f
|
📖 CRM：code review 合同流程
|
2024-02-01 09:46:32 +08:00 |
|
puhui999
|
624b35988e
|
BPM: 实现业务流程结果监听器
|
2024-02-01 00:45:29 +08:00 |
|
安浩浩
|
46e01e07a8
|
修改：CRM 商业智能，合并模块到 crm，优化查询
|
2024-01-31 23:35:27 +08:00 |
|
芋道源码
|
acb8d3f23b
|
!858 CRM-客户: 完善客户导入
Merge pull request !858 from puhui999/develop
|
2024-01-30 04:41:14 +00:00 |
|
YunaiV
|
6f95f37117
|
📖 CRM：code review 待进入公海的客户
|
2024-01-30 12:40:23 +08:00 |
|
芋道源码
|
cd28128e42
|
!859 feat: CRM-backlog-待进入公海的客户
Merge pull request !859 from dhb52/crm-msg
|
2024-01-30 04:14:32 +00:00 |
|
YunaiV
|
52a68e1838
|
📖 CRM：code review 合同金额排行榜、回款金额排行榜
|
2024-01-30 09:24:42 +08:00 |
|
芋道源码
|
278f220cef
|
!860 新增：CRM 商业智能，合同金额排行榜和回款金额排行榜
Merge pull request !860 from 安浩浩/develop
|
2024-01-30 00:34:50 +00:00 |
|
anhaohao
|
bfed37af6f
|
修改：CRM 商业智能，回款金额排行榜时间字段 bug
|
2024-01-28 21:47:52 +08:00 |
|