jenkins
|
0e35bd1d6b
|
Jenkins自动合并
|
5 years ago |
 钮海涛
|
e0f81a73d7
|
修改甘特图日历接口
|
5 years ago |
|
jenkins
|
cfebb937fb
|
Jenkins自动合并
|
6 years ago |
gcj
|
4c2d922ed9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
2c63820f98
|
【运输管理】
|
6 years ago |
|
jenkins
|
350f7101d2
|
Jenkins自动合并
|
6 years ago |
jokelone
|
f3756e6b34
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
b9b30cf19c
|
【任务：1306质量标准配置】
|
6 years ago |
puxiao.liao
|
da4f32f0b4
|
【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急
】6978
|
6 years ago |
|
gcj
|
59e7704f67
|
【运输管理】装车单
|
6 years ago |
 王杰
|
7bc434ed15
|
安灯组装模型优化
|
6 years ago |
WYnneaoapc
|
84227c9b8a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
b3a04911b6
|
task `1300` 5 BI 产线运行情况
|
6 years ago |
汪云昊
|
8e3c1b750a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
35fd2f7952
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
3902fb6309
|
资源增量导入优化
|
6 years ago |
|
王杰
|
0dac1a6d84
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
dfb23bab1d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
bc61b43e8d
|
安灯人员统计报表工位代码不显示问题修复
|
6 years ago |
陆卫豪
|
5393d6e034
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
zcg
|
586dfb416b
|
[mes枚举修改]
|
6 years ago |
陈思洁
|
40c64db0b1
|
冲突
|
6 years ago |
|
陈思洁
|
ee14ce1d4b
|
【KT-快速入库功能】
|
6 years ago |
|
jenkins
|
015d284239
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
99a1ec309d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
puxiao.liao
|
3bfb0995d5
|
【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位
】bug1299
|
6 years ago |
|
WYnneaoapc
|
168edce5bd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
48338fec28
|
task `1300` 5 BI 产线运行情况
|
6 years ago |
|
jenkins
|
39f4c733a4
|
Jenkins自动合并
|
6 years ago |
|
gcj
|
304677e7da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
91e3209ef9
|
【运输管理】
|
6 years ago |
|
王杰
|
c4c615bd15
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
3ff9fbc140
|
安灯图表
|
6 years ago |
|
WYnneaoapc
|
b088b40fd1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
a1a602e457
|
task `1300` 5 BI 产线运行情况
|
6 years ago |
|
jokelone
|
6995189893
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
46ec9e51b0
|
【任务：1211报表导出冗余字段】
|
6 years ago |
|
jenkins
|
6be1ef7dbd
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
ba0a857dd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
b52d5b392d
|
task `1300` 4 BI 产线运行情况
|
6 years ago |
许心洁
|
5a1dc6dc7d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
67f7d66782
|
宁德现场问题#330
|
6 years ago |
|
jokelone
|
874fd139dc
|
Merge branch 'dev' into test
|
6 years ago |
E
|
59bdec9c6f
|
【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举
|
6 years ago |
|
WYnneaoapc
|
73cb6a7229
|
merge
|
6 years ago |
|
陆卫豪
|
0002f19d69
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
E
|
cc95fad3e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
E
|
ef9293867f
|
【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】
|
6 years ago |
|
WYnneaoapc
|
ef34a13313
|
task `1300` 2 BI 产线运行情况
|
6 years ago |
|
WYnneaoapc
|
e3d84dd48f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
6 years ago |
|
WYnneaoapc
|
b2daf9fd9c
|
task `1300` 1 BI 产线运行情况
|
6 years ago |
|
zcg
|
d6975bf5de
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
ccfba0fe56
|
mes枚举修改
|
6 years ago |
|
jokelone
|
0dfb948810
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
519d985838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
0acf17ddd7
|
【1211：报表1】
|
6 years ago |
|
许心洁
|
927579aca5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
fc663ee283
|
作业流程导入导出BUG#6189
|
6 years ago |
|
汪云昊
|
6b11375a01
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
79377f2da6
|
任务检查相关接口
|
6 years ago |
|
陈思洁
|
45c1fc6571
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
129e60a6df
|
【KT-1284 计划拉动-生产计划管理】
|
6 years ago |
|
WYnneaoapc
|
8694cb1f5a
|
Merge branch 'test'
|
6 years ago |
|
WYnneaoapc
|
8e6349b9f2
|
Merge branch 'dev' into test
|
6 years ago |
|
gcj
|
a6bb80a5a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
2e98e17a05
|
【运输管理】
|
6 years ago |
|
zcg
|
7016f20282
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
7bf8534c16
|
mes枚举
|
6 years ago |
|
汪云昊
|
f002a0fe5a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
03d432993a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
47fb080742
|
lac线程超时监控优化
Session超时时间参数化
lac添加TaskCheck
日志添加索引
|
6 years ago |
|
jenkins
|
c41026a6b2
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
f57f1087d9
|
task `1295` 1 添加数据库索引
|
6 years ago |
|
钮海涛
|
8385038290
|
修改甘特图日历接口
|
6 years ago |
|
jenkins
|
059f14f997
|
Jenkins自动合并
|
6 years ago |
qianhs
|
da2cfd77b0
|
【 增加一个扫描零件上的条码，累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】
|
6 years ago |
|
jenkins
|
5748480dc4
|
Jenkins自动合并
|
6 years ago |
|
陈思洁
|
7d07580a78
|
合并冲突
|
6 years ago |
|
陈思洁
|
b9844c255b
|
生产计划表结构增加
|
6 years ago |
|
jenkins
|
3f1758785c
|
Jenkins自动合并
|
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 |
|
gcj
|
3e6ca8d039
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
a1a3d1e838
|
【Bug清单】------------------------------
|
6 years ago |
|
jenkins
|
7d3ff10acb
|
Jenkins自动合并
|
6 years ago |
|
钮海涛
|
06125eab20
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java
|
6 years ago |
|
钮海涛
|
f5181072b5
|
新增表达式录入界面接口
|
6 years ago |
|
钮海涛
|
68bba613e3
|
新增表达式录入界面接口
|
6 years ago |
|
jenkins
|
af9bb85377
|
Jenkins自动合并
|
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 |
|
钮海涛
|
222e1b020d
|
新增表达式录入界面接口
|
6 years ago |
|
王杰
|
e636bfaa83
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
7ca0ac3e5a
|
解决冲突
|
6 years ago |
|
王杰
|
bba25ad2de
|
批量打包model修改
|
6 years ago |
|
E
|
c7d4253e5e
|
【bug 6872 - 收货、发运看板数据未加载】
|
6 years ago |
|
jenkins
|
6fc8833b01
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
bc5beeba7d
|
添加适配记录索引
|
6 years ago |
|
WYnneaoapc
|
9b8675c904
|
task `1292-1` 新增条码履历字段
|
6 years ago |