|
|
62fc812853
|
Merge remote-tracking branch 'origin/master'
|
2024-01-17 10:09:20 +08:00 |
|
USER-20220102CG\noblelift
|
6bd088f008
|
rev 更新线程休眠时间
|
2024-01-17 10:06:34 +08:00 |
|
USER-20220102CG\noblelift
|
5b99185f24
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-16 21:08:50 +08:00 |
|
USER-20220102CG\noblelift
|
a1e888ffe4
|
rev
|
2024-01-16 21:08:32 +08:00 |
|
USER-20220102CG\noblelift
|
18b5ca31b8
|
rev 更新
|
2024-01-16 21:07:58 +08:00 |
|
ludj
|
af43ab7830
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java
# acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
|
2024-01-16 20:36:48 +08:00 |
|
|
|
34b626a726
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
|
2024-01-16 20:31:41 +08:00 |
|
|
|
3fca1045f1
|
add: 装箱\开箱驱动开发
|
2024-01-16 20:30:42 +08:00 |
|
ludj
|
bae7969474
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java
# acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
|
2024-01-16 20:19:59 +08:00 |
|
ludj
|
d2476700fa
|
rev: 去掉swagger
|
2024-01-16 20:17:22 +08:00 |
|
USER-20220102CG\noblelift
|
885237fcae
|
rev 更新
|
2024-01-16 20:06:45 +08:00 |
|
USER-20220102CG\noblelift
|
92fe7f2440
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-16 20:05:12 +08:00 |
|
USER-20220102CG\noblelift
|
d238f62957
|
rev 更新日志
|
2024-01-16 20:04:44 +08:00 |
|
|
|
b647c81219
|
rev：出库手工分配修改
|
2024-01-16 20:03:42 +08:00 |
|
ludj
|
0cea3574a8
|
rev:定时任务线程修复
|
2024-01-16 19:53:57 +08:00 |
|
|
|
1e7de370dc
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-16 17:17:46 +08:00 |
|
|
|
924f83f0ce
|
rev:人工拔轴判断创建任务
|
2024-01-16 17:17:29 +08:00 |
|
USER-20220102CG\noblelift
|
3da40b153d
|
init 二期ACS
|
2024-01-16 16:31:20 +08:00 |
|
|
|
2b40bf51ee
|
rev:前端页面子卷包装字段位置更换
|
2024-01-15 14:38:47 +08:00 |
|
|
|
f1abb2901a
|
rev：出库管理：发货单取理论重量
|
2024-01-15 14:18:18 +08:00 |
|
yanps
|
6f603ac7a0
|
fix: 修复分切行架一直写信号的问题
|
2024-01-15 13:15:05 +08:00 |
|
|
|
9c6a234211
|
rev：设备驱动空指针打印详细堆栈信息
|
2024-01-15 11:31:27 +08:00 |
|
|
|
b4f25156c7
|
rev:贴标增加开关
|
2024-01-12 14:36:24 +08:00 |
|
|
|
8a864c7212
|
rev： 成品日报、发货区监控
|
2024-01-12 13:45:20 +08:00 |
|
|
|
99fbb6494b
|
0
|
2024-01-11 16:23:17 +08:00 |
|
|
|
38628e518c
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-11 15:42:24 +08:00 |
|
|
|
54fe5a6e84
|
rev:内包间代码优化
|
2024-01-11 15:42:16 +08:00 |
|
|
|
9cd78f0d25
|
rev：出库业务强制确认按钮
|
2024-01-11 10:56:40 +08:00 |
|
|
|
2e22f2a2c2
|
rev:成品日报
|
2024-01-11 09:52:02 +08:00 |
|
|
|
fc3f2501b3
|
rev：成品报废
|
2024-01-11 09:48:47 +08:00 |
|
yanps
|
6f7db9502c
|
fix: 分切行架任务就绪不下发
|
2024-01-10 11:11:36 +08:00 |
|
|
|
e25dd57009
|
rev：默认时间
|
2024-01-09 17:40:21 +08:00 |
|
yanps
|
cbe1348684
|
opt: 内包间日志优化
|
2024-01-09 16:50:38 +08:00 |
|
yanps
|
fb79480ae1
|
add: 内包间日志增加
|
2024-01-09 09:30:09 +08:00 |
|
|
|
fefdead3f5
|
rev:内包间逻辑优化
|
2024-01-09 08:38:37 +08:00 |
|
zhangzq
|
eeeffbb708
|
opt:发货区管理接口优化
|
2024-01-08 17:39:11 +08:00 |
|
|
|
f6f19e73a1
|
rev：logo图标更换 rev：木箱外表打印校验
|
2024-01-08 09:53:46 +08:00 |
|
|
|
d9e041712b
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-08 08:58:22 +08:00 |
|
|
|
6bbd9a33e5
|
rev:内包间优化
|
2024-01-08 08:58:14 +08:00 |
|
yanps
|
ad01512522
|
opt: 内包间A1优化
|
2024-01-06 18:18:39 +08:00 |
|
|
|
7850601b6c
|
rev：成品报废回传修改
|
2024-01-05 17:53:44 +08:00 |
|
ludj
|
1db820fccd
|
rev:pom文件更新
|
2024-01-05 16:27:25 +08:00 |
|
|
|
b413168cac
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-05 15:57:25 +08:00 |
|
|
|
65ac6ccf47
|
rev:内包间优化
|
2024-01-05 15:57:04 +08:00 |
|
|
|
ee632a69cd
|
add: 线程、tomcat监控
|
2024-01-05 14:09:39 +08:00 |
|
zhangzq
|
62023a452e
|
opt:日志优化2
|
2024-01-05 01:45:43 +08:00 |
|
ludj
|
ba5c9ad5d1
|
rev:配置文件更新
|
2024-01-04 20:00:13 +08:00 |
|
yanps
|
4d4f35bd21
|
Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one
|
2024-01-04 09:37:30 +08:00 |
|
yanps
|
f69d754c9c
|
add: 烘箱行架增加日志和套轴等待
|
2024-01-04 09:36:49 +08:00 |
|
|
|
13d3d648f7
|
rev:出库导出
|
2024-01-02 16:05:04 +08:00 |
|
