Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 35257534bb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-10-23 17:35:15 +08:00
• 846ff28c47 质检模块修改 qianjiawei 2023-10-23 17:35:09 +08:00
• 65dd14d46e 生产 开始中断完成暂停添加状态判断 zhoukeda 2023-10-23 17:05:54 +08:00
• c01d2854dd 重写设备维修新增接口 zhoukeda 2023-10-23 14:33:03 +08:00
• 3e75338075 bug + +字段 zhoukeda 2023-10-21 15:06:13 +08:00
• 9051f99543 设备维修报修列表看板端接口 zhoukeda 2023-10-20 17:28:13 +08:00
• 596f483d63 自检提报也计算预计结束时间 zhoukeda 2023-10-18 18:17:31 +08:00
• 8166acf483 看板移动端任务单列表接口增加字段 任务单开始保存实际开始时间 提报后记录预计结束时间 zhoukeda 2023-10-17 18:45:18 +08:00
• f6a92e607d 修改看板和移动端的任务单列表接口 zhoukeda 2023-10-17 10:44:48 +08:00
• f0704473b6 重写点巡检执行列表 zhoukeda 2023-10-16 15:55:15 +08:00
• 4215ad600f 解决，页面按钮调用预任务执行功能，模型绑定不上的问题 yang.lee 2023-10-16 14:13:43 +08:00
• fda3afc151 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-10-16 13:53:40 +08:00
• 66242f929d 1、解决SnowflakeIdHeler.NextId()空引用问题 2、将Agv心跳检测服务移至自定义定时服务，统一维护管理 yang.lee 2023-10-16 13:53:33 +08:00
• 2cfb43a0f0 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-10-13 16:07:15 +08:00
• ba6a950b31 启动生成质检任务 zhoukeda 2023-10-13 16:07:07 +08:00
• 9597c9b3e5 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-10-13 09:38:11 +08:00
• 02b718157d Wms 预任务执行，新增Agv任务，呼梯任务，电梯任务条件过滤进行区分 yang.lee 2023-10-13 09:38:05 +08:00
• 894e92bb8d 增加租户配置项MultiTenancyType fei.pan 2023-10-11 14:27:40 +08:00
• fa1b602409 注塑挤出排产 zhoukeda 2023-10-11 13:58:37 +08:00
• 8100ce0a21 test by 路段信息注释掉Agv心跳，及定时服务 yang.lee 2023-10-11 10:14:45 +08:00
• 8a7970b3b8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-10-11 10:03:42 +08:00
• 44c85d4e1e Agv心跳检测，包到线程中执行 yang.lee 2023-10-11 10:03:36 +08:00
• acdfa3d33e 删除多余的文件 fei.pan 2023-10-10 16:58:11 +08:00
• e671fd234d 删除OAuthService构造中的，BackgroundService 注入，否则导致登录出错 yang.lee 2023-10-10 16:43:57 +08:00
• e48c76dbe1 恢复Tnb.Server.sln文件 alex 2023-10-10 16:26:31 +08:00
• 3c47fc1924 恢复 .sln 文件 alex 2023-10-10 16:26:05 +08:00
• 4c0e9aaf1d 呼梯时，到指定目标楼层，根据任务的start_floor来 alex 2023-10-10 16:25:32 +08:00
• 18d2fa9b28 恢复Tnb.Serer.sln 文件 alex 2023-10-10 16:22:25 +08:00
• 0896186295 呼梯时，到指定目标楼层，根据任务的start_floor来 alex 2023-10-10 16:03:04 +08:00
• 2d591bfdbc Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-10-10 14:53:31 +08:00
• e4cb261e22 andon增加状态 zhoukeda 2023-10-10 14:53:22 +08:00
• ab9608aec2 取消定时服务发布订阅模式改为存时间轮询方式 alex 2023-10-10 13:23:38 +08:00
• 1cfc9e25e5 1 alex 2023-10-09 17:04:45 +08:00
• 7635cc18c3 将之前，电梯任务执行结束后通知的逻辑代码补上 alex 2023-10-09 17:04:27 +08:00
• a350f122f6 wms，任务新增操作日志 alex 2023-10-09 13:57:01 +08:00
• 0300ea2598 BaseWareHouseService 类静态函数打回原形，改为延迟加载，以避免未登录使用用户情况 alex 2023-10-09 09:32:34 +08:00
• ac1c140e4a 1 alex 2023-10-08 17:44:39 +08:00
• d77286d01c 1 alex 2023-10-08 17:25:38 +08:00
• ed68401030 1 alex 2023-10-08 13:49:53 +08:00
• fd511171f4 1 alex 2023-10-08 13:48:48 +08:00
• 4384fa35eb 1 alex 2023-10-08 13:48:46 +08:00
• 66cbee8bc1 增加SolutionDir配置 PhilPan 2023-10-07 18:44:31 +08:00
• bf0da5eee1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-10-07 17:40:01 +08:00
• 01de378ce2 1 qianjiawei 2023-10-07 17:39:55 +08:00
• 64e793df32 1 zhoukeda 2023-10-07 17:37:24 +08:00
• 861be92ec4 andon相关接口 zhoukeda 2023-10-07 17:28:47 +08:00
• bd86072173 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-10-07 10:51:20 +08:00
• f038e55c7a BUG zhoukeda 2023-10-07 10:51:12 +08:00
• 327ec33c2e 调整，申请电梯开关门逻辑 alex 2023-10-07 10:37:24 +08:00
• 8993fa12cb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-09-28 17:44:08 +08:00
• db451b6c09 调整，取货、放货 确认接口 alex 2023-09-28 17:44:02 +08:00
• b17e4b6deb pad端andon相关接口 zhoukeda 2023-09-28 17:35:34 +08:00
• 73d773c03f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-09-27 17:58:19 +08:00
• 471d614cf2 1、任务执行新增，更具目标库位判断是否为电梯库位进行呼梯操作 2、放货确认接口新增代码逻辑 alex 2023-09-27 17:58:13 +08:00
• b340064db4 Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev PhilPan 2023-09-26 17:55:31 +08:00
• ccebc3dea1 修复钻取一对多子表时条件使用了字段的错误 PhilPan 2023-09-26 17:55:26 +08:00
• c34762b0b3 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-09-26 14:39:13 +08:00
• aca969b55e 天益Wms新增，电梯调度相关操作 alex 2023-09-26 14:39:04 +08:00
• bc8401c8e9 修复DObject转对象的错误，不能使用Adapt，改成使用json反序列化 PhilPan 2023-09-25 11:45:45 +08:00
• 821737473e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-09-24 13:58:25 +08:00
• 8cb934c3b0 将定时任务操作者改为，当前系统管理员 alex 2023-09-24 13:58:17 +08:00
• cde4358fee Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-09-22 16:58:49 +08:00
• 11c2262fe6 优化 zhoukeda 2023-09-22 16:58:41 +08:00
• 712501c0e8 获取vmodel详情时钻取导航属性的模型 PhilPan 2023-09-22 16:53:06 +08:00
• 6f2d70725f 查询模型详情时，钻取导航属性的模型 PhilPan 2023-09-22 16:36:45 +08:00
• 0afd486af2 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-09-21 17:31:58 +08:00
• 9ac8d01626 pad注塑挤出组装包装任务单列表合二为一 zhoukeda 2023-09-21 17:31:43 +08:00
• 5b56135f62 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-09-21 17:31:31 +08:00
• b921a38762 11 qianjiawei 2023-09-21 17:31:24 +08:00
• 1d9e74b45f 工单完成情况汇总 zhoukeda 2023-09-21 15:45:03 +08:00
• df1b6d941f 1 qianjiawei 2023-09-21 10:16:59 +08:00
• 84d65644c7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-09-20 23:08:12 +08:00
• 0f57d7d396 1 qianjiawei 2023-09-20 23:08:04 +08:00
• 9d07e7c068 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-09-20 18:20:21 +08:00
• 8ce7bb540e 继续调整，手动开启定时任务相关逻辑代码，并处理相关bug alex 2023-09-20 18:20:15 +08:00
• 9f21a1986e bug zhoukeda 2023-09-20 17:13:24 +08:00
• f636b12517 上模校验 zhoukeda 2023-09-20 11:32:00 +08:00
• 3592d78fb5 pad注塑挤出接口 zhoukeda 2023-09-19 18:17:13 +08:00
• 1a06f2299a Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-09-19 16:51:06 +08:00
• 6f6a5ecb50 pad 组装包装相关接口 zhoukeda 2023-09-19 16:50:57 +08:00
• 4220ca4b8b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-09-19 15:57:56 +08:00
• f05ece37e5 手动启动，定时任务反射调用放到本地缓存，优化性能 alex 2023-09-19 15:57:51 +08:00
• af8391b22c 修复vengine Release下找不到代码生成路径的错误 PhilPan 2023-09-19 15:49:09 +08:00
• 0bf34fa215 修复清理vengine PhilPan 2023-09-19 10:55:14 +08:00
• b9e9636d72 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-09-19 09:21:59 +08:00
• a80a6fb0bf 1 zhoukeda 2023-09-19 09:21:51 +08:00
• 767076a513 1 alex 2023-09-19 09:14:41 +08:00
• 18b72a8bad 继续调整，原逻辑有问题 alex 2023-09-18 15:48:02 +08:00
• 6cc0529d60 手动启动，定时新增字典缓存，避免多次反射影响性能 alex 2023-09-18 15:07:04 +08:00
• 0ac46b6e65 1 alex 2023-09-18 14:40:21 +08:00
• 64b6a5485c 1 alex 2023-09-18 14:06:43 +08:00
• 1cefb51aa9 1 alex 2023-09-18 11:01:18 +08:00
• 9754199772 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev alex 2023-09-18 10:12:43 +08:00
• 79731d6c67 定时服务启动方式调整，并调整相关业务代码 alex 2023-09-18 10:12:37 +08:00
• 105b5316df 优化 zhoukeda 2023-09-15 15:54:15 +08:00
• 0935137979 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-09-14 17:34:35 +08:00
• 2c5b97859d 模具保养大改 qianjiawei 2023-09-14 17:34:26 +08:00
• dd07ca7e40 组装包装甘特图接口 zhoukeda 2023-09-14 17:25:59 +08:00
• 8b116138f9 1 qianjiawei 2023-09-13 16:15:59 +08:00
• 5365efa279 andon呼叫 aql 模具保养 qianjiawei 2023-09-12 17:33:25 +08:00