wynne1005
|
032a7e8126
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
d699e88984
|
StationRequestBean
|
5 years ago |
joke.wang
|
1cf11c4500
|
Fix Bug #10477
|
5 years ago |
|
joke.wang
|
3f03b5fab5
|
产线表增加序号字段
|
5 years ago |
|
wynne1005
|
a751d5a8a7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
8d7b0fae6a
|
添加小枪日志 与不需要打枪绑定 自动跳过
|
5 years ago |
宋军超
|
44b90bf639
|
修改海纳川问题
|
5 years ago |
 钮海涛
|
b437a78e31
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
 王杰
|
f45137db94
|
注塑上料
|
5 years ago |
|
钮海涛
|
438dcacdce
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
53151424b9
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
陈思洁
|
a5ea72f593
|
【新增库位实体】
|
5 years ago |
|
陈思洁
|
a093f06edc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
38f9adc2dd
|
【10554 19048--喷涂条码打印功能不应该查询出其他车间的生产计划！-2020-08-13】
|
5 years ago |
|
wynne1005
|
59aadc94ce
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
763b88b420
|
工位扫描添加工步触发条件
|
5 years ago |
|
宋军超
|
19b1bfb9b6
|
修改海纳川打印
|
5 years ago |
|
joke.wang
|
2d52fe0a40
|
Fix Bug #10535
|
5 years ago |
|
joke.wang
|
89bd4f189a
|
项目表增加字段
|
5 years ago |
|
joke.wang
|
74cc0c757d
|
成品标签打印
|
5 years ago |
|
wynne1005
|
ba558d640e
|
tmp
|
5 years ago |
|
joke.wang
|
bf902b8366
|
Fix Bug #10294
|
5 years ago |
|
王杰
|
175052ebcc
|
报工表加质量状态 默认合格
|
5 years ago |
|
王杰
|
1707f6b228
|
MesProdWorkCenter
|
5 years ago |
汪云昊
|
bda160ccec
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
joke.wang
|
a522db04a9
|
过程条码增加字段vinCode
|
5 years ago |
|
宋军超
|
84f61e65fc
|
修改海纳川问题
|
5 years ago |
|
王杰
|
18dd2cbcb2
|
zs
|
5 years ago |
|
王杰
|
772229b983
|
andon
|
5 years ago |
|
王杰
|
9e8cb0b844
|
注塑
|
5 years ago |
|
陈思洁
|
056d4390ca
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
4a99857248
|
【10414 19048 - 注塑产品消耗BOM报表！-2020-08-05】
|
5 years ago |
|
joke.wang
|
8c2fd8a587
|
Fix Bug #10476
|
5 years ago |
|
joke.wang
|
f495ffed54
|
Fix Bug #10477
|
5 years ago |
|
joke.wang
|
4bdd2b770b
|
Fix Bug #10486
|
5 years ago |
|
joke.wang
|
51f9d92d36
|
北京麦格纳esop展示组件修改
|
5 years ago |
|
joke.wang
|
7c3594a870
|
Fix Bug #9589
|
5 years ago |
|
陈思洁
|
e4c8431a22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
653b413623
|
【10334 19048-MES、WMS接口JIT02中增加内部工单号！-2020-08-03】
|
5 years ago |
|
宋军超
|
e70192d3c2
|
添加日志查询问题
|
5 years ago |
|
宋军超
|
625b780aaf
|
添加海纳川数据复核工步和产线状态看板变更
|
5 years ago |
|
wynne1005
|
3af4d32a97
|
mes工位运行状态
|
5 years ago |
|
joke.wang
|
edb85b5ea6
|
桌面BI
|
5 years ago |
|
wynne1005
|
3c004324b1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
6e455f5d72
|
reqBean 添加productSn
|
5 years ago |
|
王杰
|
5413fc259c
|
pcn 缺陷
|
5 years ago |
|
宋军超
|
162e2d33d7
|
修改海纳川问题
|
5 years ago |
|
宋军超
|
99787412cd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
8eade912c7
|
添加返工返修数据复核逻辑
|
5 years ago |
|
陈思洁
|
ba3f5fde4d
|
【总装、涂装、注塑计划报表】
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
f760b72094
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
宋军超
|
fe79944778
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
5739ac27bb
|
缺陷
|
5 years ago |
|
陈思洁
|
39ea32e37e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
a01cd4d34b
|
【注塑计划导入功能数据优化】
|
5 years ago |
|
宋军超
|
8bc0da924c
|
修改海纳川问题
|
5 years ago |
|
joke.wang
|
33cace48ab
|
半成品打印增加字段
|
5 years ago |
|
宋军超
|
0b3c53b4ca
|
修改海纳川问题
|
5 years ago |
|
wynne1005
|
e35fdcbc2a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4c9cdcb6a0
|
tmp
|
5 years ago |
|
陈思洁
|
26fe63eb8a
|
【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】
|
5 years ago |
|
陈思洁
|
41cbe4f380
|
【10284 19048-注塑生产计划导入变更-20200803】
|
5 years ago |
|
陈思洁
|
ce7ca48c4b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
394a332de2
|
修改展示组件逻辑
|
5 years ago |
|
陈思洁
|
72c8e22433
|
【接口映射代码调试】
|
5 years ago |
|
王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
joke.wang
|
c060377822
|
中航BI
|
5 years ago |
|
wynne1005
|
5fad38392e
|
添加索引 脚本表更新
|
5 years ago |
|
joke.wang
|
05fa7dba04
|
Fix Bug #10227
|
5 years ago |
|
joke.wang
|
af539c85a7
|
mgn bug
|
5 years ago |
|
宋军超
|
31f289e1be
|
修改展示组件和电检逻辑
|
5 years ago |
 贾文涛
