yanps
|
cfeabb4c04
|
opt: 优化创建任务的扩展字段
|
2024-01-22 09:44:08 +08:00 |
|
|
|
f06dec27bf
|
Merge remote-tracking branch 'origin/master'
|
2024-01-20 18:31:57 +08:00 |
|
|
|
449082c03c
|
add : 测试入库
|
2024-01-20 18:31:26 +08:00 |
|
yanps
|
4c0ec35e98
|
opt: 创建任务中的扩展字段优化
|
2024-01-20 17:16:12 +08:00 |
|
|
|
91d1102f9e
|
Merge remote-tracking branch 'origin/master'
|
2024-01-20 16:14:46 +08:00 |
|
|
|
8b6e6d547a
|
add : 测试入库
|
2024-01-20 16:14:25 +08:00 |
|
|
|
d93fe3a4ed
|
add：pc成品入库
|
2024-01-19 18:36:27 +08:00 |
|
zhangzq
|
4b82e5a764
|
add:添加prometheushttp监控
|
2024-01-19 16:57:12 +08:00 |
|
|
|
56071e13fe
|
Merge remote-tracking branch 'origin/master'
|
2024-01-19 13:10:23 +08:00 |
|
|
|
7ecd9c6cc0
|
add : 测试入库
|
2024-01-19 13:10:03 +08:00 |
|
|
|
1dfc62bd36
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-19 11:20:10 +08:00 |
|
|
|
1a7d4afd68
|
rev:气涨轴编码维护
|
2024-01-19 11:20:02 +08:00 |
|
USER-20220102CG\noblelift
|
3b7035173d
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-19 10:21:28 +08:00 |
|
USER-20220102CG\noblelift
|
d26939d6b0
|
rev 更新
|
2024-01-19 10:20:32 +08:00 |
|
|
|
2ecc7994ff
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-18 15:54:56 +08:00 |
|
|
|
a2c03da1c8
|
rev:气涨轴编码变更
|
2024-01-18 15:54:44 +08:00 |
|
|
|
d8945feaf4
|
Merge remote-tracking branch 'origin/master'
|
2024-01-17 20:37:06 +08:00 |
|
|
|
54f0a10efd
|
add: 开发
|
2024-01-17 20:36:44 +08:00 |
|
|
|
90f4593346
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-01-17 20:09:14 +08:00 |
|
|
|
58417bf12c
|
rev:穿拔轴机库存更新
|
2024-01-17 20:07:23 +08:00 |
|
yanps
|
42cd7d1258
|
add: 添加插拔机取货完成反馈
|
2024-01-17 18:57:02 +08:00 |
|
|
|
1e96343e7e
|
rev:新增表处相关逻辑和任务类
|
2024-01-17 17:34:06 +08:00 |
|
|
|
1473ba1a72
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-01-17 17:09:16 +08:00 |
|
|
|
42b598a49b
|
rev:穿拔轴机库存更新
|
2024-01-17 17:09:08 +08:00 |
|
|
|
99242f4c78
|
rev：二期入库增删改查
|
2024-01-17 16:15:33 +08:00 |
|
|
|
edf858a244
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-01-17 10:56:41 +08:00 |
|
|
|
c7bf3bf17a
|
rev:新增表处库存点位页面
|
2024-01-17 10:56:30 +08:00 |
|
|
|
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 |
|
|
|
fde6ad67fd
|
add：入库查询
|
2024-01-16 20:00:42 +08:00 |
|
ludj
|
0cea3574a8
|
rev:定时任务线程修复
|
2024-01-16 19:53:57 +08:00 |
|
|
|
e56706c66a
|
add：出入库目录结构、框架
|
2024-01-16 17:49:42 +08:00 |
|
|
|
73f21e342d
|
rev:新增目录
|
2024-01-16 17:21:18 +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 |
|
