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 |
王杰
|
e1b3b14a36
|
test merge dev
|
5 years ago |
王杰
|
6de2bc5472
|
Merge branch 'test' into dev
|
5 years ago |
qianhs
|
860f6d11f0
|
Finish Task #2080 Cost:8h
|
5 years ago |
曾贞一
|
354d1290f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
曾贞一
|
f99c5232be
|
【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】
|
5 years ago |
宋军超
|
1c93d21815
|
修改字段BIN_NO
|
5 years ago |
王杰
|
7e48674d9e
|
dev merge test
|
5 years ago |
王杰
|
4260316f62
|
test merge dev
|
5 years ago |
joke.wang
|
e5cd6692d4
|
Finish Task #2359
|
5 years ago |
钮海涛
|
8d29e72322
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
钮海涛
|
dcc23e56cd
|
三力士演示demo
|
5 years ago |
joke.wang
|
52ad38fa9d
|
Finish Task #2238
|
5 years ago |
王杰
|
a2f047553f
|
pom
|
5 years ago |
王杰
|
c20f630402
|
Merge branch 'test' into dev
|
5 years ago |
王杰
|
dc91809bb7
|
test merge dev
|
5 years ago |
钮海涛
|
1581e8b86c
|
三力士演示demo
|
5 years ago |
曾贞一
|
e9492a86b0
|
【2315 07 1.2.3.6.3欧洲WMS-RFID查询】
|
5 years ago |
钮海涛
|
f061ff7b73
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
钮海涛
|
c980c6c87c
|
三力士演示demo
|
5 years ago |
曾贞一
|
5dfad71e39
|
【2292 子 07 1.2.3.6.3欧洲WMS-PCR-RFID入库 】
【2310 07 1.2.3.6.3欧洲WMS-RFID发运】
【2312 07 1.2.3.6.3欧洲WMS-RFID空车回库】
|
5 years ago |
许心洁
|
9a62fe0e06
|
BUG#9302
|
5 years ago |
qianhs
|
e321ca3790
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
宋军超
|
8e99ae38e6
|
修改测试天津bug
|
5 years ago |
qianhs
|
f0b8cee974
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
qianhs
|
ba6be25390
|
Finish Task #2080 Cost:8h
|
5 years ago |
陈思洁
|
47ef0fa503
|
【2286 07 1.1.2.2 强制放行ByPass】
|
5 years ago |
wynne1005
|
a84186e023
|
中航审核发布
|
5 years ago |
宋军超
|
716f0ac1f9
|
对象结构添加是否显示和显示顺序字段
|
5 years ago |
宋军超
|
93d7b4dac8
|
首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件
|
5 years ago |
钮海涛
|
6033695b99
|
修复合并版本问题
|
5 years ago |
wynne1005
|
085f15427d
|
还原pom
|
5 years ago |
wynne1005
|
dfa993b9e9
|
还原pom
|
5 years ago |
wynne1005
|
15f0a37508
|
还原pom
|
5 years ago |
汪云昊
|
a2f7642d53
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
汪云昊
|
cbf1c97c06
|
彭伟代码恢复
定时任务日志过滤器
|
5 years ago |
joke.wang
|
4bb5dbfac5
|
Finish Task #2236 Cost:8h
|
5 years ago |
joke.wang
|
44e3d667b3
|
订单池枚举
|
5 years ago |
joke.wang
|
76e3fb0811
|
Finish Task #Finish Task #2236
|
5 years ago |
wynne1005
|
bcb4e5ad13
|
merge test
|
5 years ago |
wynne1005
|
31b5f3e234
|
merge dev 还原pom
|
5 years ago |
wynne1005
|
7b795c12fb
|
merge master
|
5 years ago |
qianhs
|
b48d38ee62
|
Finish Task #2080 Cost:8h
|
5 years ago |
陈思洁
|
27ef6dc7f3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
陈思洁
|
7f4c173105
|
【2250 总装条码打印,2228 06 1.2.4.6.1.7 总装上线工位】
|
5 years ago |
joke.wang
|
ad6249f412
|
Finish Task #2235 Cost:8h
|
5 years ago |
wynne1005
|
b18408b3bb
|
merge test
|
5 years ago |
puxiao.liao
|
1f6c613488
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
曾贞一
|
f4edb471c3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
曾贞一
|
3d826c5edc
|
【智能化开发-日志记录优化】
|
5 years ago |
puxiao.liao
|
1d2c2b7be2
|
海纳川智能化
|
5 years ago |
joke.wang
|
ab0ae20d40
|
Finish Task #2234 客户JIT预装队列
|
5 years ago |
袁津哲
|
bdde5bbb9a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
袁津哲
|
c73ef2b93b
|
开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
|
5 years ago |
wynne1005
|
b8239f6455
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
钮海涛
|
32eb9dc797
|
修复合并版本问题
|
5 years ago |
钮海涛
|
9dca27259e
|
Merge branch 'test' into dev
|
5 years ago |
puxiao.liao
|
37fb285aa9
|
海纳川智能化
|
5 years ago |
王杰
|
5ccf659c94
|
[bug:9149]
|
5 years ago |
王杰
|
31d7b71872
|
mes enum order type
|
5 years ago |
joke.wang
|
d44312c470
|
Fix Bug #9151
|
5 years ago |
袁津哲
|
56a4edc4c0
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
袁津哲
|
295860683a
|
开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
|
5 years ago |
王杰
|
472b2f1ee6
|
bug 9149
|
5 years ago |
钮海涛
|
0626d6f969
|
修复版本问题
|
5 years ago |
钮海涛
|
e42ea19f37
|
修复版本问题
|
5 years ago |
钮海涛
|
8d4c5f3cd4
|
Merge branch 'test' into dev
|
5 years ago |