|
5d19c8876b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
bc2d29c006
|
【2547 07 1.2.4.6.1.10 PCR-200617001需求变更-生产过程不良紧急拉料】
|
5 years ago |
|
贾文涛
|
fd42a3292a
|
Fix Bug #10090,修复涂装二次箱条码作业完成后，一次箱条码工位数据会乱掉问题。
|
5 years ago |
|
joke.wang
|
13f7121610
|
海纳川看板
|
5 years ago |
|
贾文涛
|
70693d5b63
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
01ac2e85da
|
Fix Bug #10087
|
5 years ago |
|
贾文涛
|
8180795cd7
|
功能优化-打包时将工位代码存入包装表
|
5 years ago |
|
王杰
|
7f5c1735ea
|
数据复核
|
5 years ago |
|
joke.wang
|
ea922affba
|
Start Task #2522 Cost:8h Left:8h
|
5 years ago |
|
王杰
|
306b05b4d7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
3223158529
|
Fix Bug #10108
|
5 years ago |
|
王杰
|
47a155e1d1
|
git push
|
5 years ago |
|
joke.wang
|
2a93bb2ca4
|
Finish Task #2521
|
5 years ago |
|
宋军超
|
23f33a79d1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
c18c22a799
|
修改海纳川电检测问题
|
5 years ago |
rock.yu
|
35cdb1f257
|
完善脚本管理功能
|
5 years ago |
|
rock.yu
|
eef7ed9c32
|
调整 pojo 引用关系， mes-pcn-pojo 已废弃
|
5 years ago |
|
宋军超
|
f0fd8da49c
|
修改海纳川问题
|
5 years ago |
|
joke.wang
|
e5d54d8c0a
|
工位BOM增加预警字段
|
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 |
|
宋军超
|
5fa18e05f1
|
修改中航问题
|
5 years ago |
|
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
|
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
3c22c8e3f4
|
test版本合并到master
|
5 years ago |
|
宋军超
|
457cb894db
|
添加工位队列信息功能
|
5 years ago |