 王杰
|
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 |
|
王杰
|
e3373387d2
|
安灯事件界面配置
|
3 years ago |
|
王杰
|
7487be0a8a
|
安灯
|
3 years ago |
|
王杰
|
faba9840ee
|
Merge pull request 'andon 核心包 流程重构' (#345) from jhforever.wang/i3plus-pojo-U7:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/345
|
3 years ago |
|
王杰
|
f4c3656ad7
|
andon 核心包 流程重构
|
3 years ago |
|
nies
|
f07421a2e9
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
1410b57168
|
Merge pull request 'wms物料子检查项增加动态表单字段' (#344) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/344
|
3 years ago |
 王宝玉
|
05d789ea64
|
wms物料子检查项增加动态表单字段
|
3 years ago |
|
nies
|
5874e7e5b7
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
dfe93ff37e
|
新增账号类型字段
|
3 years ago |
|
nies
|
187c1382ca
|
新增用户账号类型
|
3 years ago |
castle.zang
|
8084d7d11a
|
添加soft_type，eam_pad
|
3 years ago |
|
castle.zang
|
37d7b461f6
|
添加soft_type，eam_pad
|
3 years ago |
|
castle.zang
|
8f1633e797
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
backo880607
|
52aafa0bf4
|
四车间下发拆分问题修复
|
3 years ago |
|
nies
|
b89ceeca0f
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
0ca309e38b
|
新增报关管理系统
|
3 years ago |
 钮海涛
|
022ec3243e
|
Merge pull request 'ext-dev' (#343) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/343
|
3 years ago |
andly.pan
|
e2f8c1c0fd
|
汽车带修改逻辑
|
3 years ago |
|
andly.pan
|
9a18ec0920
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
nies
|
38e4f49f56
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
e09dc6fd94
|
Merge pull request 'MesPartFormula 物料配方表新增参照数量字段' (#342) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/342
|
3 years ago |
蒋鸿辉
|
fcff103a4d
|
MesPartFormula 物料配方表新增参照数量字段
|
3 years ago |
|
andly.pan
|
3cbf42162a
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
andly.pan
|
fbd74baacb
|
汽车带逻辑优化
|
3 years ago |
|
castle.zang
|
dff7c3494c
|
添加token类型
|
3 years ago |
|
backo880607
|
0a2b6bccd1
|
设备人员增加班次时间段。
|
3 years ago |
|
nies
|
b5eb55feaf
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
8cd30d3bc8
|
修改eam端口
|
3 years ago |
|
castle.zang
|
e8cc06babb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
945db7f238
|
合并代码
|
3 years ago |
|
聂帅
|
428ebcf614
|
Merge pull request 'MesPartStockSchedule(安全库存配置)新增已下达箱数字段' (#341) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/341
|
3 years ago |
|
蒋鸿辉
|
f7a8acb88b
|
MesPartStockSchedule(安全库存配置)新增已下达箱数字段
|
3 years ago |
|
钮海涛
|
810a6c2cd7
|
新增联组带组炉功能
|
3 years ago |