zhangzhiqiang
|
c47b61abdc
|
fix:sync
|
2023-02-05 14:29:00 +08:00 |
|
zhangzhiqiang
|
cc3ee178fb
|
Merge remote-tracking branch 'origin/master'
|
2023-02-05 13:40:43 +08:00 |
|
zhangzhiqiang
|
a08597a606
|
add:添加redisson配置文件
|
2023-02-05 13:40:22 +08:00 |
|
|
|
ccecb81528
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-02-05 13:29:00 +08:00 |
|
|
|
619b93963c
|
描述修改
|
2023-02-05 13:28:53 +08:00 |
|
zhangzhiqiang
|
3e5301fdbf
|
add:redisson
|
2023-02-05 13:01:40 +08:00 |
|
ludj
|
b17e5172b2
|
代码更新
|
2023-02-05 12:56:18 +08:00 |
|
ludj
|
861038b567
|
写两遍opc值
|
2023-02-05 12:48:28 +08:00 |
|
ludj
|
f88445ea79
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-02-05 12:19:16 +08:00 |
|
ludj
|
ac2e9e9c32
|
任务编码改为ID
|
2023-02-05 12:19:02 +08:00 |
|
|
|
290ffad614
|
代码更新
|
2023-02-05 12:10:48 +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
|
4e2ed53775
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-02-04 22:20:27 +08:00 |
|
USER-20220102CG\noblelift
|
343e1d7e88
|
更新
|
2023-02-04 22:19:36 +08:00 |
|
|
|
b214dd2ebe
|
代码更新
|
2023-02-04 21:42:25 +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 |
|
|
|
a45b512569
|
代码更新
|
2023-02-04 11:51:52 +08:00 |
|
ludj
|
72d6f51598
|
代码更新
|
2023-02-04 10:50:05 +08:00 |
|
张江玮
|
71c40a5ec4
|
删除项目里的日志
|
2023-02-04 10:15:17 +08:00 |
|
zhangzhiqiang
|
e6048da42a
|
Merge remote-tracking branch 'origin/master'
|
2023-02-04 09:08:02 +08:00 |
|
zhangzhiqiang
|
c7d6c90ffa
|
mdf:空托盘入库查找条件修改
|
2023-02-04 09:07:53 +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 |
|
|
|
6439daf3cc
|
代码更新
|
2023-02-03 21:28:17 +08:00 |
|
USER-20220102CG\noblelift
|
6f8fed7ea2
|
跟新
|
2023-02-03 21:15:09 +08:00 |
|
|
|
0a9161f770
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-02-03 17:05:00 +08:00 |
|
|
|
b567ae665a
|
修改
|
2023-02-03 17:04:54 +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 |
|
|
|
dd97b203fb
|
代码更新
|
2023-02-03 12:46:11 +08:00 |
|
|
|
afa747972e
|
代码更新
|
2023-02-03 12:45:44 +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
|
90c8b7b7a1
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-02-02 23:38:53 +08:00 |
|
USER-20220102CG\noblelift
|
bc5b7f3743
|
更新
|
2023-02-02 23:38:39 +08:00 |
|
|
|
e833a64c73
|
代码更新
|
2023-02-02 23:05:54 +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 |
|
