CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
193 Commits 3 Branches 0 Tags 6.6 MiB
e149150b1d
Commit Graph

193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
caixiang
e149150b1d mark 2023-05-30 16:07:24 +08:00
caixiang
3d5e5e5845 mark 2023-05-30 15:52:00 +08:00
caixiang
5a9f5ee38b mark 2023-05-09 14:24:13 +08:00
caixiang
7c21dfe8e1 初定 第一版 2023-01-13 11:01:42 +08:00
caixiang
2bc72469a0 初定 第一版 2023-01-11 15:58:24 +08:00
caixiang
cafcdd65e0 初定 第一版 2023-01-09 16:57:52 +08:00
闫阳
cc5848e5cd Merge pull request 'yanyang' (#19) from yanyang into master 
Reviewed-on: #19
 2023-01-06 16:37:27 +08:00
yanyang
445c7c0c3f Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2023-01-06 16:36:41 +08:00
yanyang
214f0a8ec9 新增查询 2023-01-06 16:36:19 +08:00
caixiang
74aaf857f0 mark 2023-01-06 16:21:09 +08:00
caixiang
353471b1f7 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2023-01-04 09:14:04 +08:00
caixiang
23aa6d5f89 commit for pull 2023-01-04 09:13:34 +08:00
闫阳
ea70ac4a6b Merge pull request 'fix' (#18) from yanyang into master 
Reviewed-on: #18
 2023-01-04 09:11:04 +08:00
yanyang
b6990dc4a0 fix 2023-01-04 09:10:19 +08:00
caixiang
8b14c369fb Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2023-01-03 16:29:29 +08:00
caixiang
c1d37a3dbc commit for pull 2023-01-03 16:29:18 +08:00
闫阳
5e32971f26 Merge pull request 'yanyang' (#17) from yanyang into master 
Reviewed-on: #17
 2023-01-03 16:26:30 +08:00
yanyang
1ce177ab5d Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2023-01-03 16:25:43 +08:00
yanyang
8b4e6b116e 特性类型样本大小 2023-01-03 16:25:35 +08:00
caixiang
9b545a9a03 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 
# Conflicts:
#	ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java
 2023-01-03 09:24:49 +08:00
caixiang
c75c89cab9 commit for pull 2023-01-03 09:24:12 +08:00
闫阳
04e8cc187a Merge pull request 'influx参数覆盖' (#16) from yanyang into master 
Reviewed-on: #16
 2022-12-28 10:33:12 +08:00
yanyang
add0eea2ac influx参数覆盖 2022-12-28 10:31:27 +08:00
caixiang
69f911c07c Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2022-12-13 11:00:15 +08:00
caixiang
5e8110ad2c Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2022-12-12 16:08:49 +08:00
caixiang
7e3e028eb0 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2022-12-12 16:08:43 +08:00
闫阳
37f0dbe548 Merge pull request 'yanyang' (#15) from yanyang into master 
Reviewed-on: #15
 2022-12-12 16:02:45 +08:00
yanyang
b501e8cd98 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-12-12 16:01:51 +08:00
yanyang
98baf93cff 样本排序 2022-12-12 16:01:43 +08:00
caixiang
ff63c194ee 新增 influxdb 多条件查询 2022-12-12 11:12:01 +08:00
闫阳
1173d670e4 Merge pull request '时间类型修改' (#14) from yanyang into master 
Reviewed-on: #14
 2022-12-09 17:01:11 +08:00
yanyang
c7c43cd906 时间类型修改 2022-12-09 17:00:02 +08:00
caixiang
1798ba8d1d Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 
 Conflicts:
	ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java
 2022-12-09 15:31:47 +08:00
caixiang
652812d3ba commit for pull 2022-12-09 15:31:32 +08:00
闫阳
1562854e59 Merge pull request 'yanyang' (#13) from yanyang into master 
Reviewed-on: #13
 2022-12-09 15:29:26 +08:00
yanyang
d03a3e06a3 MARK 2022-12-09 15:27:11 +08:00
yanyang
c9d01c9e11 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-12-09 09:08:12 +08:00
caixiang
de3fe9b95c mark 2022-12-09 09:06:52 +08:00
caixiang
53f0c58507 mark 2022-12-08 17:21:28 +08:00
yanyang
95a82b042d Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-12-08 16:26:28 +08:00
yanyang
b15ad64d76 MARK FOR PULL 2022-12-08 16:26:17 +08:00
caixiang
bf67380718 mark 2022-12-08 16:17:15 +08:00
caixiang
b93869c4a1 修改 influxdb query函数 2022-12-08 15:28:10 +08:00
yanyang
6829169a4a Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 
 Conflicts:
	ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java
 2022-12-07 16:58:35 +08:00
caixiang
2d9b0ea1f1 修改 influxdb query函数 2022-12-07 16:56:47 +08:00
yanyang
0e3f0f9168 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-12-07 11:07:41 +08:00
yanyang
b515eacbab MARK FOR PULL 2022-12-07 11:07:31 +08:00
caixiang
515df64760 修改判读方案算法 2022-12-07 11:05:27 +08:00
yanyang
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
yanyang
4864545f12 m 2022-12-01 15:50:30 +08:00