Commit Graph

2782 Commits

Author SHA1 Message Date
zhouz
586f51f093 fix:一期生箔优化 2024-07-14 13:00:01 +08:00
ec353aa614 fix: 套轴完成查找相同点位错误,添加点位类型校验 2024-07-14 10:48:06 +08:00
76ec78d5b9 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-14 10:48:01 +08:00
b533348e65 opt:优化装箱最后一个子卷临时计数方式 2024-07-14 10:47:49 +08:00
04981d794d Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-14 10:14:36 +08:00
1195317905 fix: 套轴完成查找相同点位错误,添加点位类型校验 2024-07-14 10:14:13 +08:00
89dbc2218e opt:优化日志记录 2024-07-14 09:03:01 +08:00
de653e68a4 opt:优化装箱区——>待检区送空载具逻辑 2024-07-14 08:34:57 +08:00
dd39ac725a opt:优化装箱区——>待检区送空载具逻辑 2024-07-13 23:57:07 +08:00
zhouz
0ef454fa79 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-13 23:48:52 +08:00
zhouz
67d1f7a5e4 fix:B1母卷上料优化 2024-07-13 23:48:21 +08:00
ab5f7a82eb rev:优化日志 2024-07-13 18:13:34 +08:00
1a1acb9cff fix: 手持绑定气胀轴点位维护错位 2024-07-13 17:13:55 +08:00
0ec06b2937 fix:修改更新满轴库存 2024-07-13 14:44:59 +08:00
zhouz
2e67662a87 fix:B1母卷上料优化 2024-07-13 13:23:12 +08:00
2759ce1560 fix: 自动呼叫套轴,改切计划找不到计划 2024-07-13 13:09:55 +08:00
zhouz
2c9b074efd fix:MES相关接口优化 2024-07-13 11:40:16 +08:00
USER-20220102CG\noblelift
2e3bbf7bbb rev 更新设备同步默认最大线程数,按照PLC ip数配置线程数 2024-07-13 11:19:48 +08:00
USER-20220102CG\noblelift
b43a390a6f rev 优化线程相关 2024-07-13 08:35:29 +08:00
zhouz
3ea3481c33 fix:MES相关接口优化 2024-07-13 08:30:55 +08:00
c75148580a feat: 套轴优化,新增手持气胀轴维护 2024-07-12 23:46:02 +08:00
zhouz
64b5a0412e fix:生箔工序优化 2024-07-12 18:54:35 +08:00
zhouz
9326c96f31 fix:生箔工序优化 2024-07-12 18:45:13 +08:00
943acd1b4c fix:临时增加多个卷装一箱方案 2024-07-12 17:13:45 +08:00
e7d376f784 fix:补空任务限制为2 2024-07-12 14:29:29 +08:00
ee2561a19b fix:修改点位库存修改问题 2024-07-12 14:18:56 +08:00
24b45d33c2 opt:优化取空载具逻辑 2024-07-12 12:46:09 +08:00
cefdb02a7b Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-12 11:27:41 +08:00
4a0269f63a fix: 改制用母卷为空做判断 2024-07-12 11:27:19 +08:00
38f2e933ef opt:优化二次分配日志记录 2024-07-12 10:21:57 +08:00
4bc1860944 opt:优化二次分配日志记录 2024-07-12 09:35:02 +08:00
1702a4558c Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-12 09:17:26 +08:00
886c8af826 add: 手持维护气胀轴库库存信息 2024-07-12 09:16:55 +08:00
af9192bee8 fix:增加桁架任务及二次分配任务完成情况校验 2024-07-11 21:39:19 +08:00
62774053a3 fix:增加桁架任务及二次分配任务完成情况校验 2024-07-11 19:26:58 +08:00
e3da38f4f9 Merge branch 'b_lms' into master_merge 2024-07-11 14:50:10 +08:00
23cd49cfb3 add:木箱信息页面 2024-07-11 14:47:17 +08:00
94a7b5b431 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-11 09:39:20 +08:00
52cc5d7dfd fix:增加二次分配任务完成情况校验 2024-07-11 09:39:11 +08:00
3b4fdf64dd fix: 单元测试 2024-07-11 09:33:48 +08:00
zhouz
ae0b82dd04 fix:生箔工序优化、出库托盘、木箱解绑 2024-07-11 09:17:01 +08:00
600076bc59 Merge remote-tracking branch 'origin/master' 2024-07-11 08:42:40 +08:00
22944ce7ea fix: 堆叠行架修改、日志优化、定时器优化 2024-07-11 08:42:17 +08:00
8884ef7c59 fix:增加二次分配任务完成情况校验 2024-07-10 22:53:06 +08:00
db067c980a Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-10 18:54:44 +08:00
192ff5f65a fix: 回滚 2024-07-10 18:54:24 +08:00
b4c7444670 fix: 分切计划维护结束时间 2024-07-10 18:52:13 +08:00
yanps
4b75167f19 add: 添加LMS下发信号到西门子称重位 2024-07-10 17:52:11 +08:00
ed493f29fa Merge branch 'master' into master_merge 2024-07-10 13:58:56 +08:00
ccbfb652ec fix:增加已分配满轴点位判断 2024-07-10 13:06:01 +08:00