|
|
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 |
|
|
|
ccfaa17962
|
更新
|
2023-02-01 22:20:30 +08:00 |
|
USER-20220102CG\noblelift
|
0c33d53ea9
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-02-01 22:08:25 +08:00 |
|
USER-20220102CG\noblelift
|
d3e5994572
|
更新
|
2023-02-01 22:08:12 +08:00 |
|
ludj
|
59cfb37148
|
设置值日志输出
|
2023-02-01 19:22:10 +08:00 |
|
USER-20220102CG\noblelift
|
2c6602c528
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-02-01 18:29:23 +08:00 |
|
USER-20220102CG\noblelift
|
2c13894b60
|
提交
|
2023-02-01 18:29:12 +08:00 |
|
ludj
|
11c490c232
|
解决acs值偶尔无法写入问题
|
2023-02-01 18:28:28 +08:00 |
|
USER-20220102CG\noblelift
|
26e0e3ec96
|
更新立库字段
|
2023-02-01 09:58:51 +08:00 |
|
|
|
21b64f139f
|
更新
|
2023-02-01 08:22:51 +08:00 |
|
|
|
4483931feb
|
更新
|
2023-02-01 07:08:17 +08:00 |
|
USER-20220102CG\noblelift
|
4f0bd676fb
|
更新
|
2023-01-31 21:25:43 +08:00 |
|
USER-20220102CG\noblelift
|
7a34d26416
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-01-31 21:09:53 +08:00 |
|
USER-20220102CG\noblelift
|
5ca6a0d418
|
更新
|
2023-01-31 21:09:42 +08:00 |
|
ludj
|
c31ce6f3f0
|
ACS自动重连提交
|
2023-01-31 21:09:28 +08:00 |
|
张江玮
|
dfb3e1fa33
|
lms新需求
|
2023-01-31 01:52:05 +08:00 |
|
张江玮
|
86f0281576
|
任务列表指令列表搜索条件更新
|
2023-01-31 01:28:47 +08:00 |
|
|
|
5257e18a27
|
更新
|
2023-01-30 10:07:32 +08:00 |
|
USER-20220102CG\noblelift
|
4df42ce4e7
|
更新
|
2023-01-30 09:52:25 +08:00 |
|
