nies
|
96b4c622ce
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
c72c4fddb7
|
Merge pull request 'BUG #19874 松下页面优化' (#334) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/334
|
3 years ago |
ban.yuan
|
e79b0da311
|
BUG #19874 松下页面优化
|
3 years ago |
castle.zang
|
87ecad5b52
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
|
castle.zang
|
7b2d2e816c
|
wms作业流程导入导出功能
|
3 years ago |
|
nies
|
0b8c2c1d90
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
nies
|
36a9e0a352
|
Merge branch 'test' into ext-dev
|
3 years ago |
jun
|
0ba685d226
|
供应商物料新增等级
|
3 years ago |
 钮海涛
|
368ae1c971
|
Merge pull request '导出逻辑修改' (#325) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/325
|
3 years ago |
andly.pan
|
ff2a588a7c
|
汽车带排程初版
|
3 years ago |
|
nies
|
688fefe4f1
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
nies
|
c229132499
|
Merge branch 'test' into ext-dev
|
3 years ago |
 王杰
|
0f3b4c66a9
|
离线登陆
|
3 years ago |
|
andly.pan
|
91b45665a2
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
钮海涛
|
145f94c7a3
|
四车间问题修复
|
3 years ago |
|
nies
|
6b7ecd19b4
|
suitClientModel增加字段
|
3 years ago |
|
castle.zang
|
d919ef4243
|
BSP 调整pojo
|
3 years ago |
|
nies
|
d5afc6d195
|
RequestModel新增属性
|
3 years ago |
|
castle.zang
|
f82b161f78
|
BSP 脚本调整-1
|
3 years ago |
|
钮海涛
|
00c656fe88
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
0183e4b27b
|
功能测试完成
|
3 years ago |
|
nies
|
31cd2f5991
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
7361dfca50
|
Merge pull request 'BUG #19800 松下页面优化' (#330) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/330
|
3 years ago |
|
ban.yuan
|
8b80c4f16f
|
BUG #19800 松下页面优化
|
3 years ago |
|
andly.pan
|
a212e8591a
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
nies
|
674ac90f37
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
6c52328750
|
(update)修改QMS枚举常量
|
3 years ago |
|
nies
|
08fd6f26ba
|
Merge branch 'test' into ext-dev
|
3 years ago |
link
|
a4edb8a731
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
link
|
9d065ffac2
|
健康指标SQL取值计算BUG修复
|
3 years ago |
|
castle.zang
|
b4088b888f
|
BSP 脚本调整
|
3 years ago |
|
castle.zang
|
fa91cf6804
|
BSP 脚本
|
3 years ago |
|
castle.zang
|
0107aab563
|
BSP联调pojo
|
3 years ago |
|
andly.pan
|
c6520e78d7
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
钮海涛
|
fd2cc2da51
|
功能测试完成
|
3 years ago |
|
钮海涛
|
0b324d955c
|
功能测试完成
|
3 years ago |
|
钮海涛
|
485b9f2bd0
|
二次重排不考虑交期
|
3 years ago |
|
andly.pan
|
910a99dbd7
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
castle.zang
|
aa80fff7fa
|
BSP联调pojo
|
3 years ago |
|
link
|
741193be82
|
健康度指标DP修改
|
3 years ago |
|
钮海涛
|
0bde327c6a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
ec1d0a3540
|
报工拆分合并的工作不同颜色显示
|
3 years ago |
|
nies
|
e7d4015f10
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
924339025e
|
Merge pull request '北京pda显示新增分组' (#328) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/328
|
3 years ago |
|
jun
|
14678a5bad
|
北京pda显示新增分组
|
3 years ago |
|
castle.zang
|
9aafab3d5a
|
增加中航新的mes-history的menuRootCode
|
3 years ago |
|
castle.zang
|
8fc894b413
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
|
castle.zang
|
db2941fd31
|
调试bsp方法管理，执行器管理，日志管理接口
|
3 years ago |
|
link
|
99c6752b63
|
add healthindex module Entity and DP
|
3 years ago |
|
nies
|
a2efd76c7d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
261fd456d5
|
Merge pull request '中航物料对象修复' (#327) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/327
|
3 years ago |
 王宝玉
|
c92b401fe4
|
中航物料对象修复
|
3 years ago |
|
nies
|
7c80841f6d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
7d06827898
|
clientModel新增requestId
|
3 years ago |
|
钮海涛
|
b7adcb40c0
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
aaf5d1c00c
|
订单合并功能开发完成。
|
3 years ago |
|
nies
|
d58b6715be
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
c9535bf555
|
新增产品类型EAM 设备信息管理服务
|
3 years ago |
|
钮海涛
|
dc36c90a87
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
303fa009c6
|
订单合并功能开发完成。
|
3 years ago |
|
castle.zang
|
a0079ae73f
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
|
castle.zang
|
b81b9c569d
|
冷热数据分离--重构--测试完成
|
3 years ago |
|
nies
|
b534c07bdb
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
ba78a4b0f7
|
Merge pull request '【19625 21062+质检报表导出失败，需修复】' (#326) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/326
|
3 years ago |
 曾贞一
|
fbc5415086
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
b5fb208027
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
5c9e6ad4cf
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
cb5db7101a
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
andly.pan
|
0c38056604
|
导出逻辑修改
|
3 years ago |
|
nies
|
23dfbdb6ea
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
nies
|
53a7709bc8
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
1ee62d1689
|
Merge pull request '仓库健康统计变量，周期和计算频次换成corn表达式' (#324) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/324
|
3 years ago |
|
jun
|
d21cc02739
|
仓库健康统计变量，周期和计算频次换成corn表达式
|
3 years ago |
|
钮海涛
|
c1eac0e4be
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
ad887c76b5
|
订单合并功能开发完成。
|
3 years ago |
|
castle.zang
|
94c61f77f4
|
冷热数据分离--重构
|
3 years ago |
|
castle.zang
|
c2437fd00f
|
接口映射bean
|
3 years ago |
|
nies
|
1ec1192200
|
Merge branch 'test' into ext-dev
|
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 |
|
nies
|
ab699b98b8
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
link
|
8c65aa1294
|
fix miss field
|
3 years ago |
|
nies
|
c3b145f8dc
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
link
|
ac152cf3f2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
link
|
b04cedf70b
|
添加dao的数据接口
|
3 years ago |
|
钮海涛
|
584a8c8ee6
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
c31742fa73
|
订单合并功能开发，临时提交
|
3 years ago |
|
钮海涛
|
4ee40a7c85
|
订单合并功能开发，临时提交
|
3 years ago |
|
nies
|
9b8d5bee8d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
f44a69a46c
|
UserDeatilModel增加登录次数字段
|
3 years ago |
|
nies
|
ec814a2f9d
|
Merge branch 'test' into ext-dev
|
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 |
|
nies
|
94dc53adde
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
d5f6d501b5
|
WmsStockSn新增构造函数
|
3 years ago |
|
nies
|
81990edfb7
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
6a07e7ff30
|
供应商新增字段是否首次登录
|
3 years ago |
|
nies
|
0a10cd8283
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
f0ddb6ca60
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
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 |
|
钮海涛
|
d25c206d19
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
90ccea73ec
|
四车间问题修复。
|
3 years ago |
|
nies
|
c03cb8e14b
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
db04d60fbc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
link
|
ba5ddc09e1
|
delete table index
|
3 years ago |
|
nies
|
0c0cfa6f6a
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
1086f11875
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
a43b17841f
|
软适配新增SuitRetryModel
|
3 years ago |
puxiao.liao
|
403fef80f4
|
实盘表增加托盘字段
|
3 years ago |
|
link
|
73191c1961
|
三方指标查询POJO
|
3 years ago |
|
钮海涛
|
7e73f33b5c
|
新增下发MES的工作块颜色
|
3 years ago |
|
nies
|
2418d6d655
|
修改ext-dev pojo版本为1.0.0.1
|
3 years ago |
|
nies
|
c6367b0795
|
解决screen的冲突
|
3 years ago |
|
nies
|
976369fa10
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
2255d1dfcf
|
(update)软适配新增适配类型表
|
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 |
|
钮海涛
|
6ffcbcc863
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
29ae808f7c
|
四车间压缩硫化增加到排程逻辑中。
|
3 years ago |
|
castle.zang
|
1ad2e71b5c
|
log4j2升级版本
|
3 years ago |
rock.yu
|
a499178031
|
add lost tag
|
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 |
|
钮海涛
|
2dad4448aa
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
50346624a7
|
新增按班次压缩硫化功能
|
3 years ago |
|
nies
|
1f0fb96c94
|
Merge branch 'test' into ext-dev
|
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 |
|
nies
|
7069b6533a
|
Merge branch 'test' into ext-dev
|
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 |
|
nies
|
bcaa55e348
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
585e2aefe1
|
(update)WmsInterfaceDataMapper增加busiIdList字段
|
3 years ago |
|
nies
|
f28f449d4a
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
058a761500
|
(update)增加适配重复记录
|
3 years ago |
|
nies
|
174ef833df
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
ccab3f0c04
|
(update)BsSuitCase增加requestId
|
3 years ago |
|
nies
|
2619f42700
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
a3d2749161
|
(update)SuitModel 增加requestId
|
3 years ago |
|
nies
|
dd699216ac
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
65c22dec22
|
Merge pull request '18934 原材料扣减job替换' (#316) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/316
|
3 years ago |
|
jun
|
0ef89f2a6d
|
18934 原材料扣减job替换
|
3 years ago |
|
钮海涛
|
d2bbca3491
|
新增同班次物料相同评估规则
|
3 years ago |
|
nies
|
4b3449863f
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
f1e158737b
|
Merge pull request '【18835 19081-盘点策略-循环规则-选项可配置】' (#314) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/314
|
4 years ago |
|
钮海涛
|
55f88edd0f
|
Merge pull request '资源甘特图提示' (#315) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/315
|
4 years ago |
|
钮海涛
|
f74038f88c
|
强插生产计划前提交
|
4 years ago |
|
andly.pan
|
64e48bf350
|
资源甘特图提示
|
4 years ago |
|
曾贞一
|
7f7baa1ea4
|
【18835 19081-盘点策略-循环规则-选项可配置】
|
4 years ago |