nies
|
10967abd1b
|
新增对账单model
|
3 years ago |
castle.zang
|
2bfb08f143
|
合并王宝玉-wmsStockSn -增加构造方法
|
3 years ago |
 臧学普
|
ffe6708ea4
|
Merge pull request '中航条码表修改' (#367) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/367
|
3 years ago |
 王宝玉
|
9b58ec1623
|
中航条码表修改
|
3 years ago |
 王杰
|
a067fcba6e
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
7432815bfb
|
andon
|
3 years ago |
|
王杰
|
f3c03fed36
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
bf386f4580
|
andon
|
3 years ago |
|
nies
|
8244e9f809
|
新增对账单model
|
3 years ago |
|
王杰
|
b5b90e141c
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
2bded2e4a6
|
andon
|
3 years ago |
|
王杰
|
7bd07f1b7d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
633ffd269f
|
安灯
|
3 years ago |
|
王杰
|
a373209d31
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
a625f05293
|
andon
|
3 years ago |
|
nies
|
a395c806ea
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
6f40e3df8f
|
Merge pull request 'MesBypssMapping表增加产品位置字段' (#361) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/361
|
3 years ago |
蒋鸿辉
|
4b0dc458b2
|
MesBypssMapping表增加产品位置字段
|
3 years ago |
|
nies
|
a4514d0963
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
ad2b876d97
|
修改AndonQueryUserModel
|
3 years ago |
|
nies
|
250567bc00
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
bff90c422c
|
blocksoftswitch新增脚本相关pojo
|
3 years ago |
backo880607
|
d37904f596
|
二车间排程逻辑修改
|
3 years ago |
|
backo880607
|
7261399f5a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
backo880607
|
9d070c974c
|
二车间排程逻辑修改
|
3 years ago |
|
王杰
|
d8b7774c1e
|
Merge branch 'test' into ext-dev
|
3 years ago |
Ye-Bu
|
d47f146eaa
|
安灯区域、工位开窗查询接口封装packBean
|
3 years ago |
|
王杰
|
97f4fca506
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
f601fe7594
|
andon
|
3 years ago |
|
王杰
|
28327f411a
|
Merge branch 'test' into ext-dev
|
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 |
|
王杰
|
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
|
11ecbe124a
|
汽车带逻辑优化
|
3 years ago |
|
王杰
|
d6c900f015
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
772dcac79f
|
andon
|
3 years ago |
|
王杰
|
83be0e6f91
|
andon
|
3 years ago |
|
王杰
|
1182fcfa67
|
Merge branch 'test' into ext-dev
|
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 |
|
王杰
|
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 |