 钮海涛
|
81b84d86e5
|
新增KPI接口
|
5 years ago |
WYnneaoapc
|
0191a17a4d
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
0103c64247
|
task `1316` 1 拆分job任务
|
5 years ago |
|
WYnneaoapc
|
9157020997
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
gcj
|
b29d84bbad
|
【运输管理】
|
5 years ago |
|
WYnneaoapc
|
e206057aba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
ba355aab55
|
【运输管理】
|
5 years ago |
jenkins
|
5513e95884
|
Jenkins自动合并
|
5 years ago |
|
gcj
|
01e5919349
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
E
|
b5006a88f1
|
【#1302 器具管理-新增器具规则检查组件】【#1303 器具管理-修改更新箱条码组件】
|
5 years ago |
|
jenkins
|
78d80f03cf
|
Jenkins自动合并
|
5 years ago |
qianhs
|
15d3d3b5e1
|
【 库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】
|
5 years ago |
|
jenkins
|
34b843bd1f
|
Jenkins自动合并
|
5 years ago |
puxiao.liao
|
4f1455012f
|
【领料上线扫描时，在扫描完条码后将目标库位带出。
】bug7024
|
5 years ago |
 曾贞一
|
f800d3dd7b
|
【成品发运，获取在途库位逻辑修改】
|
5 years ago |
|
WYnneaoapc
|
50f77a5081
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
0e1599789d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
d92850c1a4
|
【运输管理】
|
5 years ago |
|
WYnneaoapc
|
a38dc051ac
|
task `1308` 1 PCN国际化资源
|
5 years ago |
汪云昊
|
38fc49f053
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
2fb79b8354
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
14f1ced301
|
会话文件展示地址封装
|
5 years ago |
|
jenkins
|
03051f4fd1
|
Jenkins自动合并
|
5 years ago |
|
puxiao.liao
|
0c01ffb230
|
【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急
】6978
|
5 years ago |
许心洁
|
4b340e6954
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
773f56b577
|
TASK_INO_STATUS 20和30的枚举类名严重错误，容易误导开发
|
5 years ago |
|
jenkins
|
8efcd210aa
|
Jenkins自动合并
|
5 years ago |
陈思洁
|
d0ddf208c3
|
【KT-1297 物流路线的【适用范围】优化】
|
5 years ago |
|
jenkins
|
95048bce44
|
Jenkins自动合并
|
5 years ago |
|
qianhs
|
d4d30bf634
|
【 零件号条码打印，扫描后需要提示当前扫描零件，当前扫描数量，剩余扫描数量（标包减去扫描数量）。】【bug7020】
|
5 years ago |
|
jenkins
|
cd1696c787
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
4632c7572c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
1318c6ef56
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
3dd247491a
|
软件适配器异常信息优化
|
5 years ago |
|
WYnneaoapc
|
129c84d4a8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
bc21d0b461
|
task `1308` 1 PCN国际化资源
|
5 years ago |
|
陈思洁
|
5d4e8a94c4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
c5ae91b41e
|
【KT-1286 计划拉动-计划拉动JOB】
|
5 years ago |
|
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 |
|
WYnneaoapc
|
2a3499de65
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
4182b4d852
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
6d357abe9f
|
task `1304` 2 活化开线管控
|
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
|
0e35bd1d6b
|
Jenkins自动合并
|
5 years ago |
|
钮海涛
|
e0f81a73d7
|
修改甘特图日历接口
|
5 years ago |
|
jenkins
|
cfebb937fb
|
Jenkins自动合并
|
5 years ago |
|
gcj
|
4c2d922ed9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
2c63820f98
|
【运输管理】
|
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 |
|
puxiao.liao
|
da4f32f0b4
|
【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急
】6978
|
5 years ago |
|
gcj
|
59e7704f67
|
【运输管理】装车单
|
5 years ago |
 王杰
|
7bc434ed15
|
安灯组装模型优化
|
5 years ago |
|
WYnneaoapc
|
84227c9b8a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
b3a04911b6
|
task `1300` 5 BI 产线运行情况
|
5 years ago |
|
汪云昊
|
8e3c1b750a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
35fd2f7952
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
3902fb6309
|
资源增量导入优化
|
5 years ago |
|
王杰
|
dfb23bab1d
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
bc61b43e8d
|
安灯人员统计报表工位代码不显示问题修复
|
5 years ago |
|
陆卫豪
|
5393d6e034
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
zcg
|
586dfb416b
|
[mes枚举修改]
|
5 years ago |
|
陈思洁
|
40c64db0b1
|
冲突
|
5 years ago |
|
陈思洁
|
ee14ce1d4b
|
【KT-快速入库功能】
|
5 years ago |
|
jenkins
|
015d284239
|
Jenkins自动合并
|
5 years ago |
|
puxiao.liao
|
99a1ec309d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
puxiao.liao
|
3bfb0995d5
|
【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位
】bug1299
|
5 years ago |
|
WYnneaoapc
|
168edce5bd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
48338fec28
|
task `1300` 5 BI 产线运行情况
|
5 years ago |
|
jenkins
|
39f4c733a4
|
Jenkins自动合并
|
5 years ago |
|
gcj
|
304677e7da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
91e3209ef9
|
【运输管理】
|
5 years ago |
|
王杰
|
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
|
874fd139dc
|
Merge branch 'dev' into test
|
5 years ago |
|
E
|
59bdec9c6f
|
【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举
|
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
|
0dfb948810
|
Merge branch 'dev' into test
|
5 years ago |