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 |
|
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 |
|
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 |
|
YunaiV
|
b7654eafea
|
✨ ERP:完成 stock 仓库信息的实现
|
2024-02-05 01:36:34 +08:00 |
|
YunaiV
|
a36ae0c469
|
✨ ERP:完成 product 信息、分类、单位的实现
|
2024-02-05 00:15:51 +08:00 |
|