Commit Graph

2472 Commits

Author SHA1 Message Date
4d18c231b9 fix: 行架对接位添加 2024-03-11 13:55:10 +08:00
c0b36da274 rev:区域人员 2024-03-11 09:53:07 +08:00
f19b938a33 dev:表处问题修改 2024-03-08 17:41:03 +08:00
c9d9e86848 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-08 17:08:20 +08:00
41ed722cee dev:BUG修改 2024-03-08 17:08:11 +08:00
e8f015bbcd opt: 分切业务、气胀轴缓存库分配规则 2024-03-08 16:34:30 +08:00
5a79e9eaaf rev:向飞书推送图片 修改标题 2024-03-08 14:04:47 +08:00
f041a48558 rev:向飞书推送图片 2024-03-08 13:27:34 +08:00
yanps
19615e8ca7 opt: 路由同步,设备监控优化 2024-03-08 09:52:05 +08:00
0b7945a149 rev:新增请求接口,驱动代码优化 2024-03-07 18:12:53 +08:00
0ad8c2e8b7 fix: 手持权限、任务校验 2024-03-07 17:16:28 +08:00
cc8b7597f8 rev:向飞书推送图片 2024-03-07 14:00:57 +08:00
d226688705 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-07 09:14:21 +08:00
1c795ec3fb rev:飞书相关修改 2024-03-07 09:14:11 +08:00
f1c17b6599 fix: 任务 2024-03-06 18:14:01 +08:00
238b406aa3 fix: 分切业务区域校验 2024-03-06 18:11:40 +08:00
f16b6a6795 fix:国际化导包报错 2024-03-06 13:19:19 +08:00
832366d6d6 测试 2024-03-06 09:59:53 +08:00
4103b9c21e opt:优化业务逻辑。 2024-03-05 19:27:23 +08:00
2cd9287fda add: 向飞书推送图片 2024-03-05 18:43:21 +08:00
yanps
385fc2dac1 opt: 更改创建者显示,页面优化 2024-03-05 17:52:04 +08:00
edfb48330a Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-05 09:49:59 +08:00
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