zhangzq
|
4afc8d43b2
|
Merge branch 'feature/sanxian_acs_1213' into feature/sanxianacs1213
# Conflicts:
# wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
# wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java
# wcs/nladmin-system/src/main/resources/config/application-dev.yml
# wcs/nladmin-system/src/main/resources/config/application-prod.yml
# wcs/nladmin-system/src/main/resources/config/application-test.yml
# wcs/nladmin-system/src/main/resources/config/application.yml
# wcs/nladmin-system/src/main/resources/logback-spring.xml
|
2024-02-19 17:00:49 +08:00 |
|
|
|
93185c9bfa
|
add:测试
|
2024-02-19 14:41:01 +08:00 |
|
zhangzq
|
990fcb563a
|
add:接入mqtt2
|
2024-02-19 14:36:33 +08:00 |
|
zhangzq
|
de54a09c5b
|
add:接入mqtt2
|
2024-02-19 14:36:09 +08:00 |
|
zhangzq
|
ccbcccfef3
|
add:接入mqtt(td:项目启停时设备信号读写2)
|
2024-02-19 13:45:48 +08:00 |
|
zhangzq
|
0d78f68bac
|
add:接入mqtt(td:项目启停时设备信号读写)
|
2024-02-04 14:14:55 +08:00 |
|
zhangzq
|
b0b9dedaee
|
add:接入mqtt(td:项目启停时设备信号读写)
|
2024-02-01 17:54:08 +08:00 |
|
zhangzq
|
86935740fc
|
add:接入mqtt(td:项目启停时设备信号读写)
|
2024-02-01 17:27:03 +08:00 |
|
|
|
300278e1c8
|
rev:更新
|
2024-01-26 15:42:39 +08:00 |
|
|
|
ce5dcdf1f4
|
rev:更新
|
2024-01-22 08:55:25 +08:00 |
|
|
|
720699bdd5
|
rev:更新
|
2024-01-15 08:54:50 +08:00 |
|
|
|
26fd3d1919
|
rev:海柔业务
|
2024-01-11 10:40:27 +08:00 |
|
|
|
3ee52d3fbc
|
rev:删除驱动里面电气信号变化记录日志
|
2024-01-03 09:00:59 +08:00 |
|
|
|
16b4e1bef3
|
add:忽略lucene生成的文件
|
2024-01-02 17:34:10 +08:00 |
|
|
|
16878950bc
|
rev:替换lucene
|
2024-01-02 17:22:47 +08:00 |
|
|
|
d967103c17
|
rev:替换lucene
|
2024-01-02 17:21:53 +08:00 |
|
|
|
93bf10bd79
|
add:海柔输送线申请空框任务
|
2023-12-29 13:49:21 +08:00 |
|
|
|
a3c6f9bb3b
|
rev:删除loki
|
2023-12-19 08:51:01 +08:00 |
|
周俊杰
|
6713250a56
|
add 海荣成品空载具入库
|
2023-12-13 16:34:23 +08:00 |
|
周俊杰
|
680159531d
|
111
|
2023-12-13 15:30:33 +08:00 |
|
zhangzq
|
1dbc4e0098
|
Merge remote-tracking branch 'origin/master'
|
2023-12-13 14:44:59 +08:00 |
|
zhangzq
|
007bd043f3
|
rev:工单编号
|
2023-12-13 14:44:51 +08:00 |
|
|
|
dc0b25d076
|
add:排产调整sql。
|
2023-12-08 16:00:32 +08:00 |
|
|
|
462728956e
|
add:增加工单排产调整相关功能。
|
2023-12-08 15:56:59 +08:00 |
|
zhangzq
|
45a102eed0
|
rev:pom
|
2023-12-04 16:42:12 +08:00 |
|
zhangzq
|
1d28c7cf9e
|
rev:工单下发接口兼容暂停工单;opt:删除useragent
|
2023-12-04 16:02:16 +08:00 |
|
zhangzq
|
c4c7fc9c27
|
rev：工单查询sql
|
2023-12-04 09:50:04 +08:00 |
|
zhangzq
|
925b2a998e
|
add:飞书接口
|
2023-11-29 17:17:37 +08:00 |
|
zhangzq
|
1f82889211
|
Merge remote-tracking branch 'origin/master'
|
2023-11-29 10:15:39 +08:00 |
|
zhangzq
|
2927e7e25f
|
rev:新增报工时间字段，下料机优先级，缓存线写0（三层缓存线跑）下一道工序设备来料仓排序
|
2023-11-29 10:15:33 +08:00 |
|
USER-20220102CG\noblelift
|
11a007ea36
|
rev 修改逻辑
|
2023-11-22 13:46:16 +08:00 |
|
USER-20220102CG\noblelift
|
ecb875e229
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-11-22 13:32:04 +08:00 |
|
USER-20220102CG\noblelift
|
d34baf0cce
|
rev 海柔输送线驱动
|
2023-11-22 13:31:45 +08:00 |
|
zhangzq
|
d1bf663e0f
|
add:工单优化
|
2023-11-20 16:13:38 +08:00 |
|
zhangzq
|
f985b7ba9d
|
add:新增pc工单暂停页面，添加物料筐数量
|
2023-11-20 16:04:53 +08:00 |
|
zhangzq
|
5e5feb5d4b
|
add:工单操作人
|
2023-11-15 16:32:35 +08:00 |
|
zhangzq
|
5bef91add4
|
add:工单界面添加操作人
|
2023-11-15 16:29:58 +08:00 |
|
zhangzq
|
eb958137a3
|
add:维修单挂起1
|
2023-11-15 14:56:35 +08:00 |
|
zhangzq
|
bb88cf869e
|
add:维修单挂起功能
|
2023-11-15 14:52:59 +08:00 |
|
zhangzq
|
9b81e28f67
|
rev:报修页面修改
|
2023-11-14 17:39:33 +08:00 |
|
zhangzq
|
6cf7fede4f
|
rev:载具打印
|
2023-11-14 14:19:01 +08:00 |
|
zhangzq
|
4354e961f4
|
rev:载具打印添加配置
|
2023-11-13 20:05:51 +08:00 |
|
zhangzhiqiang
|
3f0cf6092a
|
add:设备档案打印功能
|
2023-11-09 14:25:06 +08:00 |
|
zhangzhiqiang
|
e218f447a1
|
rev:设备报修添加手持
|
2023-11-08 17:22:52 +08:00 |
|
zhangzhiqiang
|
4c0128e1e7
|
add:飞书接口
|
2023-11-06 09:23:04 +08:00 |
|
zhangzhiqiang
|
ffb118be74
|
add:飞书接口
|
2023-11-06 09:22:37 +08:00 |
|
zhangzhiqiang
|
5f9b9e2540
|
add:飞书接口
|
2023-11-06 09:13:05 +08:00 |
|
zhangzhiqiang
|
d56b7e2aa8
|
rev:设备单据
|
2023-11-06 09:08:40 +08:00 |
|
zhangzhiqiang
|
5e3a5586c6
|
add:working material
|
2023-11-03 13:35:22 +08:00 |
|
zhangzhiqiang
|
02367d3c06
|
add:working material
|
2023-11-02 09:03:42 +08:00 |
|
