wynne1005
|
88233f080a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
wynne1005
|
3ec8109e82
|
枪优化
|
5 years ago |
王杰
|
e8611616db
|
IPC
|
5 years ago |
wynne1005
|
5fad38392e
|
添加索引 脚本表更新
|
5 years ago |
joke.wang
|
af539c85a7
|
mgn bug
|
5 years ago |
王杰
|
bc9adf8ac0
|
ptl
|
5 years ago |
钮海涛
|
e239c89e63
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
钮海涛
|
7f55af4477
|
Finish Task #2560 Cost:8h
|
5 years ago |
joke.wang
|
13f7121610
|
海纳川看板
|
5 years ago |
joke.wang
|
01ac2e85da
|
Fix Bug #10087
|
5 years ago |
宋军超
|
e007a52732
|
修改海纳川问题
|
5 years ago |
王杰
|
4a59b5c913
|
bug: 10003 19073-安灯作业安灯类型自处理名称修改工装-20200728
|
5 years ago |
joke.wang
|
ea922affba
|
Start Task #2522 Cost:8h Left:8h
|
5 years ago |
puxiao.liao
|
937eac5e87
|
Finish Task #2549 Cost:4h
自动生成领料单增加默认来源存储区、自动获取默认目标库位
|
5 years ago |
joke.wang
|
3223158529
|
Fix Bug #10108
|
5 years ago |
wynne1005
|
7593b63cfc
|
重做枚举
|
5 years ago |
joke.wang
|
47f7e24f57
|
Fix Bug #10060
|
5 years ago |
puxiao.liao
|
2e3f5bb2af
|
Fix bug#9994
库存明细--显示重复
|
5 years ago |
joke.wang
|
768e31e636
|
Fix Bug #9995
|
5 years ago |
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
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 |