jenkins
|
55dcb795c9
|
Jenkins自动合并
|
5 years ago |
许心洁
|
e816c2fd6a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
258c1ccbe8
|
流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库
|
5 years ago |
|
jenkins
|
1594c49ca9
|
Jenkins自动合并
|
5 years ago |
zcg
|
f23b0f7bfe
|
解决冲突
|
5 years ago |
陆卫豪
|
3e9c1aaa76
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
WYnneaoapc
|
7451bc9460
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into wynne_temp_wc
|
5 years ago |
|
WYnneaoapc
|
99fd4221e2
|
task `1304` 1 活化开线管控
|
5 years ago |
|
jenkins
|
350f7101d2
|
Jenkins自动合并
|
5 years ago |
jokelone
|
f3756e6b34
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
b9b30cf19c
|
【任务：1306质量标准配置】
|
5 years ago |
|
WYnneaoapc
|
b3a04911b6
|
task `1300` 5 BI 产线运行情况
|
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 |
 王杰
|
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 |
|
jokelone
|
874fd139dc
|
Merge branch 'dev' into test
|
6 years ago |
E
|
59bdec9c6f
|
【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举
|
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 |
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 |
汪云昊
|
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 |
|
陈思洁
|
7d07580a78
|
合并冲突
|
6 years ago |
|
陈思洁
|
b9844c255b
|
生产计划表结构增加
|
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 |
|
E
|
c7d4253e5e
|
【bug 6872 - 收货、发运看板数据未加载】
|
6 years ago |
|
王杰
|
1f4a8d6e55
|
【安灯修改枚举】
|
6 years ago |
|
jokelone
|
a337f1824f
|
Merge branch 'dev' into test
|
6 years ago |