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 |
王杰
|
7fb54f758b
|
andon
|
3 years ago |
nies
|
2c55439d4a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
王杰
|
a4314ba22e
|
andon
|
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 |
王杰
|
e3373387d2
|
安灯事件界面配置
|
3 years ago |
王杰
|
7487be0a8a
|
安灯
|
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 |
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 |
castle.zang
|
83efec6280
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
Dominic_Xiao
|
0c7f2ccccb
|
二车间模具选择资源逻辑优化
|
3 years ago |
nies
|
4c57d9e9b3
|
修改SysTableTemplate索引设置
|
3 years ago |
nies
|
f843878e7e
|
新增钉钉单聊机器人批量发送消息的model
|
3 years ago |
castle.zang
|
e01f9a5570
|
集中对账单
|
3 years ago |
castle.zang
|
5bea74bf80
|
sweb供应商自助修改密码---供应商登出
|
3 years ago |
castle.zang
|
42a4d10770
|
sweb供应商自助修改密码
|
3 years ago |
castle.zang
|
317d1c6129
|
sweb供应商自助修改密码
|
3 years ago |
castle.zang
|
0e5d45d477
|
sweb供应商自助修改密码
|
3 years ago |
castle.zang
|
18400f3c7e
|
sweb统一登录--添加platform枚举类
|
3 years ago |
castle.zang
|
3088b05027
|
sweb统一登录
|
3 years ago |
钮海涛
|
e4b9d076f2
|
核心包代码优化。
|
3 years ago |
nies
|
34df681f37
|
新增前端列表模板类
|
3 years ago |
nies
|
8ebc96d1f7
|
sysMessage 查询增加organizeCode字段
|
3 years ago |
钮海涛
|
c73bfc41d1
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
钮海涛
|
8ff044cbd0
|
修复数据备份还原的问题。
|
3 years ago |
nies
|
a8d36f6558
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
nies
|
b652d0377e
|
Merge branch 'test' into ext-dev
|
3 years ago |
钮海涛
|
a1d17f45c2
|
修复备份的数据还原问题
|
3 years ago |
castle.zang
|
6508ad8082
|
获取redis信息
|
3 years ago |
nies
|
bad5dc8134
|
软适配webservice服务端新增调用对应服务的适配模式
|
3 years ago |
钮海涛
|
ed3f4c3464
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
钮海涛
|
b4873a4740
|
修复备份的数据还原问题
|
3 years ago |
nies
|
957c43f659
|
Merge branch 'test' into ext-dev
|
3 years ago |
聂帅
|
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 |
钮海涛
|
ec6a1dd09a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
钮海涛
|
1c26e8803c
|
修复备份的数据还原问题
|
3 years ago |
nies
|
fa37bbc51c
|
解决WmsVendorPart的冲突
|
3 years ago |
聂帅
|
e84952994a
|
Merge pull request '供应商物料界面显示是否加严字段' (#338) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/338
|
3 years ago |
jun
|
c27db13780
|
加字段【变更号】字段
|
3 years ago |
jun
|
ac6d420e99
|
供应商物料界面显示是否加严字段
|
3 years ago |
castle.zang
|
3a46712908
|
合并李俊生代码--#19995 19081-WMS服务挂掉-PDA无法使用
|
3 years ago |
臧学普
|
bae79eeee7
|
Merge pull request '#19995 19081-WMS服务挂掉-PDA无法使用' (#337) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/337
|
3 years ago |
jun
|
a515c629d0
|
#19995 19081-WMS服务挂掉-PDA无法使用
|
3 years ago |
nies
|
6763f73ed9
|
Merge branch 'test' into ext-dev
|
3 years ago |
聂帅
|
8a4111a430
|
Merge pull request 'BUG #19874 松下页面优化' (#336) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/336
|
3 years ago |
castle.zang
|
f24fe9eae3
|
BSP pojo
|
3 years ago |
castle.zang
|
60d2501505
|
wms作业流程导入导出功能,不校验脚本描述
|
3 years ago |
castle.zang
|
4831d506cd
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
ban.yuan
|
13a3f30876
|
BUG #19874 松下页面优化
|
3 years ago |
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 |