Commit Graph

1254 Commits

Author SHA1 Message Date
1513bb4964 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-27 17:44:32 +08:00
7454827e0f connect: 对接预警编辑 2024-07-27 17:44:23 +08:00
钟喜旺
64acaffb5b fix: add a validation 2024-07-27 11:18:44 +08:00
钟喜旺
e312792472 fix: 调整dto映射 2024-07-27 10:11:29 +08:00
钟喜旺
3df894d20b fix: 节点表添加子系统名称 2024-07-27 09:39:02 +08:00
钟喜旺
9494ca2cb7 feat: 轨迹映射-新增拉取界面增加字段:触发拉取节点 2024-07-26 21:04:19 +08:00
707a05f911 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 17:58:07 +08:00
dd8a8065cc temp 2024-07-26 17:57:58 +08:00
钟喜旺
2f172f43c0 feat: 轨迹映射-新增拉取界面增加字段:触发拉取节点 2024-07-26 17:56:03 +08:00
钟喜旺
9eec434dae Merge branch 'S04轨迹预警' into dev 2024-07-26 17:25:28 +08:00
钟喜旺
91da2f111f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
2024-07-26 17:24:51 +08:00
钟喜旺
4a0df97333 feat: 轨迹节点页面 2024-07-26 17:23:00 +08:00
ae0059eeaf Merge branch 'refs/heads/S04轨迹预警' into dev 2024-07-26 17:12:59 +08:00
f00805437d connect:预警规则列表动态计算好给到前端 2024-07-26 17:12:46 +08:00
钟喜旺
d5135249f7 fix: 调整order 表 2024-07-26 16:20:07 +08:00
钟喜旺
7cac2c55ee Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 16:13:15 +08:00
88c9413881 Merge branch 'refs/heads/S04轨迹预警' into dev 2024-07-26 16:13:03 +08:00
钟喜旺
5b4c300baf fix: 调整表结构 2024-07-26 16:13:01 +08:00
c7ae4e9d05 connect:对接预警查询 2024-07-26 16:12:43 +08:00
597f5741da Merge branch 'refs/heads/S04轨迹预警' into dev 2024-07-26 16:00:17 +08:00
06d51528b0 fix:表名attribute 2024-07-26 16:00:07 +08:00
86a0332886 fix:CalcRuleList 2024-07-26 15:54:54 +08:00
0be6d452ee fix:CalcRuleList 2024-07-26 15:54:21 +08:00
钟喜旺
45ce7a9949 feat: 订单表添加州省和邮编
alter table t_order add Postcode  varchar(64)  null comment '邮编';
alter table t_order add Province  varchar(64)  null comment '省份';
2024-07-26 15:34:39 +08:00
钟喜旺
02edff1580 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 15:12:54 +08:00
钟喜旺
bd8879885b fix: 调整area的表名 2024-07-26 15:12:43 +08:00
e4b8fb4fcf Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 12:59:11 +08:00
061cffc6c3 add:预警crud 2024-07-26 12:59:01 +08:00
钟喜旺
60ff61e030 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 10:27:21 +08:00
钟喜旺
24e95d7fad feat: 轨迹映射界面的拉取配置将“轨迹时区”改成“兜底轨迹时区”,“轨迹发生地”改成“兜底轨迹发生地” 2024-07-26 10:24:20 +08:00
9ba1ee660b Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-25 21:06:18 +08:00
c3f904ccdc importance:预警初步重构 2024-07-25 21:06:06 +08:00
钟喜旺
aae9add71c feat: 轨迹映射界面的推送配置增加推送时间格式 开发测试完成 2024-07-25 15:03:47 +08:00
钟喜旺
740bc61558 feat: 还原 2024-07-25 10:33:14 +08:00
钟喜旺
2f5354960d feat: 补充注释 2024-07-25 10:32:01 +08:00
钟喜旺
d67c7ce820 feat: 轨迹映射界面的推送配置增加推送时间格式 2024-07-25 09:26:07 +08:00
f42287a7f8 temp 2024-07-24 15:15:44 +08:00
fdcc81ba0e fix:【【轨迹订单pet】干线提单新增轨迹后,未推送到箱单和小包运输单上】https://www.tapd.cn/60863849/bugtrace/bugs/view/1160863849001043303 2024-07-24 14:22:53 +08:00
c772c68e47 review 2024-07-24 11:14:58 +08:00
DESKTOP-S2TSHMH\BSI
895e12762d feat: 预警功能相关代码 2024-07-24 08:54:56 +08:00
DESKTOP-S2TSHMH\BSI
0d28d10ef8 Merge branch 'dev' into S04轨迹预警 2024-07-19 15:28:42 +08:00
DESKTOP-S2TSHMH\BSI
83a375cdd3 feat: 修改开发数据库为DEV 2024-07-19 15:28:26 +08:00
8ce26fe28d 优化日志 2024-07-16 15:10:26 +08:00
lipengjun
01cab202c8 Merge pull request 'S03-轨迹中台优化项' (#66) from S03-轨迹中台优化项 into uat
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/66
2024-06-26 14:48:58 +08:00
93197a83d8 Merge branch 'refs/heads/S03-轨迹中台优化项' into dev 2024-06-25 18:01:16 +08:00
328e5adfed Merge branch 'refs/heads/S03-轨迹中台优化项' into test 2024-06-25 18:00:19 +08:00
8a369ff049 Merge branch 'refs/heads/S33-中台token优化' into S03-轨迹中台优化项
# Conflicts:
#	src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
2024-06-25 17:58:51 +08:00
38b71be71d Merge branch 'refs/heads/S33-中台token优化' into dev
# Conflicts:
#	src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
2024-06-25 17:56:51 +08:00
47ea3b8f82 token解析变更 2024-06-25 17:53:56 +08:00
843cc7ac26 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
2024-06-25 17:44:43 +08:00