Commit Graph

97 Commits

Author SHA1 Message Date
68f7ceac87 优化 2022-08-11 08:47:16 +08:00
bf6064aa7e 更新 2022-08-10 18:29:16 +08:00
fc6cb184c3 更新 2022-08-09 19:08:22 +08:00
6ea0f433ce 更新 2022-08-08 19:36:21 +08:00
ldj_willow
02f5ec1bd3 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql
2022-08-08 17:10:06 +08:00
5c86b3808a Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-08-05 16:53:53 +08:00
3e1d05684c 修改 2022-08-05 16:53:22 +08:00
6a21976711 更新 2022-08-05 12:15:35 +08:00
18188916393
e8c8e0047c Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-08-05 10:27:24 +08:00
18188916393
04b1c0aacb 大屏值统计未下发以外的工单 2022-08-05 10:26:51 +08:00
7cb9051a20 更新 2022-08-04 19:47:16 +08:00
f0fbf69345 更新 2022-08-03 21:49:31 +08:00
938f22dc00 修改 2022-08-03 15:34:23 +08:00
983f6c2d1d Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-08-03 15:30:40 +08:00
c124635c6d 修改 2022-08-03 15:30:36 +08:00
loujf
e02a6c8cff 驱动更新 2022-08-03 10:23:38 +08:00
loujf
7f27dbd120 海量三个新驱动创建,导出smartCSV文件更新 2022-08-02 19:34:14 +08:00
18188916393
59d9c19764 提交 2022-08-02 19:00:44 +08:00
b5c04b33cc 更新 2022-08-02 18:11:04 +08:00
18188916393
9f64af34cf 提交 2022-08-02 17:38:50 +08:00
0e68a529c7 修改 2022-08-02 14:11:42 +08:00
6ae3fe3d36 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
#	mes/qd/src/views/wms/mps/produce/index.vue
2022-08-02 13:22:14 +08:00
b0b8f5bfd5 修改 2022-08-02 13:21:36 +08:00
e17321fd0e 修改 2022-08-02 13:21:19 +08:00
52a06fcc0e 代码更新 2022-08-01 17:18:00 +08:00
20d6197c77 代码更新 2022-08-01 14:53:44 +08:00
18188916393
ae20ab86a0 设备大屏统计30天记录 2022-08-01 14:10:50 +08:00
ldj_willow
41cc3c502b Merge remote-tracking branch 'origin/master' 2022-08-01 12:41:53 +08:00
18188916393
3cb3f6bab2 海亮大屏 2022-08-01 11:34:34 +08:00
4ead39c148 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-08-01 11:21:36 +08:00
341feb0af3 修改 2022-08-01 11:21:30 +08:00
ldj_willow
a775ad7048 大屏SQL语句修改 2022-08-01 09:34:42 +08:00
ldj_willow
c3746976d9 大屏SQL语句修改 2022-08-01 09:16:10 +08:00
7be750398e 更新导出协议 2022-07-29 18:01:37 +08:00
1db6d56719 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-07-29 17:26:07 +08:00
915d950ff0 修改 2022-07-29 17:26:02 +08:00
18188916393
76aaf154ad 生产大屏 2022-07-29 11:08:39 +08:00
f47a3646f9 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-07-29 10:44:17 +08:00
0d15eaa1ad 修改 2022-07-29 10:44:12 +08:00
fed6636a3e agv 2022-07-29 09:42:36 +08:00
2a35785f71 代码更新 2022-07-29 08:57:00 +08:00
b628e03405 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-07-28 18:38:21 +08:00
8869716a86 提交 2022-07-28 18:38:15 +08:00
b7bc76814a 代码更新 2022-07-27 17:17:56 +08:00
6d59b14d18 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-07-27 17:17:37 +08:00
ab27a8f415 代码更新 2022-07-27 17:16:55 +08:00
3f59e52359 代码更新 2022-07-27 17:11:14 +08:00
eee9d0b9cc Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2022-07-27 17:05:20 +08:00
7856b00d12 修改 2022-07-27 17:04:38 +08:00
18188916393
0e3eb2c3ae no message 2022-07-27 16:58:56 +08:00