汪云昊
|
2013ca569a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
a45d1ed104
|
fix:分页结束行计算错误的问题
|
5 years ago |
许心洁
|
c0629d52d1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
1c02cd6562
|
任务#2612，2613
|
5 years ago |
|
汪云昊
|
8d17cfcec0
|
feat:用户定制化配置功能
|
5 years ago |
|
汪云昊
|
a3e8caf085
|
fix:detachObject为空时报错
|
5 years ago |
|
汪云昊
|
55b047448b
|
fix:会话模式为默认时出现不能正常覆盖的问题
|
5 years ago |
|
汪云昊
|
7f291a26cd
|
会话模式配置-调整默认模式
|
5 years ago |
|
汪云昊
|
0d40470059
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
101a71970c
|
虚拟属性数据校验及参数赋值问题
|
5 years ago |
|
汪云昊
|
5a6a7a77fc
|
平台功能优化，移除通用缓存服务
|
5 years ago |
 钮海涛
|
9b3bb48231
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
wynne1005
|
4d608dd4c3
|
扩展dispatcher model
|
5 years ago |
|
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
|
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
3c22c8e3f4
|
test版本合并到master
|
5 years ago |
|
wynne1005
|
d0e1900a84
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
c1fd1f6eee
|
bypass redo release
|
5 years ago |
 曾贞一
|
374e73128d
|
【坤泰流程测试】
|
5 years ago |
|
汪云昊
|
1aa63db4d3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
4b3470b1fd
|
定时任务日志优化
邮件发送失败记录
|
5 years ago |
|
wynne1005
|
f3a13522a1
|
解决冲突
|
5 years ago |
|
wynne1005
|
3ba1c8ee62
|
新增组件类型枚举
|
5 years ago |
宋军超
|
ae285a6dc6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
 王杰
|
4df8a743a7
|
9735 19048-物料信息导入模板增加喷涂必需信息的维护-2020-07-21
|
5 years ago |
|
宋军超
|
076c6c1b4f
|
扭矩二合一查询关键件清单逻辑优化--目前根据 队列主表，队列明细表，车型散件配置清单，物料信息表。加上条件【一百位条码】,年度型相同，车型相同 内联查出所有的关键件零件——>查询车型散件配置清单中的零件信息
工位监控逻辑修改:产线添加工位监控模式字段，为空或10执行之前逻辑，为20时不需要查询工单信息，后面逻辑不变
|
5 years ago |
|
wynne1005
|
d5ee3d3b29
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
2116fdafc7
|
agv枚举
|
5 years ago |
|
曾贞一
|
b6a0d43bd0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
a379c97461
|
【2444 坤泰流程配置测试】
|
5 years ago |
|
钮海涛
|
e140910db7
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
汪云昊
|
94c21581dc
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
c230c57c97
|
定时任务 导入导出
定时任务 重载功能
|
5 years ago |
|
王杰
|
b3999ad481
|
dev merge test
|
5 years ago |
|
王杰
|
767c1bffbc
|
test merge dev
|
5 years ago |
|
钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
|
王杰
|
9a74188e55
|
master merge test
|
5 years ago |
qianhs
|
9461057a07
|
Finish Task #2080 Cost:8h
|
5 years ago |
陈思洁
|
1d799ed294
|
2447 中航 扣减错误信息保存
|
5 years ago |
|
王杰
|
204da853c3
|
[任务：2442]
|
5 years ago |
joke.wang
|
54a51a4c69
|
Fix Bug #916
|
5 years ago |
|
王杰
|
9b6be3167d
|
dev merge test
|
5 years ago |
|
王杰
|
d2ff83e22b
|
test merge dev
|
5 years ago |
|
曾贞一
|
6dd0614533
|
【欧洲-定时悬挂链汇总更新库存数据JOB-优化】
|
5 years ago |
|
宋军超
|
e4384bd569
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
2e5ab2cdcd
|
条码外上线添加赋值字段
|
5 years ago |
|
钮海涛
|
9a516f893f
|
合并dev代码到test
|
5 years ago |
|
钮海涛
|
37a12c0cdf
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
joke.wang
|
b69fcdc0c6
|
Finish Task #2399 Cost:6h
|
5 years ago |
|
宋军超
|
300e308394
|
新增盲检规则导入功能
|
5 years ago |