Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 71d27d5daf dev：回传优化 ZHOUZ\Noble'lift 2023-12-12 15:20:19 +08:00
• 188e46b0fb add:新增rgv驱动 tuqiang 2023-12-11 16:12:11 +08:00
• 2e89771520 rev：删除哦按段载具上是否存在气涨轴 liuxy 2023-12-11 10:46:43 +08:00
• 2de7b47102 rev: 设置站点修改 liuxy 2023-12-11 10:31:52 +08:00
• 5dd83f0bff dev:代码规范 ZHOUZ\Noble'lift 2023-12-08 11:30:30 +08:00
• 524717a5f2 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-05 15:44:06 +08:00
• f256124e79 dev:优化 ZHOUZ\Noble'lift 2023-12-05 15:43:59 +08:00
• f8df3e6861 rev：成品出库设置站点未生成任务 liuxy 2023-12-04 20:16:12 +08:00
• 66f867a162 rev:1.库存报表增加超期原因 2.成品报废回传飞书只回传>200的子卷 3.出库设置站点时出库a单据会带出b单据木箱问题解决 liuxy 2023-12-04 16:01:55 +08:00
• 8cab2ee440 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-12-04 09:37:51 +08:00
• c073c02cd1 dev:设备禁用不影响和MES进行接口对接，只影响AGV运行 ZHOUZ\Noble'lift 2023-12-04 09:33:08 +08:00
• b709982b2f rev：成品库存报表sql修改 liuxy 2023-12-01 09:40:17 +08:00
• 663a9a7506 rev: 出库分配设置站点提示优化 liuxy 2023-11-30 17:53:54 +08:00
• 0b2f5e9610 add：库存管理新增编辑 liuxy 2023-11-30 13:44:45 +08:00
• f35cd4e614 rev：成品日报修改 liuxy 2023-11-29 16:39:54 +08:00
• 95ba893f55 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-11-28 13:41:32 +08:00
• 72b31f02c6 dev:查询优化 ZHOUZ\Noble'lift 2023-11-28 13:41:24 +08:00
• 7499f4c766 rev：改切表设计 liuxy 2023-11-28 10:25:20 +08:00
• 110baa3217 rev: 成品日报修改 liuxy 2023-11-28 09:34:49 +08:00
• f55bd76ccd 页面更新 ludj 2023-11-24 18:15:33 +08:00
• 22f61db5f5 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-11-24 16:35:13 +08:00
• e51ecf6140 rev:修改仓库 ZHOUZ\Noble'lift 2023-11-24 16:34:32 +08:00
• 37fdf2598c dev:下发二楼到一楼的任务终点修改 ZHOUZ\Noble'lift 2023-11-24 16:33:26 +08:00
• 3f8914af53 rev：成品日报单位改为T liuxy 2023-11-24 15:14:55 +08:00
• df4abb6b69 add: 成品日报接口 liuxy 2023-11-23 17:39:56 +08:00
• 8842d2cece rev:样式修改 ludj 2023-11-23 16:58:20 +08:00
• cd8c64312f rev:前端样式调整 ludj 2023-11-22 20:10:06 +08:00
• ea75b54f38 报错时data注释 lishuai 2023-11-16 10:19:19 +08:00
• 87e99fadd6 add：成品报废审核 liuxy 2023-11-16 09:43:47 +08:00
• f826b0ba77 opt: NDC双工位AGV优化 yanps 2023-11-15 14:13:59 +08:00
• 47ac9d9ec9 Merge remote-tracking branch 'origin/master' yanps 2023-11-15 14:13:36 +08:00
• 816d50d42d Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-11-15 13:45:20 +08:00
• 070adc96e2 rev:新增飞书接口 ZHOUZ\Noble'lift 2023-11-15 13:45:12 +08:00
• fe25998a24 opt: NDC双工位AGV优化 yanps 2023-11-13 19:57:46 +08:00
• 247457d4a3 opt:代码优化 tuqiang 2023-11-13 19:35:53 +08:00
• c74ab66fdd opt:内包间行架，输送线出口位驱动优化 tuqiang 2023-11-10 10:38:27 +08:00
• 7ec5df941c opt: 纸管库,套管工位驱动优化 yanps 2023-11-09 14:06:57 +08:00
• 1181d4c192 opt:内包间行架和插拔轴机驱动代码优化 tuqiang 2023-11-09 13:21:01 +08:00
• 74e0977658 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-11-09 11:19:03 +08:00
• 5284aff25d rev:数字孪生接口查询优化 ZHOUZ\Noble'lift 2023-11-09 11:18:53 +08:00
• f36891047d rev 内包间行架 tuqiang 2023-11-09 10:02:16 +08:00
• 293906cdb5 Merge remote-tracking branch 'origin/master' tuqiang 2023-11-09 09:58:00 +08:00
• 205798ad6e fix tuqiang 2023-11-09 09:56:53 +08:00
• 61ed74e4ae rev：成品报废审核修改 liuxy 2023-11-08 19:02:50 +08:00
• 46463e7b65 opt: 纸管库,套管工位驱动优化 yanps 2023-11-08 17:30:33 +08:00
• 7b142f95c4 add: 新增成品报废审核功能 liuxy 2023-11-07 16:10:19 +08:00
• 78a4a4d6bd Merge remote-tracking branch 'origin/master' tuqiang 2023-11-07 13:39:36 +08:00
• fa1a3a4e68 fix tuqiang 2023-11-07 12:37:07 +08:00
• d5c2a0bd3e 套管工位驱动 yanps 2023-11-07 11:07:49 +08:00
• cf9213eab4 add:新增内包间行架驱动 tuqiang 2023-11-07 11:01:34 +08:00
• 4d53aaaf4e 纸管库和套管工位驱动 yanps 2023-11-07 10:57:10 +08:00
• 2e634be0ce 纸管库和套管工位驱动编写 yanps 2023-11-07 10:47:16 +08:00
• 82c46653e6 rev 新增任务字段 USER-20220102CG\noblelift 2023-11-03 14:32:40 +08:00
• 84d12e41dd add 新增lms接口 USER-20220102CG\noblelift 2023-11-03 13:50:17 +08:00
• 772a6e8efa add 新增纸管库驱动 USER-20220102CG\noblelift 2023-11-02 11:24:39 +08:00
• b5cd16b295 rev 信号下发 USER-20220102CG\noblelift 2023-10-31 16:02:14 +08:00
• d3063b472b Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-10-31 09:31:00 +08:00
• aef28f43fe dev:并发问题修改、数字孪生新增接口 ZHOUZ\Noble'lift 2023-10-31 09:30:48 +08:00
• 737dbd336e add:对烘箱对接位添加允许强制进入功能 tuqiang 2023-10-26 18:29:15 +08:00
• 75cea7fe40 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2023-10-26 17:17:35 +08:00
• 7740a8bbad rev 行架任务校验 USER-20220102CG\noblelift 2023-10-26 17:17:13 +08:00
• 3e75d99207 rev：合并 liuxy 2023-10-26 17:07:30 +08:00
• f88200f2bd Merge branch 'master_reform' liuxy 2023-10-26 17:06:08 +08:00
• 0c466793ba rev: 限制木箱高度 liuxy 2023-10-26 17:00:54 +08:00
• 384872d687 rev：立库改造、入库分配逻辑修改、移库逻辑修改 liuxy 2023-10-25 08:58:23 +08:00
• 98c7717fcc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2023-10-24 10:11:35 +08:00
• c7fd9d892d rev ndc链接 USER-20220102CG\noblelift 2023-10-24 10:10:57 +08:00
• 7caf22fff3 Merge branch 'package-dev' ZHOUZ\Noble'lift 2023-10-23 18:04:53 +08:00
• c9f85aa08b dev:报表优化、入库加并发锁 ZHOUZ\Noble'lift 2023-10-23 17:50:13 +08:00
• 9224b0d07c rev 修复任务指令内存问题 USER-20220102CG\noblelift 2023-10-19 11:28:09 +08:00
• b8c9688018 dev:分支推送 ZHOUZ\Noble'lift 2023-10-19 09:46:00 +08:00
• 4018922b9b rev:测试 ZHOUZ\Noble'lift 2023-10-19 09:28:32 +08:00
• e650ea273a rev:新增二期区域、查询优化 ZHOUZ\Noble'lift 2023-10-18 14:32:29 +08:00
• 1d9f35dded rev：是、出入库导出修改 liuxy 2023-10-17 08:57:49 +08:00
• f9c6c5e35e rev：导出维护字段销售订单、行号 liuxy 2023-10-16 17:35:12 +08:00
• ee17bd9b32 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-10-16 17:29:43 +08:00
• c9447c29a7 dev:修改明细查询BUG ZHOUZ\Noble'lift 2023-10-16 17:29:34 +08:00
• 98e39369f4 add：新增海亮二期仓库入库 liuxy 2023-10-13 16:18:05 +08:00
• f37290339c Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-10-13 16:14:44 +08:00
• e1aa85bcb6 rev:报表优化 ZHOUZ\Noble'lift 2023-10-13 16:14:36 +08:00
• 740d859f34 add 桁架 x y 轴信号 张江玮 2023-10-09 18:13:09 +08:00
• c5a061454f add 烘箱桁架 分切桁架 行走行信号 张江玮 2023-10-09 10:40:16 +08:00
• 1dd02f0195 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-10-08 17:46:27 +08:00
• b3f59428ee dev:改切出库支持多条明细推送，幅宽精度显示优化 ZHOUZ\Noble'lift 2023-10-08 17:46:14 +08:00
• 914c20932e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2023-10-07 08:46:10 +08:00
• 130928b672 rev 直管库 USER-20220102CG\noblelift 2023-10-07 08:45:31 +08:00
• 29a4c41723 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-09-28 22:14:49 +08:00
• e26c48f355 rev:大屏修改 ZHOUZ\Noble'lift 2023-09-28 22:14:41 +08:00
• 52a2a04427 rev:报表优化 ZHOUZ\Noble'lift 2023-09-28 22:14:16 +08:00
• ac30120460 rev：1.立库监控新增空托盘监控 2.调拨同步接口支持多条明细 liuxy 2023-09-27 15:59:50 +08:00
• d8769461a7 fix queryDevice 张江玮 2023-09-27 14:16:07 +08:00
• e741a8c9ea rev 读取线程 USER-20220102CG\noblelift 2023-09-26 13:22:02 +08:00
• 94f3c692e5 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2023-09-26 11:02:09 +08:00
• 25b0c1d7a7 rev:幅宽精度问题 ZHOUZ\Noble'lift 2023-09-26 11:02:01 +08:00
• 84727df37e rev：手持报废入库支持多种报废类型 liuxy 2023-09-25 14:45:51 +08:00
• 8a21fdb289 rev:修改：1、库存查询报表新增库存类型可多选；2、发货信息送货单位改为下拉框，车型改为下拉框且支持自定义输入；3、对报表的幅宽进行保留小数限制；4、入库管理新增销售订单及行号查询条件 ZHOUZ\Noble'lift 2023-09-22 08:54:38 +08:00
• ec5a330508 rev：发货出库发货信息修改 liuxy 2023-09-21 16:58:12 +08:00
• aa4646a832 rev：开关按钮颜色更改 liuxy 2023-09-21 16:30:15 +08:00
• aad04350d4 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one USER-20220102CG\noblelift 2023-09-21 14:54:10 +08:00
• ff00076083 rev 报警信息 USER-20220102CG\noblelift 2023-09-21 14:53:55 +08:00