Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 624898d4fb fix:内包间行架 yanps 2023-12-29 13:36:20 +08:00
• 6bf3f60a51 rev：新-入库查询报表、新-出库查询报表 liuxy 2023-12-29 13:23:33 +08:00
• 14eb8b81c5 rev:去掉SWAGGER ludj 2023-12-29 09:43:11 +08:00
• a7e2b8d7cd opt:日志优化 zhangzq 2023-12-28 19:42:34 +08:00
• ca77135394 opt:日志优化 zhangzq 2023-12-28 19:34:08 +08:00
• 3bbc5dfef3 rev:临期报表 liuxy 2023-12-28 11:07:28 +08:00
• e0d4df181c Merge remote-tracking branch 'origin/master' lishuai 2023-12-28 09:32:49 +08:00
• d296565a51 fix:内包间行架日志添加 lishuai 2023-12-28 09:32:12 +08:00
• 1a1f45c950 rev:内包间取放货点位查询优化 ZHOUZ\Noble'lift 2023-12-28 09:27:30 +08:00
• 9b9374de04 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-27 17:36:24 +08:00
• 5a4848aa3c rev:纸管出库逻辑优化 ZHOUZ\Noble'lift 2023-12-27 17:35:52 +08:00
• f1e4d5f3f8 fix:内包间行架rgv问题修复 lishuai 2023-12-27 16:51:41 +08:00
• 09b420978c Merge remote-tracking branch 'origin/master' lishuai 2023-12-27 15:47:35 +08:00
• c5915c8434 fix:内包间行架rgv问题修复 lishuai 2023-12-27 15:47:09 +08:00
• d90e133f82 add: 报废出库回传mes liuxy 2023-12-27 15:29:43 +08:00
• d53c970bf0 Merge remote-tracking branch 'origin/master' lishuai 2023-12-27 10:32:42 +08:00
• 6e5ba08885 fix:内包间行架rgv问题修复 lishuai 2023-12-27 10:29:08 +08:00
• adc6d7f74d opt: 优化内包间行架任务下发 yanps 2023-12-26 21:55:40 +08:00
• 116f8a0cfe Merge remote-tracking branch 'origin/master' lishuai 2023-12-26 19:34:17 +08:00
• 7739e9062b fix:rgv行架冲突问题 lishuai 2023-12-26 19:33:19 +08:00
• 3f50358523 rev：系统参数修改 liuxy 2023-12-26 17:13:32 +08:00
• 2d20869770 rev：成品日报更新 liuxy 2023-12-26 17:08:39 +08:00
• 0ec00360d5 rev:去掉ACS的SWAGGER、日志修改 ludj 2023-12-26 16:51:54 +08:00
• ceaa8a0b34 Merge remote-tracking branch 'origin/master' lishuai 2023-12-26 10:24:47 +08:00
• fc48074907 fix:rgv行架冲突问题 lishuai 2023-12-26 10:24:22 +08:00
• e316b1a60e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ludj 2023-12-25 17:09:17 +08:00
• 9695725e76 rev: 日志配置更新 ludj 2023-12-25 17:08:57 +08:00
• 24026c4c2e Merge remote-tracking branch 'origin/master' lishuai 2023-12-25 17:02:09 +08:00
• 2677fa3a39 fix:载具还没横移，下发in到载具任务问题解决 lishuai 2023-12-25 17:00:53 +08:00
• 2b2bc9de54 rev：新版日报修改 liuxy 2023-12-25 15:30:33 +08:00
• 2287effa7c Merge remote-tracking branch 'origin/master' lishuai 2023-12-25 12:36:58 +08:00
• 9dcef9e939 fix:提前完场任务 lishuai 2023-12-25 12:36:29 +08:00
• cbebb04175 rev：解决异步多次请求 gengby 2023-12-25 11:15:15 +08:00
• 3d34802611 rev:内包间页面优化 ZHOUZ\Noble'lift 2023-12-25 10:37:47 +08:00
• 1024462f13 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-25 09:49:40 +08:00
• 543801a5dc rev:搬运气胀轴条件优化 ZHOUZ\Noble'lift 2023-12-25 09:49:31 +08:00
• 885d1ec962 fix:反馈尺寸太慢 lishuai 2023-12-24 09:55:41 +08:00
• 490664c317 Merge remote-tracking branch 'origin/master' lishuai 2023-12-23 17:34:59 +08:00
• 460e6ebadc fix:日志修改 lishuai 2023-12-23 17:34:35 +08:00
• 5688e305cf rev:内包间代码优化 ZHOUZ\Noble'lift 2023-12-23 16:59:05 +08:00
• 9e7675574e Merge remote-tracking branch 'origin/master' lishuai 2023-12-23 08:51:23 +08:00
• 74385c16a6 fix: out到in点修改 lishuai 2023-12-23 08:45:07 +08:00
• 2c804c1a19 rev：兰州需求开发 liuxy 2023-12-22 16:03:54 +08:00
• 478dbc91e9 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-22 14:49:53 +08:00
• 511f4f34eb rev:内包间优化 ZHOUZ\Noble'lift 2023-12-22 14:49:44 +08:00
• 3e6099da0e fix: 西门子输送线横移修复 yanps 2023-12-22 14:47:53 +08:00
• 7ae3d877f0 Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one yanps 2023-12-22 13:53:35 +08:00
• b3554a7c63 fix: 申请套管修复 yanps 2023-12-22 13:53:11 +08:00
• d6e553d8f5 fix:修改 lishuai 2023-12-22 13:52:58 +08:00
• 0cbdf3ccbd rev：页面增加查询条件，提升响应速度；出库管理界面增加显示内容、导出增加显示内容 songxiaopeng 2023-12-22 10:49:17 +08:00
• 246f396a40 rev：页面增加查询条件，提升响应速度；出库管理界面增加显示内容、导出增加显示内容 songxiaopeng 2023-12-22 10:42:36 +08:00
• 46f36461c2 rev 优化 USER-20220102CG\noblelift 2023-12-22 09:44:46 +08:00
• 66e6b8f961 REV 接口异步 USER-20220102CG\noblelift 2023-12-22 03:50:41 +08:00
• bde94691da Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one yanps 2023-12-21 21:58:09 +08:00
• ac809deac4 rev yanps 2023-12-21 21:57:37 +08:00
• 489a0a4b35 rev:内包间改造代码提交 ZHOUZ\Noble'lift 2023-12-21 14:07:02 +08:00
• 5f8b795902 fix:现场测试 lishuai 2023-12-20 18:31:21 +08:00
• ee6fd716bc fix: 内包间行架任务被输送线给下发命令 yanps 2023-12-20 18:23:30 +08:00
• 6e425d4b3c Merge remote-tracking branch 'origin/master' lishuai 2023-12-20 13:39:35 +08:00
• bc4142feb5 fix:现场测试，大屏显示修改 lishuai 2023-12-20 11:32:14 +08:00
• 0a6ccbf76b fix: 指令未满足条件,变成执行中 yanps 2023-12-20 10:58:01 +08:00
• 6560d294f8 fix:tosize添加 lishuai 2023-12-19 09:39:07 +08:00
• 0b764880ad Merge remote-tracking branch 'origin/master' lishuai 2023-12-19 09:29:19 +08:00
• 7085c09289 fix:调试修改 lishuai 2023-12-19 09:28:54 +08:00
• f35bb8e115 fix: 创建任务模板修改 yanps 2023-12-17 11:45:52 +08:00
• f04013cf3d rev 更新 USER-20220102CG\noblelift 2023-12-17 11:37:40 +08:00
• 24286d5e57 fix: 修改paper_array的转换异常 yanps 2023-12-17 11:03:01 +08:00
• be12fd8773 fix:写入修改 lishuai 2023-12-17 10:53:49 +08:00
• 20ba259262 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2023-12-16 10:19:41 +08:00
• 8b63fa3ae0 rev 修改bug USER-20220102CG\noblelift 2023-12-16 10:19:18 +08:00
• 8d3ad8ec6a rev: 业务员更新 liuxy 2023-12-15 16:02:51 +08:00
• 7a43f4679d rev 删除多余日志 USER-20220102CG\noblelift 2023-12-14 17:45:30 +08:00
• 870eddad41 fix: 纸管库出货数量数据格式修改 yanps 2023-12-14 15:52:46 +08:00
• 4338fe8955 opt: 优化设备监控中的纸管库 yanps 2023-12-14 13:50:12 +08:00
• ac19e9145e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-14 09:28:27 +08:00
• 793f8c9cfe rev:代码规范 ZHOUZ\Noble'lift 2023-12-14 09:28:19 +08:00
• d14c0dfa9b opt: 优化创建任务的参数和页面 yanps 2023-12-13 18:01:07 +08:00
• d3dbb4191f add: 添加创建任务的字段 yanps 2023-12-13 15:55:28 +08:00
• b517f41682 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2023-12-13 15:49:47 +08:00
• e0808d770c rev 更新套管工位 USER-20220102CG\noblelift 2023-12-13 15:48:41 +08:00
• b98beff8ce rev 优化 tuqiang 2023-12-13 14:59:06 +08:00
• d1be5733b8 rev:代码规范:去掉未使用的import与格式化 ludj 2023-12-13 13:24:02 +08:00
• 074a6e78cd 代码规范更新 ludj 2023-12-13 13:13:24 +08:00
• d7c8665c54 opt: 套管工位实现套管完成业务 yanps 2023-12-13 10:53:17 +08:00
• 82a8540504 rev:代码规范更新 ludj 2023-12-13 10:16:35 +08:00
• 10b0e6c2eb dev:代码规范 ZHOUZ\Noble'lift 2023-12-13 10:10:16 +08:00
• 52a0ba88ea Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-13 10:02:08 +08:00
• 96f06bb6d0 dev:前端用户名不显示 ZHOUZ\Noble'lift 2023-12-13 10:02:00 +08:00
• a2051a8e2a opt: 内包间驱动优化 yanps 2023-12-13 09:59:13 +08:00
• d31bdc14ce opt: 优化 yanps 2023-12-13 09:58:18 +08:00
• b5b00f0669 rev：更新代码 tuqiang 2023-12-13 09:48:19 +08:00
• a7f50a7e90 Merge remote-tracking branch 'origin/master' tuqiang 2023-12-13 09:47:15 +08:00
• dacad71eac rev:更新驱动点位地址 tuqiang 2023-12-13 09:45:43 +08:00
• e5e6bedffc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-13 09:00:41 +08:00
• ad638ee127 dev:代码优化，该切计划和业务员 ZHOUZ\Noble'lift 2023-12-13 09:00:32 +08:00
• 19ed527a0a fix tuqiang 2023-12-12 16:57:59 +08:00
• 7b27f86111 Merge remote-tracking branch 'origin/master' tuqiang 2023-12-12 16:56:15 +08:00
• 6572957a09 fix:驱动代码修改 tuqiang 2023-12-12 16:54:49 +08:00
• 5ca08b760e rev 优化 USER-20220102CG\noblelift 2023-12-12 16:31:03 +08:00
• 3b742ff9ac Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-12 15:22:03 +08:00