Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 19a263caf6 Merge remote-tracking branch 'origin/admin' into lms_v1.0.0 liyongde 2024-05-29 16:13:01 +08:00
• 7659065a68 rev: api位置挪动 liyongde 2024-05-29 15:16:08 +08:00
• 7f57246adf fix: 添加缺省国际化 liyongde 2024-05-29 09:40:49 +08:00
• 0640811a60 Merge remote-tracking branch 'origin/admin' into lms_v1.0.0 liyongde 2024-05-29 09:10:58 +08:00
• bba3cdc35b rev: i18n位置挪动 liyongde 2024-05-29 09:09:47 +08:00
• 9736ad6807 rev:删除多余图片 ludj 2024-05-29 08:45:46 +08:00
• bcb6d51f2f Merge remote-tracking branch 'origin/admin' into lms_v1.0.0 liyongde 2024-05-28 17:17:55 +08:00
• df89d088a3 代码格式调整 ludj 2024-05-28 16:31:14 +08:00
• 157aea57b1 Merge remote-tracking branch 'origin/admin' into lms_v1.0.0 liyongde 2024-05-28 16:04:13 +08:00
• 8bf43d5cc7 前端样式修改 ludj 2024-05-28 16:02:04 +08:00
• e388b3debe 前端样式修改 ludj 2024-05-28 15:56:00 +08:00
• 2ffd105ac0 新建测试 ludj 2024-05-28 15:48:39 +08:00
• 349ed3c90d test: 测试 liyongde 2024-05-28 15:40:53 +08:00
• 20bc00c0ca Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-28 09:26:47 +08:00
• 5939a0e520 fix:出入库流程修改 zhouz 2024-05-28 09:26:40 +08:00
• a50c10c032 opt: AGV偏移功能优化 yanps 2024-05-27 19:43:14 +08:00
• 01bf0d484b opt:修改查询木箱信息 gongbaoxiong 2024-05-27 16:11:32 +08:00
• c22c382bdf refactor: nladmin-lms init liyongde 2024-05-27 15:38:56 +08:00
• 1179a5f154 fix: logback-spring.xml配置dev liyongde 2024-05-27 14:31:50 +08:00
• f5e6db390a refactor: 前后端基础部分 liyongde 2024-05-27 14:15:48 +08:00
• 0636d1170d rev：向txt文件中新增字段 liuxy 2024-05-27 13:55:12 +08:00
• bd090a67af add：子卷包装关系增加字段 liuxy 2024-05-27 11:10:37 +08:00
• 2f446cb2cd Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-05-27 11:05:48 +08:00
• 057e09e545 fix:新增包装关系字段 ZHOUZ\Noble'lift 2024-05-27 11:05:39 +08:00
• 6ebf142c23 add:新增定时清理设备故障表任务 tuqiang 2024-05-27 10:58:53 +08:00
• f23e4548cd Initial commit 管理员 2024-05-27 09:48:12 +08:00
• 7abf41f2f4 fix: 出库联调修改 lishuai 2024-05-27 09:32:02 +08:00
• 3b4576ef12 fix:空木箱入库、退货入库将木箱和托盘进行绑定 zhouz 2024-05-26 11:14:44 +08:00
• 67120342ac Merge remote-tracking branch 'origin/master' lishuai 2024-05-25 17:38:20 +08:00
• b3b82e2352 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-25 15:49:31 +08:00
• a44c225026 fix:出库任务给托盘类型 zhouz 2024-05-25 15:49:27 +08:00
• 38e3302e40 opt:修改退货入库逻辑 gongbaoxiong 2024-05-25 15:47:06 +08:00
• b205002324 add:新增lucence日志清理 tuqiang 2024-05-24 17:48:11 +08:00
• b284be33ea fix:入库优化 zhouz 2024-05-24 15:31:02 +08:00
• dc785a42eb fix:下发任务给高度类型 zhouz 2024-05-24 13:50:13 +08:00
• b8891aabf4 fix: 限高，kep报错等修改 lishuai 2024-05-23 19:45:46 +08:00
• 28b990e002 fix:获取木箱高度类型修改 zhouz 2024-05-23 17:30:19 +08:00
• 192bdb52cb Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-23 17:25:13 +08:00
• d1731ab7f3 fix:MES接口相关修改 zhouz 2024-05-23 17:21:19 +08:00
• ff125b673e feat: 增加存储acs反馈的子卷重量,修复了已知的问题 liyongde 2024-05-23 15:02:16 +08:00
• 16cb0f8da4 opt: 子卷判断是送到废品还是成品称重的优化 liyongde 2024-05-23 10:10:10 +08:00
• c19dbfe11d opt: 货位地址,rgv监控,创建指令优化 yanps 2024-05-22 17:33:39 +08:00
• 6a4dfd1f22 add：分拣出库 liuxy 2024-05-22 17:16:05 +08:00
• 4a69020b76 rev:优化指令取消逻辑 tuqiang 2024-05-22 16:48:44 +08:00
• 8e5fcb1006 fix:高度校验 zhouz 2024-05-22 16:09:52 +08:00
• fbf5640d2d Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-22 11:23:36 +08:00
• c9a45ea457 fix：位置校验 zhouz 2024-05-22 11:23:32 +08:00
• fa4a85ebcc add: agv偏移功能 yanps 2024-05-21 18:38:01 +08:00
• ffc2323379 Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-05-21 15:07:53 +08:00
• a854cb2ecc fix: 气胀轴送暂存区代数校验错误 liyongde 2024-05-21 15:07:24 +08:00
• 46541d0c50 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-21 14:53:55 +08:00
• 8664d7943f fix:异常任务相关处理 zhouz 2024-05-21 14:53:49 +08:00
• a57a696a9b Merge remote-tracking branch 'origin/master' lishuai 2024-05-21 13:42:35 +08:00
• 78242a58e0 fix: 堆垛机联调修改 lishuai 2024-05-21 13:41:10 +08:00
• 9d6fb3c4fa Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-05-20 17:30:17 +08:00
• ca892b7644 opt:修改输送线到满轴位四个点任务逻辑； gongbaoxiong 2024-05-20 17:30:01 +08:00
• b9854b2c66 add：新增生成excel任务调度 liuxy 2024-05-20 16:34:10 +08:00
• 8217df4480 Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-05-20 10:43:56 +08:00
• 9f73e74445 fix: 内包间任务完成点位数据赋值不对 liyongde 2024-05-20 10:43:18 +08:00
• 098330e94f rev：代码合并 liuxy 2024-05-20 09:24:03 +08:00
• 8122f60be9 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms liuxy 2024-05-20 09:23:35 +08:00
• c5fdf97b98 rav：任务完成时释放货位以及库存 liuxy 2024-05-20 09:23:24 +08:00
• f22475a6ef opt:优化空木箱出库，装箱区，子卷木箱分配相关逻辑。 baoge 2024-05-19 23:06:36 +08:00
• e1de520be0 fix: 联调 lishuai 2024-05-19 20:19:22 +08:00
• 2a4671d6c5 opt: 气胀轴缓存架优化 yanps 2024-05-19 16:32:40 +08:00
• c07a23e1e1 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-05-19 14:34:38 +08:00
• ed68b654d8 fix:密码修改 ZHOUZ\Noble'lift 2024-05-19 14:34:27 +08:00
• 7b868f213c fix:新增退货入库业务 zhouz 2024-05-18 11:33:10 +08:00
• 50e964fe8f opt: 贴标捆扎位优化 yanps 2024-05-18 09:05:55 +08:00
• 20904af6d5 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-17 17:02:49 +08:00
• 6746f0a088 fix:入库修改 zhouz 2024-05-17 17:02:43 +08:00
• 6ad2cc8493 Merge remote-tracking branch 'origin/master' lishuai 2024-05-17 11:04:13 +08:00
• 58d0dfa279 opt:优化子卷包装界面样式 baoge 2024-05-17 10:28:18 +08:00
• 511ad95ddd fix: 退货入库流程添加 lishuai 2024-05-17 09:52:04 +08:00
• db0071fb70 opt: 优化堆垛机,贴标位驱动 yanps 2024-05-17 09:47:10 +08:00
• 6d780d134a rev:更新捆扎贴标位下发信号 tuqiang 2024-05-16 20:34:21 +08:00
• fc94a4799c fix: 联调修改 lishuai 2024-05-16 19:12:03 +08:00
• 0880386c3d rev: 代码合并 liuxy 2024-05-16 18:58:22 +08:00
• 738f5d7e28 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms liuxy 2024-05-16 18:57:46 +08:00
• 624e3ac2c9 rev: 仓位不区分库区 liuxy 2024-05-16 18:57:33 +08:00
• 96515306bd opt:修改入库木箱获取方式 baoge 2024-05-16 17:09:19 +08:00
• a615fa19ce Merge remote-tracking branch 'origin/b_lms' into b_lms baoge 2024-05-16 17:08:48 +08:00
• 5fbe891da9 opt:修改入库木箱获取方式 baoge 2024-05-16 17:08:33 +08:00
• f96ad6d54a Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-05-16 16:12:13 +08:00
• d6fc326bcd fix: 内包间任务下发参数字段名错误 liyongde 2024-05-16 16:11:42 +08:00
• 1971e6ced2 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-16 09:37:59 +08:00
• 68f1aef4b0 fix:空木箱入库增加高度限制 zhouz 2024-05-16 09:37:54 +08:00
• 2873820eb0 opt:获取纸管长度 baoge 2024-05-15 21:20:40 +08:00
• 10f431ca71 fix:入库新增高度要求 zhouz 2024-05-15 20:26:02 +08:00
• 8eb06a6dcc opt:获取纸管长度 baoge 2024-05-15 19:50:31 +08:00
• 070946f905 opt:获取纸管长度 baoge 2024-05-15 19:49:41 +08:00
• e6b3461cd9 opt:子卷装箱测试 baoge 2024-05-15 19:19:58 +08:00
• 32549c4b06 fix: 推送名称修改测试 lishuai 2024-05-15 18:51:55 +08:00
• 5bfc0ab874 Merge remote-tracking branch 'origin/master' LENOVO 2024-05-15 16:17:14 +08:00
• 7a761e6577 fix: 联调木箱入库 LENOVO 2024-05-15 15:36:15 +08:00
• 92105c1cb3 rev：1.出库任务优化：任务完成后更新仓位、库存等信息，单据完成后则根据情况更新库存，情况1：虚拟库，完成单据更新虚拟区仓位、库存，情况2：超期发货：如果子卷超期且是超期发货则更新库存、仓位信息。2.移库任务下发优化：判断是从左边开始移库还是右边开始移库修改 liuxy 2024-05-15 14:01:47 +08:00
• 34a84e5bb6 opt: 监控页面设备信息显示优化 yanps 2024-05-15 11:21:23 +08:00
• cf60ace60f fix: 角色权限分配不显示 liyongde 2024-05-15 09:37:11 +08:00
• f4e308a50f Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-15 09:08:04 +08:00
• 8ee4fb2f2d fix:空托盘入库修改 zhouz 2024-05-15 09:07:59 +08:00