 贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
6 years ago |
qianhs
|
564ba1e116
|
【1472 工步-设备状态采集（原PLC采集【设备状态】）】
|
6 years ago |
zcg
|
74e4aa953b
|
【任务 1480 照片采集】
|
6 years ago |
陈思洁
|
22788f1c44
|
还原POM文件TEST-DEV
|
6 years ago |
 王杰
|
b6a83fff5d
|
Merge branch 'dev' into test
|
6 years ago |
|
zcg
|
3d28840bae
|
【新增枚举，pojo】
|
6 years ago |
luweihao
|
16879a4f20
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
12579c7a14
|
还原pom
|
6 years ago |
|
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
6 years ago |
|
luweihao
|
5892f87bdc
|
task `1425` pcn pojo 迁移
|
6 years ago |
|
luweihao
|
e2d63434db
|
bug `7570` `7561` 生产扣减代码去除测试代码
|
6 years ago |
|
luweihao
|
b556051295
|
task 修改监控类位置
|
6 years ago |
|
luweihao
|
1b727f1721
|
task 任务重试测试
|
6 years ago |
|
luweihao
|
68cbd54f37
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
5fd51f6b1d
|
task 任务重试测试
|
6 years ago |
joke
|
d42b7ebbb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke
|
2b84f93950
|
任务: 1424 DT通信
|
6 years ago |
|
luweihao
|
5eb7cf03ed
|
task 数据同步添加错误信息字段
|
6 years ago |
|
luweihao
|
bbfcdfdd64
|
ptl pojo 提交
|
6 years ago |
|
luweihao
|
d750a88aad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
1c144eca4d
|
移除mespcn乐观锁
|
6 years ago |
|
jokelone
|
54cd3cfc45
|
业务表增加唯一索引
|
6 years ago |
|
luweihao
|
acc907dd28
|
task `1295` mes添加索引
|
6 years ago |
|
luweihao
|
5f25e311bb
|
mes-pcn pojo添加serializable
|
6 years ago |
|
王杰
|
3f77135a17
|
枚举
|
6 years ago |
|
luweihao
|
4ae13f8270
|
task `1408` 生产数据结构化
|
6 years ago |
|
王杰
|
bf71cd07d0
|
JIS发运
|
6 years ago |
|
luweihao
|
88d1e39578
|
压测计时
|
6 years ago |
|
luweihao
|
01a694be70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
6baeeee71e
|
task `1392` 调整工步 错误处理实现
|
6 years ago |
|
jokelone
|
fd1a0ebdb8
|
【任务：1404 过程质量 检查项类型分组展示】
|
6 years ago |
|
luweihao
|
325399127e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
28587fbb98
|
task `1392` 调整工步 错误处理实现
|
6 years ago |
|
jokelone
|
2d8b55b61a
|
【现场优化：59 过程质量】
|
6 years ago |
|
jokelone
|
8ef70ed627
|
【现场优化：59 过程质量优化】
|
6 years ago |
|
zcg
|
2396863bab
|
【任务:1383 数据监听定时数据抓取】
|
6 years ago |
|
jokelone
|
f1096e9ec5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
51839d7be5
|
【任务：1381】
|
6 years ago |
|
zcg
|
add40a27e3
|
【任务：1382，数据监听基础模块开发】
|
6 years ago |
WYnneaoapc
|
ded27853a8
|
task 修改生产数据
|
6 years ago |
|
王杰
|
031d57e081
|
JIS
|
6 years ago |
|
王杰
|
54bdf8f6a0
|
JIS
|
6 years ago |
|
WYnneaoapc
|
b1d030e0dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
bf62494236
|
JIS
|
6 years ago |
|
WYnneaoapc
|
a9f2cf2501
|
task 1309 大数据检索
|
6 years ago |
|
jokelone
|
c3a7e0057b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
fea1811191
|
【bug：7153 JIT排序】
|
6 years ago |
|
王杰
|
bcec1d7e62
|
JIS
|
6 years ago |
|
王杰
|
3fe50125ae
|
JIS
|
6 years ago |
|
WYnneaoapc
|
011b4d2205
|
zh20200101 现场问题修改 BI all
|
6 years ago |
|
jokelone
|
0e84990f3c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
20f6961daf
|
【任务：1327JIT生产】
|
6 years ago |
gcj
|
a7d1ec785b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
423b81609a
|
【需求：1198】
|
6 years ago |
|
zcg
|
b06ecdd3f3
|
[bug：7043，PCN节点-模块修改]
|
6 years ago |
|
陆卫豪
|
3e9c1aaa76
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
99fd4221e2
|
task `1304` 1 活化开线管控
|
6 years ago |
jenkins
|
350f7101d2
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
b3a04911b6
|
task `1300` 5 BI 产线运行情况
|
6 years ago |
|
jokelone
|
0dfb948810
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
f57f1087d9
|
task `1295` 1 添加数据库索引
|
6 years ago |
|
WYnneaoapc
|
2ede8c9dfe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
c6c57dd829
|
task `1294-1` 查找workcell的时候需要带上产线
|
6 years ago |
|
王杰
|
571ab9bd3e
|
获取打印模版参数修改
|
6 years ago |
|
WYnneaoapc
|
238d0aea3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
efb29aa8f4
|
task `1294-1` 查找workcell的时候需要带上产线
|
6 years ago |
|
王杰
|
bba25ad2de
|
批量打包model修改
|
6 years ago |
|
WYnneaoapc
|
9b8675c904
|
task `1292-1` 新增条码履历字段
|
6 years ago |
|
王杰
|
1f4a8d6e55
|
【安灯修改枚举】
|
6 years ago |
|
jokelone
|
a337f1824f
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
fc5282342f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
056dbaacf2
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
f4b50200b2
|
bug`6866` 1 打印模板同步
|
6 years ago |
|
jokelone
|
edcdeb3d4f
|
【任务：1287】
|
6 years ago |
|
jokelone
|
917774921e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a6730b0cd8
|
【任务：1287产品类型图片】
|
6 years ago |
|
WYnneaoapc
|
64267e19b0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7069bc5cbb
|
task`1287`3` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
jokelone
|
8c5eb8d7c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
c42775389d
|
【任务：1273质量检测增加字段】
|
6 years ago |
|
WYnneaoapc
|
2d7558e1ba
|
task`1287`2` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
WYnneaoapc
|
93bc62b921
|
task`1287` 新增文件表，原来业务与文件脱离
|
6 years ago |
|
jokelone
|
f011aab765
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a4d38de535
|
【任务：1272代码优化】
|
6 years ago |
|
王杰
|
91730dd195
|
【需求：1277，关闭，暂停，完成工单 需要停线，做到方法可配】
|
6 years ago |
|
jokelone
|
4025a0963b
|
【任务：1273质量检测增加检测项类型1】
|
6 years ago |
|
王杰
|
5b672e7d68
|
更新 'modules/i3plus-pojo-mes-pcn/pom.xml'
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
王杰
|
b9906cee55
|
增加枚举
|
6 years ago |
|
jenkins
|
7630541146
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
52f4854621
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
60e4e1a7f3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
3c9183e422
|
【任务：1256工序BOM改为工位BOM】
|
6 years ago |
|
王杰
|
99b66e459d
|
【需求：1221，导入】
|
6 years ago |
|
jenkins
|
33f3fd0963
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
55b07e8e75
|
1256 工序bom改为工位bom
|
6 years ago |
|
陆卫豪
|
7556ada2d4
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
9e64ee8258
|
【需求：1221，导入】
|
6 years ago |
|
王杰
|
73b1e827d6
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
1ab2c3605a
|
【需求：1221，导入】
|
6 years ago |
|
王杰
|
e9055e3c5d
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
30aa0bb099
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
c770dda7b2
|
问题修改 6283
|
6 years ago |
|
jenkins
|
870dc7007d
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
902ef5b177
|
【bug：6577缺陷获取字段修改】
|
6 years ago |
|
王杰
|
1d920627ec
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
0e9f13ff82
|
【bug：6582报废原因增加报废类型】
|
6 years ago |
|
jokelone
|
e754cb9053
|
【优化：27班组增加产线、班长字段】
|
6 years ago |
|
jokelone
|
8a806815a5
|
【任务：1193qty数量类型更改为Double】
|
6 years ago |
|
王杰
|
a41c00f129
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
4146126284
|
【需求：1202，条码补打】
|
6 years ago |
|
jokelone
|
5bc9b9b082
|
【任务：1193字段类型修改】
|
6 years ago |
|
王杰
|
dd0304d713
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
7d623560b6
|
【需求：1202，条码补打】
|
6 years ago |
crish
|
4d3adf5daf
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
07ee1971ae
|
【bug：6522工位增加序号字段】
|
6 years ago |
|
陆卫豪
|
62800f757e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
185b40a586
|
6518 管控代码修改
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
陆卫豪
|
d6ff7aa2b1
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
5943854c5b
|
增加字段
|
6 years ago |
|
jenkins
|
8eb8c2f97e
|
Merge branch 'master' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
9f9c095846
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
4441d1dc86
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
WYnneaoapc
|
88d480403c
|
数据库字段初始化属性 赋值longtext
|
6 years ago |
|
王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
9baac06cb7
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
e91369c82a
|
【需求：1198】
|
6 years ago |
|
王杰
|
7a023d0f4b
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
3c3de49512
|
【bug:6483】
|
6 years ago |
|
王杰
|
7f08847c50
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
6297ccc4d7
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
f632308d0a
|
【任务：1193接口数据解析】
|
6 years ago |
|
陆卫豪
|
4a76c480ac
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
6 years ago |
|
陆卫豪
|
82fd56dc68
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
12a66262be
|
解决冲突
|
6 years ago |
|
WYnneaoapc
|
fdd051f2dd
|
打印修复
|
6 years ago |
|
jenkins
|
4d2a2a35b0
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
f6d50bdfb7
|
【需求：1167，产品批量打包】
|
6 years ago |
|
王杰
|
693ac2451e
|
【需求：1167，产品批量打包】
|
6 years ago |
|
jokelone
|
4cec8e8ac8
|
【任务：1193接口物料拆解增加工位字段】
|
6 years ago |
|
王杰
|
1a7164c474
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
9ca2760866
|
【任务：1193接口repository】/s
|
6 years ago |
|
jokelone
|
9842ed2181
|
【任务：1193接口pojo】
|
6 years ago |
|
王杰
|
e60256e291
|
【需求：1167，包装特殊批次工步】
|
6 years ago |
|
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
陆卫豪
|
95d8dbb908
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
7ba63dc9a8
|
6283 打包扫描
|
6 years ago |
|
陆卫豪
|
3fa5437c5a
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
37e288ff77
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
|
6 years ago |