chenshuichuan
|
8a3eec1373
|
add task and plan
|
2 years ago |
|
chenshuichuan
|
a2a2b50ac7
|
add item analysis
|
2 years ago |
|
chenshuichuan
|
4445d42621
|
add auto code
|
2 years ago |
|
chenshuichuan
|
26fac3bc25
|
fix stock category
|
2 years ago |
|
chenshuichuan
|
a73a5d7bbb
|
stock add categoryId
|
2 years ago |
|
chenshuichuan
|
ca5cfa720b
|
add plan 关联
|
2 years ago |
|
chenshuichuan
|
f317b2e8f9
|
fix task
|
2 years ago |
|
chenshuichuan
|
15ac0a328e
|
add iot module
|
2 years ago |
|
chenshuichuan
|
c45a0f8df6
|
fix task
|
2 years ago |
|
chenshuichuan
|
cf9f50266f
|
fix product
|
2 years ago |
|
chenyuan
|
42eb696cc9
|
fix mold
|
2 years ago |
|
chenyuan
|
b722c53492
|
fix auto code
|
2 years ago |
|
chenyuan
|
f1c0533899
|
add auto code
|
2 years ago |
|
chenyuan
|
1ea1f11eb9
|
add mold
|
2 years ago |
|
chenyuan
|
becedb5388
|
fix erp
|
2 years ago |
YunaiV
|
b44eab7f93
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
|
2 years ago |
|
YunaiV
|
9cba258d8f
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
|
YunaiV
|
1904f8ca88
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
1e348dbf83
|
【优化】将项目的 annotations 统一修改成 annotation 包
|
2 years ago |
|
YunaiV
|
9b9f54bb03
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
|
2 years ago |
|
YunaiV
|
83623a024f
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2 years ago |
|
YunaiV
|
01cfa60a64
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2CreateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
|
2 years ago |
|
YunaiV
|
20583417a4
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2 years ago |
|
YunaiV
|
a80ba48889
|
bugfix：同步 master 修改的 bug
|
2 years ago |
zengheng
|
a541762697
|
修复erp采购管理采购订单菜单权限错误的bug
|
2 years ago |
|
YunaiV
|
c3717b68c8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
1f4889c68e
|
✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter
|
2 years ago |
|
YunaiV
|
ece338846a
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
|
2 years ago |
|
芋道源码
|
ccc0a09317
|
!877 修正注释错误
Merge pull request !877 from moon69/master
|
2 years ago |
|
YunaiV
|
d134bfc4a6
|
✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类
|
2 years ago |
|
YunaiV
|
02466aca2e
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
YunaiV
|
656c3a77ec
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/event/BpmProcessInstanceResultEvent.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/listener/BpmServiceResultListener.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/backlog/CrmBacklogController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/type/CrmBusinessStatusTypeSaveReqVO.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/clue/vo/CrmClueTranslateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.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/controller/admin/receivable/vo/plan/CrmReceivablePlanUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableUpdateReqVO.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/CrmBusinessStatusService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/bo/CrmBusinessUpdateProductReqBO.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/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractResultListener.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/followup/bo/CrmUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogService.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/CrmPermissionTransferReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customerlimitconfig/CrmCustomerLimitConfigServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
|
2 years ago |
|
YunaiV
|
088fbb2096
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
|
YunaiV
|
e53a0ca884
|
✨ CRM：code review 客户导入
|
2 years ago |
moon69
|
a8ee4a85ce
|
修正注释错误
|
2 years ago |
|
YunaiV
|
9ea7bde751
|
📖 ERP：增加 ERP 首页的统计
|
2 years ago |
|
YunaiV
|
fb66b2768e
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
YunaiV
|
169c1e4907
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
YunaiV
|
94153cb59e
|
✨ 增加 ERP 系统的介绍
|
2 years ago |
|
YunaiV
|
eefd787de6
|
✨ ERP：初始化 receipt 收款单的逻辑 100%
|
2 years ago |
|
YunaiV
|
f93bad282f
|
✨ ERP：初始化 receipt 收款单的逻辑 30%
|
2 years ago |
|
YunaiV
|
33f654b73b
|
✨ ERP：销售订单的 receiptPrice 调整，为接入财务的收款单做准备
|
2 years ago |
|
YunaiV
|
9e3858aea7
|
✨ ERP：完成 payment 付款单的逻辑 100%
|
2 years ago |
|
YunaiV
|
0d551a4408
|
✨ ERP：初始化 payment 付款单的逻辑 30%
|
2 years ago |
|
YunaiV
|
2d43c1f9be
|
✨ ERP：采购订单的 paymentPrice 调整，为接入财务的付款单做准备
|
2 years ago |
|
YunaiV
|
2d02430768
|
✨ ERP：采购出库 50%
|
2 years ago |
|
YunaiV
|
62ef4b16af
|
✨ ERP：采购入库 100%
|
2 years ago |
|
YunaiV
|
0599f5392c
|
✨ ERP：采购入库 50%
|
2 years ago |
|
YunaiV
|
5d092361ed
|
✨ ERP：基本完成采购订单 100%
|
2 years ago |
|
YunaiV
|
c5d9ad59e0
|
✨ ERP：初始化采购订单 50%
|
2 years ago |
|
YunaiV
|
798b72778e
|
✨ ERP：初始化销售退货逻辑 100%
|
2 years ago |
|
YunaiV
|
926286fe08
|
✨ ERP：初始化销售退货逻辑 50%
|
2 years ago |
|
YunaiV
|
dbc367ad95
|
✨ ERP：基本完成销售入库模块
|
2 years ago |
|
YunaiV
|
0694bc8684
|
✨ ERP：完善 ERP 销售出库单的保存
|
2 years ago |
|
YunaiV
|
09e4763c79
|
✨ ERP：增加 ERP 可出库订单列表
|
2 years ago |
|
YunaiV
|
6f57987208
|
✨ ERP：增加 ERP 销售出库的实现 30%（列表）
|
2 years ago |
|
YunaiV
|
3c6ab397f9
|
✨ ERP：初始化销售出库 30%
|
2 years ago |
|
YunaiV
|
d06a22dab3
|
✨ ERP：增加结算账户 100%
|
2 years ago |
|
YunaiV
|
5fd23cacc7
|
✨ ERP：增加 ERP 销售订单的实现 50%（详情）
新年快乐~
|
2 years ago |
|
YunaiV
|
30de2176a4
|
✨ ERP：增加 ERP 销售订单的实现 50%
|
2 years ago |
|
YunaiV
|
94247addc6
|
✨ ERP：增加 ERP 盘点单的实现 100%
|
2 years ago |
|
YunaiV
|
573a79cad6
|
✨ ERP：增加 ERP 调拨单的实现 100%
|
2 years ago |
|
YunaiV
|
f93963028f
|
✨ ERP：增加 ERP 调拨单的实现 50%
|
2 years ago |
|
YunaiV
|
7495bb05d1
|
✨ ERP：增加 ERP 客户的实现
|
2 years ago |
|
YunaiV
|
256d243507
|
✨ ERP：初始化其它出库的实现
|
2 years ago |
|
YunaiV
|
dbc6134f80
|
✨ ERP：增加库存变更记录
|
2 years ago |
|
YunaiV
|
3479ef8123
|
✨ ERP：增加金额计算的四舍五入
|
2 years ago |
|
YunaiV
|
f6d3290426
|
✨ ERP：增加入库单号的自动生成
|
2 years ago |
|
YunaiV
|
593e1fd59c
|
✨ ERP：增加入库单的审批功能
|
2 years ago |
|
YunaiV
|
bfe3dc95fe
|
✨ ERP：增加供应商的实现
|
2 years ago |
|
YunaiV
|
46d26659bf
|
✨ ERP：初始化其它入库的表单 50%
|
2 years ago |
|
YunaiV
|
db79926c31
|
✨ ERP：完成 stock 产品库存、库存明细的实现
|
2 years ago |
|
YunaiV
|
b7654eafea
|
✨ ERP：完成 stock 仓库信息的实现
|
2 years ago |
|
YunaiV
|
a36ae0c469
|
✨ ERP：完成 product 信息、分类、单位的实现
|
2 years ago |
|
YunaiV
|
e66ded2860
|
✨ ERP：初始化 product 信息、分类、单位的实现
|
2 years ago |
|
YunaiV
|
52a68e1838
|
📖 CRM：code review 合同金额排行榜、回款金额排行榜
|
2 years ago |
|
YunaiV
|
6e005f46d9
|
✨ ERP：【销售订单】初始化
|
2 years ago |
|
YunaiV
|
ebd9222764
|
✨ ERP：初始化模块，立个 2024 年的 flag
|
2 years ago |