6322 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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