 王杰
|
c4c615bd15
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
3ff9fbc140
|
安灯图表
|
5 years ago |
WYnneaoapc
|
b088b40fd1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
a1a602e457
|
task `1300` 5 BI 产线运行情况
|
5 years ago |
jokelone
|
6995189893
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
46ec9e51b0
|
【任务：1211报表导出冗余字段】
|
5 years ago |
jenkins
|
6be1ef7dbd
|
Jenkins自动合并
|
5 years ago |
|
WYnneaoapc
|
ba0a857dd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
b52d5b392d
|
task `1300` 4 BI 产线运行情况
|
5 years ago |
许心洁
|
5a1dc6dc7d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
67f7d66782
|
宁德现场问题#330
|
5 years ago |
|
jokelone
|
2a4f20158c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
jokelone
|
874fd139dc
|
Merge branch 'dev' into test
|
5 years ago |
E
|
59bdec9c6f
|
【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举
|
5 years ago |
陆卫豪
|
0002f19d69
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
E
|
cc95fad3e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
E
|
ef9293867f
|
【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】
|
5 years ago |
|
WYnneaoapc
|
ef34a13313
|
task `1300` 2 BI 产线运行情况
|
5 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
|
5 years ago |
|
WYnneaoapc
|
b2daf9fd9c
|
task `1300` 1 BI 产线运行情况
|
5 years ago |
zcg
|
d6975bf5de
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
ccfba0fe56
|
mes枚举修改
|
5 years ago |
|
jokelone
|
73062459c5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
jokelone
|
0dfb948810
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
519d985838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
0acf17ddd7
|
【1211：报表1】
|
5 years ago |
|
jenkins
|
25b7d72694
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
927579aca5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
3b40d2b4f0
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
fc663ee283
|
作业流程导入导出BUG#6189
|
5 years ago |
汪云昊
|
6b11375a01
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
0707c3573e
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
79377f2da6
|
任务检查相关接口
|
5 years ago |
陈思洁
|
45c1fc6571
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
129e60a6df
|
【KT-1284 计划拉动-生产计划管理】
|
5 years ago |
|
WYnneaoapc
|
8e6349b9f2
|
Merge branch 'dev' into test
|
5 years ago |
gcj
|
a6bb80a5a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
2e98e17a05
|
【运输管理】
|
5 years ago |
|
zcg
|
7016f20282
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
7bf8534c16
|
mes枚举
|
5 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 |