Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• a0b09b8361 feat: getCanMovePointOne 新增校验可用点位 liyongde 2024-06-14 17:10:17 +08:00
• 4a1269fe45 fix: 查找剩余同组分切计划BUG liyongde 2024-06-14 16:29:05 +08:00
• aed5b198ba Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-06-14 14:58:23 +08:00
• 248746de38 opt:6.15上线装箱区代码修改 gongbaoxiong 2024-06-14 14:58:06 +08:00
• 399532c9d2 rev：合并 liuxy 2024-06-14 14:49:48 +08:00
• 788c6cb905 Merge commit 'd5ea6fad1daf9b38262c57ec69eeb915ad1f06ae' into master_merge liuxy 2024-06-14 14:44:45 +08:00
• a66c01549a rev：代码合并 liuxy 2024-06-14 14:14:35 +08:00
• d5ea6fad1d Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms liuxy 2024-06-14 14:13:58 +08:00
• f4c93965b9 rev：出库任务拆分 liuxy 2024-06-14 14:13:50 +08:00
• b035da2cca fix:修复设备监控页面报错问题 tuqiang 2024-06-14 09:37:38 +08:00
• 4c2f358adb Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-14 09:10:34 +08:00
• 14bba1617f Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-06-14 09:09:54 +08:00
• 12a59a083c fix:内包间代码优化 zhouz 2024-06-14 09:07:00 +08:00
• ecb78f88be Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge zhouz 2024-06-14 09:07:38 +08:00
• c40db4deb1 fix:内包间代码优化 zhouz 2024-06-14 09:07:00 +08:00
• d5513d1075 Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-06-13 23:21:31 +08:00
• 3d8a4a0cae opt:优化待检区到装箱区agv搬运任务 gongbaoxiong 2024-06-13 23:21:09 +08:00
• 81d06decbb fix: 查找相同组气胀轴BUG liyongde 2024-06-13 18:19:10 +08:00
• 62bf1f9ef4 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one wangsong 2024-06-13 14:29:40 +08:00
• 5f6e0f61b5 add wangsong 2024-06-13 14:29:00 +08:00
• f299f1c7d5 opt:优化现场联调产生的问题 tuqiang 2024-06-13 13:29:49 +08:00
• 7742b23a55 Merge pull request 'b_lms' (#2) from b_lms into master_merge 龚宝雄 2024-06-12 18:57:32 +08:00
• 5ed5153bb4 opt:优化现场联调产生的一些问题 gongbaoxiong 2024-06-12 18:49:27 +08:00
• 1aa9a90372 Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-06-12 17:02:44 +08:00
• a7f84ba0e2 fix: 呼叫套轴校验是否可成组合的分切计划，继续套轴 liyongde 2024-06-12 17:01:45 +08:00
• cb4117cf73 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-06-12 13:38:18 +08:00
• 6c5bc123c9 fix:反馈ACS管芯库存 zhouz 2024-06-12 11:24:57 +08:00
• ad2879667b fix:反馈ACS管芯库存 zhouz 2024-06-12 11:24:57 +08:00
• c2384e73a4 feat: 手持穿拔轴初始化 liyongde 2024-06-12 10:13:52 +08:00
• 0a98b9ac44 fix: 监控大屏报错调试 lishuai 2024-06-12 09:25:20 +08:00
• 6781a60a3f fix: 一楼联调 lishuai 2024-06-11 14:59:32 +08:00
• 46c641b96b fix: 任务不显示完整气胀轴编码 liyongde 2024-06-11 14:48:31 +08:00
• e9f0a3fcad fix:内包间代码逻辑优化 zhouz 2024-06-11 09:53:22 +08:00
• 506dcbe372 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-06-11 09:53:29 +08:00
• 774fb2baa2 fix:内包间代码逻辑优化 zhouz 2024-06-11 09:53:22 +08:00
• c2a186d387 Merge remote-tracking branch 'origin/master' into master_merge liyongde 2024-06-11 09:43:31 +08:00
• 84af84b50c Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-06-11 09:41:15 +08:00
• 9c84311c22 fix: 忘记把变量写进去了 liyongde 2024-06-11 09:29:59 +08:00
• 14017d88af fix: 气胀轴编码：生产区域+机台编号+分切组+日期+ -轴上下 liyongde 2024-06-11 09:28:30 +08:00
• 753a4df8df fix: 前端大屏显示 lishuai 2024-06-09 10:42:08 +08:00
• 97af976806 add:新增分切行架异常任务下发 tuqiang 2024-06-07 18:11:58 +08:00
• e858f57e76 fix: 无法登录，去除域名配置 liyongde 2024-06-07 17:22:34 +08:00
• dc6904fabd rev：前端修改 liuxy 2024-06-07 17:08:40 +08:00
• 8e19f7c588 merge:配置文件 zhangzq 2024-06-07 17:03:29 +08:00
• 91e0ce0752 merge:冲突处理 zhangzq 2024-06-07 16:59:20 +08:00
• c33ffe440b Merge branch 'master' into b_lms2 zhangzq 2024-06-07 16:21:32 +08:00
• bc4fd0c139 fix:备货区组盘 zhouz 2024-06-07 14:56:05 +08:00
• cca9e80cda fix:纸管库存扣减 zhouz 2024-06-07 09:23:29 +08:00
• c4a92a9d11 Merge remote-tracking branch 'origin/admin' into lms_v1.0.0 liyongde 2024-06-06 17:22:27 +08:00
• aa91a1ba00 add: flyway liyongde 2024-06-06 17:17:41 +08:00
• bfd22526bf add: 添加管芯抓取反馈 yanps 2024-06-06 16:41:33 +08:00
• 0fbc830b00 rev：字段修改 liuxy 2024-06-06 15:54:46 +08:00
• 9cb97a4b59 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-06-06 13:52:39 +08:00
• 19a65d3dd7 fix:废箔AGV任务 zhouz 2024-06-06 13:31:20 +08:00
• 9aba17fd13 rev：成品报废审核增加接口报错信息 liuxy 2024-06-06 09:35:53 +08:00
• 009f331c6d fix: lucene只能在application文件中 liyongde 2024-06-05 20:21:56 +08:00
• 1b38690545 fix: 配置文件整理，将需要修改的统一挪动 liyongde 2024-06-05 20:18:28 +08:00
• 8e63f5246d 代码更新 ludj 2024-06-05 17:55:18 +08:00
• c853b02b51 代码更新 ludj 2024-06-05 17:52:55 +08:00
• 6f1d80737e opt: 废箔称重,agv取废箔联调优化 yanps 2024-06-05 17:43:07 +08:00
• 94f17e8464 rev：报废回传修改 liuxy 2024-06-05 15:24:15 +08:00
• 43135a90ac Merge remote-tracking branch 'origin/admin' into lms_v1.0.0 liyongde 2024-06-05 15:00:39 +08:00
• 77271cc801 rev: admin 配置文件 liyongde 2024-06-05 14:59:51 +08:00
• 3fa97cac25 fix: ACS请求扣除纸管数量 liyongde 2024-06-04 17:04:04 +08:00
• 06214fa21c fix: 异步更新、入库测试 lishuai 2024-06-04 16:49:36 +08:00
• 935fdcaf8f fix: 判断纸管、呼叫AGV更换托盘 liyongde 2024-06-04 15:02:51 +08:00
• f84e0fb42e Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-06-04 10:37:40 +08:00
• ce3324a8af fix;表处代码修改 zhouz 2024-06-04 10:37:35 +08:00
• c6992eb8dc Merge remote-tracking branch 'origin/master' lishuai 2024-06-03 18:35:47 +08:00
• 32f2a07c91 fix: 出库大批量测试、入库测试 lishuai 2024-06-03 18:35:07 +08:00
• e51fd6577a fix: 纸管重量保存失败 liyongde 2024-06-03 15:59:24 +08:00
• 8a517cee3d opt: 分切上料联调优化 yanps 2024-06-02 17:50:18 +08:00
• efd08c55fa opt: 联调优化 yanps 2024-06-01 17:15:31 +08:00
• 12b38767a5 fix: 联调修改 lishuai 2024-06-01 16:41:39 +08:00
• 4b54fdcbd2 Merge remote-tracking branch 'origin/master' lishuai 2024-05-31 17:18:52 +08:00
• 7bc761a53b fix: 联调 lishuai 2024-05-31 17:17:48 +08:00
• 5c1aadb43c opt: agv偏移实现两个点位调整,设备信号优化 yanps 2024-05-31 16:58:01 +08:00
• 1395078a48 fix: 分切下料-下单上单更新库存失败 liyongde 2024-05-31 16:34:33 +08:00
• cf451f52c9 fix:分切行架任务点位修正 zhouz 2024-05-31 16:14:27 +08:00
• 588cbc7767 fix: 分切 liyongde 2024-05-31 15:14:21 +08:00
• dddfe51684 rev:优化路由报错信息 tuqiang 2024-05-31 13:38:39 +08:00
• 89abe2e26d add:新增接口日志 tuqiang 2024-05-31 11:32:17 +08:00
• d2140c8469 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-31 10:16:50 +08:00
• 72863a797b fix:桁架下卷 zhouz 2024-05-31 10:16:43 +08:00
• 179b3eac45 fix: 字段 liyongde 2024-05-31 10:14:11 +08:00
• b366e7f4c5 Merge remote-tracking branch 'origin/admin' into lms_v1.0.0 liyongde 2024-05-31 09:00:44 +08:00
• ac608ed2ca rev：出库口自动分配 liuxy 2024-05-31 09:00:14 +08:00
• bff324b280 Merge remote-tracking branch 'origin/admin' into admin liyongde 2024-05-31 08:52:21 +08:00
• adafb2cec5 rev: admin 修复国际化 liyongde 2024-05-31 08:52:10 +08:00
• 9c0db5c954 rev：代码修改 ludj 2024-05-30 18:09:52 +08:00
• ed4632efd7 add: 分切下料手持功能 liyongde 2024-05-30 17:57:21 +08:00
• b6a19862a5 feat: 分切业务任务取消逻辑 liyongde 2024-05-30 16:58:05 +08:00
• f086d49bf0 rev:优化日志检索页面 tuqiang 2024-05-30 10:58:10 +08:00
• 6e20028867 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2024-05-30 09:52:33 +08:00
• ff8d323008 修改废箔称重业务 USER-20220102CG\noblelift 2024-05-30 09:52:13 +08:00
• 3e7a8f2784 fix: 分切下料上气胀轴任务位置修改 liyongde 2024-05-30 09:48:42 +08:00
• eac3ec19c2 opt: 分切下料联调优化 yanps 2024-05-30 09:07:05 +08:00
• 6ff9f9221d rev：优化日志检索页面 tuqiang 2024-05-29 17:13:58 +08:00
• 484f52f8f7 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms liuxy 2024-05-29 16:26:56 +08:00
• 54c7167565 rev：成品入库优化 liuxy 2024-05-29 16:23:45 +08:00