聂帅
|
085c272e1d
|
Merge pull request '生产队列明细(MesQueueOrderDetail)增加产线字段' (#339) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/339
|
3 years ago |
蒋鸿辉
|
8179cceb4d
|
生产队列明细(MesQueueOrderDetail)增加产线字段
|
3 years ago |
王杰
|
0f3b4c66a9
|
离线登陆
|
3 years ago |
聂帅
|
edc4a74001
|
Merge pull request '中航物料对象导入修改' (#323) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/323
|
3 years ago |
王宝玉
|
2e2487ebc0
|
中航物料对象导入修改
|
3 years ago |
聂帅
|
b7ba3b1f6e
|
Merge pull request '中航条码补偿字段' (#322) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/322
|
3 years ago |
王宝玉
|
74f9e00f56
|
中航条码补偿字段
|
3 years ago |
聂帅
|
2f79cf7d2b
|
Merge pull request '条码表新增补偿字段' (#321) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/321
|
3 years ago |
王宝玉
|
da44d62f8f
|
条码表新增补偿字段
|
3 years ago |
聂帅
|
a70c9cf5ec
|
Merge pull request 'MesProdCfgType 新增 项目代码与报文vehicleCode关系字段' (#319) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/319
|
3 years ago |
蒋鸿辉
|
b7bf7edfa5
|
MesProdCfgType 新增 项目代码与报文vehicleCode关系字段
|
3 years ago |
castle.zang
|
35abd70bae
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
castle.zang
|
8a369c31fa
|
通用数据冷热分离代码,并规范化test分支开发时的依赖,全部依赖1.0-TEST-SNAPSHOT
|
3 years ago |
聂帅
|
e51e82994a
|
Merge pull request 'MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode)' (#318) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/318
|
3 years ago |
蒋鸿辉
|
4d61109541
|
MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode)
|
3 years ago |
聂帅
|
39e0235ad9
|
Merge pull request '物料项目关系表新增客户零件号(custPartNo)字段' (#317) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/317
|
3 years ago |
蒋鸿辉
|
f1811b42de
|
物料项目关系表新增客户零件号(custPartNo)字段
|
3 years ago |
聂帅
|
443a8a200d
|
Merge pull request 'test' (#311) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/311
|
4 years ago |
王宝玉
|
4625987eef
|
Mes散件BOM增加项目代码字段
|
4 years ago |
王宝玉
|
5056f30f45
|
核心包mes散件产品配置BOM新增项目代码
|
4 years ago |
臧学普
|
9d8371bdac
|
Merge pull request '工单表增加系统同步标志字段' (#306) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/306
|
4 years ago |
王杰
|
77795be8df
|
StationRequestBean 增加 缓存数据来源class
|
4 years ago |
蒋鸿辉
|
0cfac0aaaf
|
工单表增加系统同步标志字段
|
4 years ago |
臧学普
|
f7d8ee1026
|
Merge pull request '索引' (#302) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/302
|
4 years ago |
聂帅
|
a995805f74
|
Merge pull request '二开项目目前pojo类无法同步,在核心包新增pojo' (#303) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/303
|
4 years ago |
Dominic_Xiao
|
cbba75032a
|
二开项目目前pojo类无法同步,在核心包新增pojo
|
4 years ago |
王杰
|
cedc61b6a8
|
索引
|
4 years ago |
王杰
|
a6ed27b901
|
索引
|
4 years ago |
聂帅
|
98706bcc20
|
Merge pull request 'test' (#299) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/299
|
4 years ago |
Dominic_Xiao
|
c787981c14
|
因长度过长,去除content字段的索引
|
4 years ago |
王杰
|
682a086f23
|
生产数据表 增加系统同步标志
|
4 years ago |
王杰
|
0113ac8038
|
核心包 条码 包装 表增加系统同步标志
|
4 years ago |
王杰
|
697f7f1c2f
|
条码履历表 去除版本号字段
|
4 years ago |
王杰
|
e649024439
|
条码履历表 增加 版本号 系统同步标志字段
|
4 years ago |
王杰
|
9466e62ff5
|
plc查询bug
|
4 years ago |
Dominic_Xiao
|
b8cfeb6062
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
Dominic_Xiao
|
7eaff164b8
|
设备周期作业计划新增指派人字段
|
4 years ago |
肖奕扬
|
33c26c7dd3
|
Merge branch 'ext-dev' into test
|
4 years ago |
Dominic_Xiao
|
f5a7487799
|
设备周期作业计划配置新增指派人字段
|
4 years ago |
于学杰
|
0a8acc71b2
|
Merge pull request '产线多次提交数据以及 优化首页接口和不合格审理单' (#286) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/286
|
4 years ago |
castle.zang
|
fa4f5c6900
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Dominic_Xiao
|
e2682b8a98
|
17114 19081-返工返修显示的BYPASS项需要可以设置-20210820
|
4 years ago |
王宝玉
|
35f09a6e50
|
产线多次提交数据以及 优化首页接口和不合格审理单
|
4 years ago |
puxiao.liao
|
e3ebdfeb2c
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Dominic_Xiao
|
9ea42cd032
|
16818 20135-热处理绑定没有定成功CMS标签成功
|
4 years ago |
Dominic_Xiao
|
6e94cb6c47
|
人员技能增加有效校验
|
4 years ago |
Dominic_Xiao
|
388fc9089c
|
16895 19081-PC-MES-人员技能-禁用后数据已经显示-20210730
|
4 years ago |
肖奕扬
|
72c61c5426
|
Merge pull request '1629 19048-组装关键件绑定增加解绑功能-20210625' (#283) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/283
|
4 years ago |
蒋鸿辉
|
cac0421b99
|
1629 19048-组装关键件绑定增加解绑功能-20210625
|
4 years ago |
puxiao.liao
|
d7b34facf0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/pom.xml
modules/i3plus-pojo-mes-pcn/pom.xml
modules/i3plus-pojo-mes/pom.xml
modules/i3plus-pojo-model/pom.xml
modules/i3plus-pojo-platform/pom.xml
modules/i3plus-pojo-ptl/pom.xml
modules/i3plus-pojo-report/pom.xml
modules/i3plus-pojo-screen/pom.xml
modules/i3plus-pojo-softswitch/pom.xml
modules/i3plus-pojo-sweb/pom.xml
modules/i3plus-pojo-wms/pom.xml
modules/i3plus-pojo-workflow/pom.xml
pom.xml
sonar-project.properties
|
4 years ago |