YunaiV
|
d947d0463a
|
(〃'▽'〃)_v2026_03_发布：新增 MES 制造执行系统，IoT 接入 Modbus 协议
|
2026-04-18 12:54:45 +08:00 |
|
YunaiV
|
05375287bc
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2026-04-18 12:54:16 +08:00 |
|
YunaiV
|
f5f53d59ca
|
(〃'▽'〃)_v2026_03_发布：新增 MES 制造执行系统，IoT 接入 Modbus 协议
|
2026-04-18 12:53:48 +08:00 |
|
YunaiV
|
838e2923bb
|
【同步】BOOT 和 CLOUD 的功能（MES）
|
2026-04-18 10:25:37 +08:00 |
|
YunaiV
|
83ea45911b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/client/vo/MesMdClientSaveReqVO.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/vendor/vo/MesMdVendorSaveReqVO.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/vo/MesTmToolSaveReqVO.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/vo/type/MesTmToolTypeSaveReqVO.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workrecord/MesProWorkRecordDO.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardService.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProductBomServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcLineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateIndicatorServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolTypeServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueDetailServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptDetailServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageLineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueDetailServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesDetailServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java
# yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java
|
2026-04-18 10:15:19 +08:00 |
|
YunaiV
|
81009a7082
|
【同步】BOOT 和 CLOUD 的功能（mes）
|
2026-04-18 10:14:37 +08:00 |
|
YunaiV
|
11ff5b4a7c
|
【同步】BOOT 和 CLOUD 的功能（mes）
|
2026-04-18 10:04:51 +08:00 |
|
YunaiV
|
b794031b71
|
feat：增加 iot 模块
|
2026-04-12 21:02:14 +08:00 |
|
YunaiV
|
199799b0c9
|
feat(mes)：增加 mes 模块
|
2026-04-12 16:19:13 +08:00 |
|
YunaiV
|
86087983a7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-04-06 22:48:51 +08:00 |
|
YunaiV
|
2eb326d62d
|
【同步】BOOT 和 CLOUD 的功能（mes）
|
2026-04-06 22:48:22 +08:00 |
|
YunaiV
|
1e14c5c38f
|
【同步】BOOT 和 CLOUD 的功能（mes）
|
2026-04-06 22:47:52 +08:00 |
|
YunaiV
|
d9b57e6897
|
【同步】BOOT 和 CLOUD 的功能（MES）
|
2026-04-06 22:37:11 +08:00 |
|
YunaiV
|
dc0ca32697
|
【同步】BOOT 和 CLOUD 的功能（MES）
|
2026-04-06 22:30:24 +08:00 |
|
YunaiV
|
79f233149c
|
【同步】BOOT 和 CLOUD 的功能（MES）
|
2026-04-06 22:27:16 +08:00 |
|
YunaiV
|
b38cbe9c7f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-04-06 22:21:31 +08:00 |
|
YunaiV
|
9d2392a81a
|
【同步】BOOT 和 CLOUD 的功能（mes）
|
2026-04-06 22:21:25 +08:00 |
|
YunaiV
|
2b9a03bd93
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-gateway/src/main/resources/application.yaml
|
2026-04-06 21:06:27 +08:00 |
|
YunaiV
|
16e095c343
|
【同步】BOOT 和 CLOUD 的功能（mes）
|
2026-04-06 21:01:44 +08:00 |
|
YunaiV
|
804d3eaaeb
|
【同步】BOOT 和 CLOUD 的功能
|
2026-04-06 20:15:50 +08:00 |
|
YunaiV
|
8937853307
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-03-28 16:17:38 +08:00 |
|
YunaiV
|
9ffec01fa0
|
refactor(iot): update import paths for IotDeviceStateEnum to reflect new package structure
|
2026-03-28 16:17:16 +08:00 |
|
YunaiV
|
3f599a623a
|
【同步】BOOT 和 CLOUD 的功能
|
2026-03-08 10:18:09 +08:00 |
|
YunaiV
|
bb3f1954ee
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/app/tenant/AppTenantController.java
|
2026-03-08 10:14:33 +08:00 |
|
YunaiV
|
34d74b378e
|
【同步】BOOT 和 CLOUD 的功能
|
2026-03-08 10:14:09 +08:00 |
|
芋道源码
|
53d3146ad9
|
!243 fix(trade): 修复订单项价格计算逻辑
Merge pull request !243 from irongroup/master-jdk17-sync
|
2026-03-08 01:51:21 +00:00 |
|
tqliang
|
a61ecaa019
|
fix(trade): 修复售后日志记录中的错误引用和排序问题
- 修正了AfterSaleLogAspect中对operateType的错误引用
- 将AfterSaleLogMapper中的排序字段从createTime改为id以确保正确顺序
- 确保售后操作日志能够正确显示和按预期排序
|
2026-03-05 11:19:37 +08:00 |
|
tqliang
|
f969670fd3
|
fix(trade): 修复订单项价格计算逻辑
- 将价格计算从使用原始价格改为使用支付价格
- 确保价格分配计算的准确性
- 解决因价格比例分配可能导致的计算误差问题
|
2026-02-27 08:51:45 +08:00 |
|
YunaiV
|
1fca0acc92
|
【同步】BOOT 和 CLOUD 的功能（IoT）
|
2026-02-14 16:52:20 +08:00 |
|
YunaiV
|
6ca2c97849
|
【同步】BOOT 和 CLOUD 的功能（IoT）
|
2026-02-14 16:41:18 +08:00 |
|
YunaiV
|
71393eed21
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusProperties.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotDeviceRegisterReqDTO.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotSubDeviceRegisterReqDTO.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/topo/IotDeviceTopoAddReqDTO.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayProperties.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/AbstractIotProtocolDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/coap/IotCoapDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/coap/IotCoapUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/emqx/IotEmqxAuthEventProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/emqx/IotEmqxUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/http/IotHttpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/http/IotHttpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/IotMqttDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/IotMqttUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotTcpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotTcpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/udp/IotUdpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/udp/IotUdpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/websocket/IotWebSocketDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/websocket/IotWebSocketUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/rule/IotSceneRuleMessageSubscriber.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
|
2026-02-14 16:36:52 +08:00 |
|
YunaiV
|
92eda45afd
|
【同步】BOOT 和 CLOUD 的功能（IoT）
|
2026-02-14 16:35:48 +08:00 |
|
YunaiV
|
2d4251eda7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud into master-jdk17
|
2026-02-14 16:07:31 +08:00 |
|
YunaiV
|
06586b85f6
|
【同步】BOOT 和 CLOUD 的功能
|
2026-02-14 16:07:21 +08:00 |
|
芋道源码
|
7dc6b24e66
|
!241 feat(trade): 添加快递轨迹时间字段反序列化配置
Merge pull request !241 from wuKong/feat/feat(trade)-添加快递轨迹时间字段反序列化配置
|
2026-01-30 10:14:22 +00:00 |
|
wuKong
|
4052c5c4d0
|
feat(trade): 添加快递轨迹时间字段反序列化配置
- 引入 LocalDateTimeDeserializer 处理轨迹时间字段
- 配置 time 字段使用自定义反序列化器
- 确保快递轨迹时间格式正确解析
|
2026-01-30 14:55:46 +08:00 |
|
YunaiV
|
a3db49babf
|
(〃'▽'〃) v2026.01 发布：大大大大完善 vben5 的 antd、vben 版本的功能，新增 IoT 各种接入协议
|
2026-01-29 23:32:29 +08:00 |
|
YunaiV
|
33ff11edcf
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2026-01-29 23:31:28 +08:00 |
|
YunaiV
|
b8a213849c
|
(〃'▽'〃) v2026.01 发布：大大大大完善 vben5 的 antd、vben 版本的功能，新增 IoT 各种接入协议
|
2026-01-29 23:29:40 +08:00 |
|
YunaiV
|
5a0d95e493
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-01-29 22:39:15 +08:00 |
|
YunaiV
|
622db6dc73
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java
# yudao-module-bpm/yudao-module-bpm-server/src/main/resources/application-local.yaml
|
2026-01-29 22:38:27 +08:00 |
|
YunaiV
|
456c96df16
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:38:05 +08:00 |
|
YunaiV
|
560636ed50
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:36:17 +08:00 |
|
YunaiV
|
8fd3173670
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:29:41 +08:00 |
|
YunaiV
|
c57d3a65f9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotDeviceAuthReqDTO.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
|
2026-01-29 22:25:16 +08:00 |
|
YunaiV
|
2a48bcbee9
|
Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java
|
2026-01-29 22:14:16 +08:00 |
|
YunaiV
|
fa72dc4e59
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:14:05 +08:00 |
|
芋道源码
|
ad68973d19
|
!237 删除AsyncListenableTaskExecutor配置
Merge pull request !237 from alexz10248080/master
|
2026-01-25 12:55:07 +00:00 |
|
芋道源码
|
eee662adaf
|
!238 删除AsyncListenableTaskExecutor配置
Merge pull request !238 from alexz10248080/master-jdk17
|
2026-01-25 12:55:01 +00:00 |
|
芋道源码
|
35ccc5eaa4
|
!240 AuthLoginReqVO同步AuthRegisterReqVO、TenantSaveReqVO、UserSaveReqVO的username验证
Merge pull request !240 from kangxinghua/master
|
2026-01-25 12:43:56 +00:00 |