Commit Graph

257 Commits

Author SHA1 Message Date
USER-20220102CG\noblelift
a494d456c3 更新 2023-02-06 23:29:20 +08:00
ludj
230babf819 日志更新 2023-02-06 18:12:55 +08:00
ludj
0429abc1e6 任务指令锁更新 2023-02-06 18:10:06 +08:00
USER-20220102CG\noblelift
ce24dedb7c 更新写入值测试读 2023-02-06 16:38:10 +08:00
77ac88d8d4 更新 2023-02-06 16:16:34 +08:00
USER-20220102CG\noblelift
6315e94b8a 更新日志 2023-02-06 15:05:27 +08:00
USER-20220102CG\noblelift
2e8e9be3de 更新 2023-02-05 18:41:53 +08:00
ludj
7f51a4e3e9 代码更新 2023-02-05 17:51:04 +08:00
ludj
861038b567 写两遍opc值 2023-02-05 12:48:28 +08:00
ludj
ac2e9e9c32 任务编码改为ID 2023-02-05 12:19:02 +08:00
ludj
609c95e3d0 任务和指令加锁处理 2023-02-05 09:58:45 +08:00
USER-20220102CG\noblelift
7628b30236 更新 2023-02-04 22:22:15 +08:00
USER-20220102CG\noblelift
343e1d7e88 更新 2023-02-04 22:19:36 +08:00
USER-20220102CG\noblelift
e19622efc3 更新 2023-02-04 21:27:20 +08:00
ludj
353a59a363 次数更新 2023-02-04 13:20:26 +08:00
ludj
780d2a7b51 读写次数更新 2023-02-04 13:18:52 +08:00
ludj
72d6f51598 代码更新 2023-02-04 10:50:05 +08:00
张江玮
71c40a5ec4 删除项目里的日志 2023-02-04 10:15:17 +08:00
28f05f933e 更新 2023-02-04 04:00:48 +08:00
ludj
6c54ba967c Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-02-03 23:11:57 +08:00
ludj
3b01eaf6b7 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
2023-02-03 23:11:50 +08:00
USER-20220102CG\noblelift
9f0f2dc969 更新缓存查询 2023-02-03 23:11:28 +08:00
ludj
580f9e1597 指令修改 2023-02-03 23:06:04 +08:00
USER-20220102CG\noblelift
a5e728d4d8 1 2023-02-03 22:59:22 +08:00
ludj
2db47e8cbc 指令任务迭代器更新 2023-02-03 22:57:19 +08:00
00027e655d 更新 2023-02-03 22:20:08 +08:00
USER-20220102CG\noblelift
6f8fed7ea2 跟新 2023-02-03 21:15:09 +08:00
USER-20220102CG\noblelift
4db31e92d6 更新 2023-02-03 15:10:38 +08:00
USER-20220102CG\noblelift
1a7c2073ab 更新 2023-02-03 13:57:29 +08:00
USER-20220102CG\noblelift
657e8e4958 更新 2023-02-03 13:50:56 +08:00
USER-20220102CG\noblelift
9f5def7738 更新 2023-02-03 13:06:26 +08:00
be31471261 更新 2023-02-03 09:47:47 +08:00
dfce161aa3 更新 2023-02-03 07:24:37 +08:00
USER-20220102CG\noblelift
ca16905c96 更新 2023-02-03 00:55:58 +08:00
USER-20220102CG\noblelift
bc5b7f3743 更新 2023-02-02 23:38:39 +08:00
ludj
149efd9b4b Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
#	acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java
2023-02-02 22:05:23 +08:00
ludj
aacaa9047c 代码更新 2023-02-02 21:55:35 +08:00
USER-20220102CG\noblelift
4b8dd5ddba 更新 2023-02-02 21:35:17 +08:00
ludj
449ab94c94 代码更新 2023-02-02 20:41:19 +08:00
ludj
12b71b1264 代码更新 2023-02-02 20:37:01 +08:00
张江玮
3757aabde0 优化 2023-02-02 18:47:01 +08:00
USER-20220102CG\noblelift
3640aafae4 更新 2023-02-02 17:28:40 +08:00
张江玮
921f57acb2 无货上报lms优化与输送线指令初始化 2023-02-02 17:15:49 +08:00
USER-20220102CG\noblelift
677125f92d 更新 2023-02-02 17:05:13 +08:00
张江玮
44d179c360 Update SiemensConveyorDeviceDriver.java 2023-02-02 13:51:41 +08:00
ludj
c6d1522ee9 代码更新 2023-02-02 13:07:24 +08:00
张江玮
9856234890 Update SiemensConveyorDeviceDriver.java 2023-02-02 09:25:06 +08:00
张江玮
1706d2b1f0 Update SiemensConveyorDeviceDriver.java 2023-02-02 09:23:59 +08:00
cf2f5419d3 更新 2023-02-02 08:25:37 +08:00
USER-20220102CG\noblelift
ac645d660a 更新 2023-02-02 01:00:18 +08:00