|
|
fdb53b5d30
|
rev:内包间逻辑修改
|
2024-03-05 09:49:49 +08:00 |
|
|
|
317f6a848f
|
fix: 分切业务修改
|
2024-03-04 18:08:34 +08:00 |
|
|
|
05402cbdf1
|
Merge remote-tracking branch 'origin/master'
|
2024-03-04 16:23:45 +08:00 |
|
|
|
bf36bed276
|
fix :判断光电信号
|
2024-03-04 16:23:02 +08:00 |
|
|
|
2586cb6405
|
fix: 任务类
|
2024-03-04 09:40:53 +08:00 |
|
|
|
1faf1dd652
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-01 16:50:44 +08:00 |
|
|
|
93035b716a
|
fix: 分切业务
|
2024-03-01 14:34:52 +08:00 |
|
|
|
3da9bfe761
|
rev:定时导出EXCEL并上传到服务器
|
2024-03-01 14:11:34 +08:00 |
|
|
|
257864494e
|
Merge remote-tracking branch 'origin/master'
|
2024-03-01 14:06:40 +08:00 |
|
|
|
d4593bbf8f
|
fix :国际化修改
|
2024-03-01 14:05:31 +08:00 |
|
|
|
3af7a34c26
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-01 10:04:20 +08:00 |
|
|
|
fda88b222c
|
rev:新增表
|
2024-03-01 10:04:06 +08:00 |
|
|
|
36155bac2e
|
fix :国际化修改
|
2024-02-29 14:45:10 +08:00 |
|
|
|
881ade414e
|
Merge remote-tracking branch 'origin/master'
|
2024-02-29 13:14:05 +08:00 |
|
|
|
864990b446
|
fix :修改
|
2024-02-29 13:13:32 +08:00 |
|
|
|
1224ab4d74
|
add: 分切CRUD
|
2024-02-29 11:26:21 +08:00 |
|
|
|
f278b71ca0
|
rev:优化
|
2024-02-29 10:38:29 +08:00 |
|
|
|
1608d34733
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
# acs2/nladmin-ui/src/views/system/monitor/device/index.vue
|
2024-02-29 10:37:12 +08:00 |
|
|
|
544e5dfaea
|
add：新增后端二楼驱动国际化
|
2024-02-29 10:30:48 +08:00 |
|
|
|
7ab17cb0a8
|
feat: 完善分切下料桁架任务
|
2024-02-28 18:03:59 +08:00 |
|
|
|
797f1480b0
|
rev: 异常任务修改
|
2024-02-28 17:55:13 +08:00 |
|
yanps
|
ae3b25f35a
|
opt: 异常日志，流量限制，创建任务优化
|
2024-02-28 16:35:50 +08:00 |
|
|
|
c010166c28
|
add :堆垛机异样处理
|
2024-02-28 16:14:34 +08:00 |
|
|
|
a4dda6eafd
|
opt:统一把业务id等字段的Long类型改为String类型，避免前端序列号丢失精度。
|
2024-02-28 16:06:16 +08:00 |
|
|
|
1cfbe67d67
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-02-28 16:06:01 +08:00 |
|
|
|
0c08dfa535
|
rev：仓储异常处理
|
2024-02-28 15:55:04 +08:00 |
|
|
|
30e79d3939
|
opt:统一把业务id等字段的Long类型改为String类型，避免前端序列号丢失精度。
|
2024-02-28 13:44:02 +08:00 |
|
|
|
8da9a4fd3c
|
feat: 完善部分分切业务
|
2024-02-27 20:39:47 +08:00 |
|
|
|
89371b1d5b
|
rev：测试修改
|
2024-02-27 19:42:06 +08:00 |
|
|
|
aca9984d3f
|
rev：代码合并
|
2024-02-27 09:12:00 +08:00 |
|
|
|
cfc21279c4
|
rev：木箱木库测试
|
2024-02-27 09:06:59 +08:00 |
|
|
|
42e572a003
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
|
2024-02-26 16:33:08 +08:00 |
|
|
|
2f85b23948
|
fix :lms联调
|
2024-02-26 16:31:33 +08:00 |
|
|
|
b2e2f92202
|
add: 分切业务开发
|
2024-02-26 14:29:48 +08:00 |
|
|
|
ca2dac7816
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
|
2024-02-26 14:24:07 +08:00 |
|
|
|
30d1086938
|
opt:优化业务逻辑
|
2024-02-26 10:17:20 +08:00 |
|
yanps
|
7282a6ef66
|
opt: 设备优化
|
2024-02-23 16:37:01 +08:00 |
|
yanps
|
d4c89bc50f
|
opt: 三色灯回退,OPC连接优化
|
2024-02-23 15:38:33 +08:00 |
|
|
|
2498dea59f
|
rev:代码优化
|
2024-02-23 15:23:39 +08:00 |
|
|
|
621fe7362e
|
add：acstolms 接口
|
2024-02-22 19:11:38 +08:00 |
|
|
|
20d2d77a21
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-02-22 19:05:06 +08:00 |
|
|
|
da3b9e6b78
|
rev:复烤回退
|
2024-02-22 19:04:47 +08:00 |
|
|
|
6c42abffde
|
Merge remote-tracking branch 'origin/master'
|
2024-02-22 17:59:25 +08:00 |
|
|
|
ff04f40bbc
|
fix :测试、对接点位
|
2024-02-22 17:55:13 +08:00 |
|
|
|
64e3d286cc
|
add：出库一键设置
|
2024-02-21 18:35:27 +08:00 |
|
yanps
|
407c8b5152
|
opt: 设备监控
|
2024-02-21 09:56:25 +08:00 |
|
|
|
5b096969a2
|
rev:优化kep信号读取
|
2024-02-21 09:11:29 +08:00 |
|
yanps
|
42a6aa3e4b
|
opt: 一期设备断连优化
|
2024-02-21 08:45:27 +08:00 |
|
|
|
5900712e61
|
Merge remote-tracking branch 'origin/master'
|
2024-02-20 17:17:32 +08:00 |
|
|
|
7c97cb116e
|
add :设备国际化
|
2024-02-20 17:16:58 +08:00 |
|
