Commit Graph

139 Commits

Author SHA1 Message Date
18188916393
2407b6e85c 堆叠位置修改 2022-09-09 16:18:24 +08:00
18188916393
e0301e2dfd 剔除 物料绑定货位的规则 2022-09-09 13:58:05 +08:00
loujf
07478eb069 更新 2022-09-09 10:03:05 +08:00
lyd
497869ca50 修复-日志检索-滚动监听事件未销毁问题 2022-09-08 17:06:16 +08:00
18188916393
285a02f5d0 物料页面修改 2022-09-08 16:18:20 +08:00
18188916393
ca98aac55b 修复生产任务复制新增 编码重复的问题 2022-09-08 14:47:24 +08:00
18188916393
36378237b9 测试更新 2022-09-08 09:16:02 +08:00
loujf
360f2ff5b6 更新 2022-09-07 19:39:11 +08:00
loujf
d58df85b69 Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai 2022-09-06 16:21:27 +08:00
loujf
4e16de1708 嘉耐手持更新 2022-09-06 16:18:06 +08:00
lyd
70edf108f8 更新-日志检索-点击日期可以直接查询 2022-09-06 15:00:58 +08:00
18188916393
7d43c4a596 no message 2022-09-06 10:03:27 +08:00
loujf
95c0d478ac 更新 2022-09-05 11:10:35 +08:00
loujf
03b0d4ab50 更新 2022-09-05 11:10:21 +08:00
loujf
65924cf795 更新 2022-09-02 09:33:11 +08:00
18188916393
643d790311 no message 2022-09-01 17:37:55 +08:00
18188916393
182d4f498b 新增借口 2022-09-01 15:43:06 +08:00
loujf
8fb99f4e9b 更新 2022-09-01 15:34:42 +08:00
18188916393
69d0587407 新需求修改 2022-08-29 17:02:47 +08:00
18188916393
15abb16868 后续问题提交 2022-08-26 16:27:07 +08:00
USER-20220102CG\noblelift
a1dc5cef0b 更新接口 2022-08-26 14:41:15 +08:00
18188916393
a538efbef1 no message 2022-08-25 17:48:13 +08:00
18188916393
505a99978f Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai 2022-08-25 17:33:58 +08:00
18188916393
0ebda94be5 no message 2022-08-25 17:33:27 +08:00
18188916393
5014df9aed no message 2022-08-25 17:32:40 +08:00
USER-20220102CG\noblelift
6dea55ed40 1 2022-08-25 17:23:33 +08:00
18188916393
8cc98575cd 跟mes对接提交 2022-08-24 17:42:20 +08:00
18188916393
844b93de98 提交 2022-08-23 13:42:33 +08:00
loujf
84ec044f3d 更新 2022-08-23 13:05:11 +08:00
18188916393
2bffb17dae no message 2022-08-23 11:29:54 +08:00
18188916393
e2b11f64e9 no message 2022-08-23 09:01:28 +08:00
loujf
fb888a0f5b 更新 2022-08-22 13:25:44 +08:00
lyd
ce7da68064 舞台编辑更新 2022-08-22 10:43:29 +08:00
18188916393
006198d39f 提交 2022-08-22 10:26:54 +08:00
USER-20220102CG\noblelift
7c7ed6f1b1 Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai 2022-08-22 10:18:31 +08:00
USER-20220102CG\noblelift
02b1236ce8 更新 2022-08-22 10:18:20 +08:00
lyd
e6646ecf92 舞台编辑修复-下拉框实时更新信息 2022-08-22 09:43:33 +08:00
loujf
2d60244b82 嘉耐更新 2022-08-20 16:37:30 +08:00
lyd
e395d856c7 日志优化修改-设备监控优化 2022-08-19 15:11:58 +08:00
loujf
7f7265e5fc 分拣机械手驱动更新 2022-08-19 14:35:51 +08:00
loujf
478c760ea3 码垛机械手驱动更新 2022-08-18 18:39:39 +08:00
lyd
a326fe39aa 设备图片上传更新与编辑功能提示 2022-08-18 17:21:04 +08:00
ldj_willow
861cdfea72 代码重构 2022-08-18 16:54:49 +08:00
ldj_willow
451e51877e 代码重构 2022-08-18 15:06:07 +08:00
USER-20220102CG\noblelift
b7b7296189 1 2022-08-18 15:01:33 +08:00
ldj_willow
f1cad6b34d 代码重构 2022-08-18 15:00:19 +08:00
ldj_willow
fe95314152 Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai
# Conflicts:
#	acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
#	acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
#	acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java
#	acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java
#	acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java
#	acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java
#	acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
#	acs/qd/.env.development
2022-08-18 14:59:22 +08:00
ldj_willow
ff1670185d 代码重构 2022-08-18 14:54:58 +08:00
lyd
ca396b7022 Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai 2022-08-18 11:31:04 +08:00
lyd
c5d9162548 修改 2022-08-18 11:30:35 +08:00