caixiang
|
6ebe466df1
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
|
2023-06-25 16:40:52 +08:00 |
|
|
|
32647c035c
|
CommonField
|
2023-06-25 16:34:35 +08:00 |
|
|
|
9546ceec03
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
|
2023-06-25 15:29:24 +08:00 |
|
|
|
3a583ac09f
|
通用作业 检验时间
|
2023-06-25 15:28:23 +08:00 |
|
caixiang
|
fced72a94f
|
mark
|
2023-06-21 14:12:07 +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
|
cafcdd65e0
|
初定 第一版
|
2023-01-09 16:57:52 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
98baf93cff
|
样本排序
|
2022-12-12 16:01:43 +08:00 |
|
caixiang
|
ff63c194ee
|
新增 influxdb 多条件查询
|
2022-12-12 11:12:01 +08:00 |
|
|
|
c7c43cd906
|
时间类型修改
|
2022-12-09 17:00:02 +08:00 |
|
|
|
d03a3e06a3
|
MARK
|
2022-12-09 15:27:11 +08:00 |
|
|
|
95a82b042d
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
|
2022-12-08 16:26:28 +08:00 |
|
|
|
b15ad64d76
|
MARK FOR PULL
|
2022-12-08 16:26:17 +08:00 |
|
caixiang
|
b93869c4a1
|
修改 influxdb query函数
|
2022-12-08 15:28:10 +08:00 |
|
|
|
0e3f0f9168
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
|
2022-12-07 11:07:41 +08:00 |
|
|
|
b515eacbab
|
MARK FOR PULL
|
2022-12-07 11:07:31 +08:00 |
|
caixiang
|
515df64760
|
修改判读方案算法
|
2022-12-07 11:05:27 +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 |
|
