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

175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
caixiang
c1d37a3dbc commit for pull 2023-01-03 16:29:18 +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
caixiang
f7712f184a 修改判读方案算法 2022-12-01 15:33:57 +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
闫阳
8a4f0094a1 Merge pull request 'm' (#12) from yanyang into master 
Reviewed-on: #12
 2022-11-25 10:07:32 +08:00
yanyang
1b9c3499a3 m 2022-11-25 10:06:25 +08:00
闫阳
e6b5583d05 Merge pull request '质量计划' (#11) from yanyang into master 
Reviewed-on: #11
 2022-09-30 08:56:37 +08:00
yanyang
a3cc4df25c 质量计划 2022-09-30 08:54:33 +08:00
闫阳
7abcafb93d Merge pull request 'yanyang' (#10) from yanyang into master 
Reviewed-on: #10
 2022-09-15 09:57:14 +08:00
yanyang
559e76f6fb Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-09-15 09:56:11 +08:00
yanyang
fb65441dcc basic 2022-09-15 09:55:49 +08:00
闫阳
dda48c610f Merge pull request 'yanyang' (#9) from yanyang into master 
Reviewed-on: #9
 2022-09-02 16:23:12 +08:00
yanyang
c0ce68f5b2 config 2022-09-02 16:21:20 +08:00
yanyang
0fb22fa625 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 
 Conflicts:
	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
 2022-08-23 15:13:13 +08:00
yanyang
db901ef527 m 2022-08-23 15:12:46 +08:00
yanyang
96f9808e02 质量规划 2022-08-23 15:02:24 +08:00
caixiang
60b7c940fa Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 
 Conflicts:
	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
 2022-08-23 14:47:23 +08:00