backo880607
|
7261399f5a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
backo880607
|
9d070c974c
|
二车间排程逻辑修改
|
3 years ago |
andly.pan
|
6aa63e2457
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
 王杰
|
d8b7774c1e
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
8a9bbca253
|
Merge pull request '安灯区域、工位开窗查询接口封装packBean' (#360) from xiangming.liao/i3plus-pojo-lxm:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/360
|
3 years ago |
Ye-Bu
|
d47f146eaa
|
安灯区域、工位开窗查询接口封装packBean
|
3 years ago |
|
王杰
|
97f4fca506
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
98b51c4708
|
Merge pull request 'andon' (#359) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/359
|
3 years ago |
|
王杰
|
f601fe7594
|
andon
|
3 years ago |
|
王杰
|
28327f411a
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
123c7e1fb0
|
Merge pull request 'test' (#358) from xiangming.liao/i3plus-pojo-lxm:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/358
|
3 years ago |
|
Ye-Bu
|
bff48cf946
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
Ye-Bu
|
463e863ea4
|
安灯产线、工位下拉查询接口
|
3 years ago |
|
王杰
|
6d88569204
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
e8687f6131
|
Merge pull request '安灯组件' (#355) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/355
|
3 years ago |
|
王杰
|
05331ea5de
|
安灯组件
|
3 years ago |
nies
|
ce359615b9
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
nies
|
8f1e396705
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
361ed8a1c0
|
Merge pull request 'MesQueueOrderDetai新增质量状态字段' (#354) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/354
|
3 years ago |
蒋鸿辉
|
6e47adcdd2
|
MesQueueOrderDetai新增质量状态字段
|
3 years ago |
|
backo880607
|
1425c47379
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
backo880607
|
f7f1b46403
|
新增下发生产计划下班时间控制
|
3 years ago |
|
nies
|
a716e47318
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
31dc21afdc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
55cc12c01a
|
新增andon查询core的model
|
3 years ago |
 钮海涛
|
1a4537756c
|
Merge pull request '汽车带逻辑优化' (#353) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/353
|
3 years ago |
|
andly.pan
|
0a18029f11
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
andly.pan
|
11ecbe124a
|
汽车带逻辑优化
|
3 years ago |
|
王杰
|
d6c900f015
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
fd203fcc69
|
Merge pull request 'andon' (#352) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/352
|
3 years ago |
|
王杰
|
772dcac79f
|
andon
|
3 years ago |
|
王杰
|
a16562d706
|
Merge pull request 'andon' (#351) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/351
|
3 years ago |
|
王杰
|
83be0e6f91
|
andon
|
3 years ago |
|
王杰
|
1182fcfa67
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
47f796612f
|
Merge pull request '新增安灯组织结构表（区域、产线、工位）' (#350) from xiangming.liao/i3plus-pojo-lxm:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/350
|
3 years ago |
|
Ye-Bu
|
d108001739
|
安灯区域、产线、工位model中去除@column
|
3 years ago |
|
Ye-Bu
|
518d961575
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
Ye-Bu
|
84d8fd30d2
|
新增安灯组织结构表（区域、产线、工位）
|
3 years ago |
|
王杰
|
40836cafa4
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
97fde208af
|
Merge pull request 'andon' (#349) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/349
|
3 years ago |
|
王杰
|
7fb54f758b
|
andon
|
3 years ago |
|
nies
|
2c55439d4a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
王杰
|
a25635fe32
|
Merge pull request 'andon' (#348) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/348
|
3 years ago |
|
王杰
|
a4314ba22e
|
andon
|
3 years ago |
|
王杰
|
c95650ed90
|
Merge pull request 'andon' (#347) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/347
|
3 years ago |
|
王杰
|
d1698aaa48
|
andon
|
3 years ago |
|
nies
|
4fde6855ad
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
f25fa6a2a6
|
新增userAccountType查询
|
3 years ago |
|
王杰
|
7cd40e35da
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
18ca752f7a
|
Merge pull request 'test' (#346) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/346
|
3 years ago |