Commit Graph

23 Commits

Author SHA1 Message Date
b515eacbab MARK FOR PULL 2022-12-07 11:07:31 +08:00
ab35b10130 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
 Conflicts:
	ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java
	ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java
	ym-influx/src/main/java/com/cnbm/influx/template/Event.java
2022-12-01 15:54:41 +08:00
4864545f12 m 2022-12-01 15:50:30 +08:00
caixiang
8bfcaaf429 修改判读方案算法 2022-12-01 11:45:05 +08:00
caixiang
650e9a2324 修改判读方案算法 2022-11-29 11:11:07 +08:00
caixiang
a2d91083f2 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2022-11-25 10:12:40 +08:00
caixiang
bd9276036b mark for pull 2022-11-25 10:12:33 +08:00
1b9c3499a3 m 2022-11-25 10:06:25 +08:00
fb65441dcc basic 2022-09-15 09:55:49 +08:00
c0ce68f5b2 config 2022-09-02 16:21:20 +08:00
96f9808e02 质量规划 2022-08-23 15:02:24 +08:00
caixiang
01c95bfe1d mark for pull 2022-08-09 14:57:55 +08:00
caixiang
0750c9583e mark 2022-08-01 13:42:54 +08:00
caixiang
e9c8f7857b 新增:XMR 控制图 2022-07-29 16:56:35 +08:00
caixiang
227a27295d Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2022-07-29 14:23:19 +08:00
caixiang
2d1ef3d743 mark for pull 2022-07-29 14:23:13 +08:00
bac1ec5b70 数据库字段更改 2022-07-29 14:19:35 +08:00
caixiang
8a3a037bda mark 2022-07-29 10:38:43 +08:00
caixiang
e7a542d386 新增 MR MS 控制图 2022-07-29 10:28:14 +08:00
caixiang
fde6a8b684 mark 2022-07-27 20:04:38 +08:00
caixiang
d26600892f mark 2022-07-25 16:58:55 +08:00
caixiang
f498afd856 mark for pull 2022-07-21 09:50:01 +08:00
caixiang
2b34011129 mark for pull 2022-07-20 15:33:30 +08:00