kkk-ops
|
df41739244
|
生产计划
|
3 months ago |
|
kkk-ops
|
5f80944898
|
库存查询
|
3 months ago |
|
kkk-ops
|
be560924b5
|
commit
|
3 months ago |
chenyuan
|
ddcc9bf9c1
|
Merge branch 'dev' of https://gitee.com/chenshuichuan/besure_neimeng into dev
|
10 months ago |
|
chenyuan
|
080843cfb8
|
fix erp
|
1 year ago |
|
chenshuichuan
|
328947a8a9
|
fix erp auth
|
2 years ago |
|
chenshuichuan
|
0950f5f4a2
|
fix erp and 供应链大屏
|
2 years ago |
|
chenshuichuan
|
8bf81f1416
|
add device component
|
2 years ago |
|
chenshuichuan
|
16a12628eb
|
add mold record
|
2 years ago |
|
chenyuan
|
d7745a285c
|
add mold product
|
2 years ago |
|
chenshuichuan
|
87e34e30ac
|
fix
|
2 years ago |
|
chenshuichuan
|
29ba7196af
|
fix
|
2 years ago |
|
chenshuichuan
|
4cd7ebcea8
|
fix erp
|
2 years ago |
|
chenshuichuan
|
34713bc663
|
fix erp
|
2 years ago |
|
chenshuichuan
|
344724dee0
|
fix erp
|
2 years ago |
|
chenshuichuan
|
621fceebfa
|
fix some bug and add field
|
2 years ago |
|
chenshuichuan
|
eaa34df5df
|
fix mes stock in and out type
|
2 years ago |
|
chenshuichuan
|
13e6ec043f
|
fix mes some status
|
2 years ago |
|
chenshuichuan
|
99d03b80b5
|
fix feeding and plan
|
2 years ago |
|
chenshuichuan
|
eecdbf01b3
|
fix mes stock workshop
|
2 years ago |
|
chenshuichuan
|
e00d91e7ed
|
fix purchase order
|
2 years ago |
|
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 |